head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.58 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.56 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.54 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.52 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.50 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.48 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.46 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.44 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.42 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.40 cwrapper-base:1.9 pkg_install-renovation:1.9.0.38 pkg_install-renovation-base:1.9 pkgsrc-2008Q1:1.9.0.36 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.34 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.32 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.30 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.28 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.26 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.24 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.22 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.20 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.18 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.9.0.16 pkgsrc-2005Q3-base:1.9 pkgsrc-2005Q2:1.9.0.14 pkgsrc-2005Q2-base:1.9 pkgsrc-2005Q1:1.9.0.12 pkgsrc-2005Q1-base:1.9 pkgsrc-2004Q4:1.9.0.10 pkgsrc-2004Q4-base:1.9 pkgsrc-2004Q3:1.9.0.8 pkgsrc-2004Q3-base:1.9 pkgsrc-2004Q2:1.9.0.6 pkgsrc-2004Q2-base:1.9 pkgsrc-2004Q1:1.9.0.4 pkgsrc-2004Q1-base:1.9 pkgsrc-2003Q4:1.9.0.2 pkgsrc-2003Q4-base:1.9 buildlink2-base:1.4 buildlink2:1.4.0.2 netbsd-1-6:1.4.0.4 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.1.0.2 pkgviews-base:1.1; locks; strict; comment @# @; 1.9 date 2002.12.20.18.15.53; author schmonz; state dead; branches; next 1.8; 1.8 date 2002.11.23.23.14.41; author wiz; state Exp; branches; next 1.7; 1.7 date 2002.11.23.23.03.25; author jschauma; state Exp; branches; next 1.6; 1.6 date 2002.11.23.22.49.48; author jschauma; state Exp; branches; next 1.5; 1.5 date 2002.09.23.13.16.59; author abs; state Exp; branches; next 1.4; 1.4 date 2002.08.06.11.51.02; author wiz; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2002.08.01.14.43.39; author schmonz; state Exp; branches; next 1.2; 1.2 date 2002.08.01.09.31.16; author martti; state Exp; branches; next 1.1; 1.1 date 2002.07.03.22.43.40; author abs; state Exp; branches; next ; 1.4.2.1 date 2002.08.06.11.51.02; author jlam; state dead; branches; next 1.4.2.2; 1.4.2.2 date 2002.08.23.05.09.14; author jlam; state Exp; branches; next ; desc @@ 1.9 log @As the sources are now in ${FILESDIR}, there's no distfile to fetch, and the "do-extract" target copies the sources into ${WRKSRC}. We automagically determine VERSION by inspecting ${FILESDIR}/lib/version.h. Thanks to autoconf, all the patches and almost all of the cruftulent ${OPSYS}-specific stuff in the Makefile are gone. @ text @$NetBSD: patch-ad,v 1.8 2002/11/23 23:14:41 wiz Exp $ --- lib/Makefile.orig Wed Sep 18 15:31:55 2002 +++ lib/Makefile @@@@ -2,4 +2,19 @@@@ # Original from FreeBSD, no rcs id. +OPSYS!= uname -s +RELEASE!= uname -r + +.if ${OPSYS} == "Darwin" +SRCS+= md5c.c md5hl.c strlcpy.c +.endif + +.if ${OPSYS} == "Linux" +SRCS+= fgetln.c md5c.c md5hl.c strlcpy.c +.endif + +.if ${OPSYS} == "NetBSD" && (${RELEASE:M1.4.[12]} != "" || ${RELEASE:M1.4} != "") +SRCS+= strlcpy.c +.endif + NOLINT= # defined NOMAN= # defined @@@@ -7,4 +22,9 @@@@ NOPIC= # defined NOPROFILE= # defined +MKLINT= no +MKMAN= no +MKPIC= no +MKPROFILE= no + LIB+= install SRCS+= exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \ @@@@ -12,5 +32,9 @@@@ SRCS+= exec.c file.c ftpio.c global.c l # only needed during build - prevent installation of library +.if ${OPSYS} == "Darwin" +install:: +.else libinstall:: +.endif version.o: version.h version.c @ 1.8 log @Always use pkgdiff -- this avoids having RCS Ids in patches. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Commit change to patch-ad that mysteriously got lost in last commit. (Thanks wiz!) @ text @d1 1 a1 1 $NetBSD: $ d3 3 a5 4 --- lib/Makefile.orig Sat Nov 23 17:59:40 2002 +++ lib/Makefile Sat Nov 23 18:01:12 2002 @@@@ -1,17 +1,41 @@@@ # $NetBSD: Makefile,v 1.19 2002/09/18 13:31:55 lukem Exp $ d25 1 a25 1 NOPIC= # defined d35 1 a35 1 plist.c str.c version.c path.c a44 1 @ 1.6 log @Upgrade to version 20021123, which fixes PR pkg/18384 by Grant. Curiously, several of the patches required some changes -- have these not been tested with the latest version of pkg_install? @ text @d3 2 a4 2 --- lib/Makefile.orig Sat Nov 23 17:40:45 2002 +++ lib/Makefile Sat Nov 23 17:42:52 2002 @ 1.5 log @Toss in strlcpy.c and hey presto: Instant linux pkg_install binaries. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4 2002/08/06 11:51:02 wiz Exp $ d3 5 a7 5 --- lib/Makefile.orig Thu Aug 1 10:46:31 2002 +++ lib/Makefile @@@@ -5,13 +5,36 @@@@ SRCS+= exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \ plist.c str.c version.c path.c d28 1 d33 4 @ 1.4 log @Make it build on 1.4-1.4.2. @ text @d1 1 a1 1 $NetBSD$ d17 1 a17 1 +SRCS+= fgetln.c md5c.c md5hl.c @ 1.4.2.1 log @file patch-ad was added on branch buildlink2 on 2002-08-23 05:09:14 +0000 @ text @d1 41 @ 1.4.2.2 log @Merge changes from HEAD of pkgsrc/pkgtools to buildlink2 branch. @ text @a0 41 $NetBSD: patch-ad,v 1.4.2.1 2002/08/23 05:09:14 jlam Exp $ --- lib/Makefile.orig Thu Aug 1 10:46:31 2002 +++ lib/Makefile @@@@ -5,13 +5,36 @@@@ SRCS+= exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \ plist.c str.c version.c path.c +OPSYS!= uname -s +RELEASE!= uname -r + +.if ${OPSYS} == "Darwin" +SRCS+= md5c.c md5hl.c strlcpy.c +.endif + +.if ${OPSYS} == "Linux" +SRCS+= fgetln.c md5c.c md5hl.c +.endif + +.if ${OPSYS} == "NetBSD" && (${RELEASE:M1.4.[12]} != "" || ${RELEASE:M1.4} != "") +SRCS+= strlcpy.c +.endif + NOLINT= # defined NOMAN= # defined NOPIC= # defined NOPROFILE= # defined +MKLINT= no +MKMAN= no +MKPIC= no +MKPROFILE= no # only needed during build - prevent installation of library +.if ${OPSYS} == "Darwin" +install:: +.else libinstall:: +.endif version.o: version.h version.c @ 1.3 log @The 20020723 pkg_install tools use strlcpy(), which Darwin lacks. Provide a strlcpy() implementation (from -r1.12 of basesrc/lib/libc/string/strlcpy.c), and use it on Darwin. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2002/08/01 09:31:16 martti Exp $ d3 1 a3 1 --- lib/Makefile.orig Thu Aug 1 04:46:31 2002 d5 1 a5 1 @@@@ -5,13 +5,31 @@@@ LIB+= install d10 1 d18 4 @ 1.2 log @Updated pkg_install to 20020723 - remove handling of PKG_ADD_BASE. - don't search current directory if PKG_PATH is set. - don't prefer local directories. - constify and cleanup. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2002/07/03 22:43:40 abs Exp $ d3 3 a5 3 --- lib/Makefile.orig Thu Aug 1 10:46:31 2002 +++ lib/Makefile Thu Aug 1 10:57:09 2002 @@@@ -5,13 +5,31 @@@@ d12 1 a12 1 +SRCS+= md5c.c md5hl.c @ 1.1 log @Compile and run under Linux. We're still missing pax and mtree, but using the Darwin bootstrap kit everything else now works. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- lib/Makefile.orig Wed Dec 12 01:48:54 2001 +++ lib/Makefile d7 1 a7 1 plist.c str.c version.c @