head 1.12; access; symbols pkgsrc-2013Q2:1.12.0.58 pkgsrc-2013Q2-base:1.12 pkgsrc-2012Q4:1.12.0.56 pkgsrc-2012Q4-base:1.12 pkgsrc-2011Q4:1.12.0.54 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q2:1.12.0.52 pkgsrc-2011Q2-base:1.12 pkgsrc-2009Q4:1.12.0.50 pkgsrc-2009Q4-base:1.12 pkgsrc-2008Q4:1.12.0.48 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.46 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.44 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.42 pkgsrc-2008Q2-base:1.12 cwrapper:1.12.0.40 cwrapper-base:1.12 pkg_install-renovation:1.12.0.38 pkg_install-renovation-base:1.12 pkgsrc-2008Q1:1.12.0.36 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.34 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.32 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.30 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.28 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.12.0.26 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.12.0.24 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.12.0.22 pkgsrc-2006Q2-base:1.12 pkgsrc-2006Q1:1.12.0.20 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.12.0.18 pkgsrc-2005Q4-base:1.12 pkgsrc-2005Q3:1.12.0.16 pkgsrc-2005Q3-base:1.12 pkgsrc-2005Q2:1.12.0.14 pkgsrc-2005Q2-base:1.12 pkgsrc-2005Q1:1.12.0.12 pkgsrc-2005Q1-base:1.12 pkgsrc-2004Q4:1.12.0.10 pkgsrc-2004Q4-base:1.12 pkgsrc-2004Q3:1.12.0.8 pkgsrc-2004Q3-base:1.12 pkgsrc-2004Q2:1.12.0.6 pkgsrc-2004Q2-base:1.12 pkgsrc-2004Q1:1.12.0.4 pkgsrc-2004Q1-base:1.12 pkgsrc-2003Q4:1.12.0.2 pkgsrc-2003Q4-base:1.12 netbsd-1-6:1.10.0.4 netbsd-1-6-RELEASE-base:1.10 pkgviews:1.6.0.2 pkgviews-base:1.6 buildlink2:1.5.0.2 buildlink2-base:1.10 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.4; locks; strict; comment @# @; 1.12 date 2002.12.20.18.15.53; author schmonz; state dead; branches; next 1.11; 1.11 date 2002.11.23.22.49.48; author jschauma; state Exp; branches; next 1.10; 1.10 date 2002.08.12.01.58.26; author schmonz; state Exp; branches; next 1.9; 1.9 date 2002.08.05.15.11.35; author fredb; state Exp; branches; next 1.8; 1.8 date 2002.08.03.18.29.53; author seb; state Exp; branches; next 1.7; 1.7 date 2002.08.01.09.31.15; author martti; state Exp; branches; next 1.6; 1.6 date 2002.07.03.22.43.40; author abs; state Exp; branches; next 1.5; 1.5 date 2002.03.04.13.48.31; author seb; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2001.03.07.01.11.49; author hubertf; state Exp; branches; next 1.3; 1.3 date 2001.03.07.01.03.13; author hubertf; state Exp; branches; next 1.2; 1.2 date 2001.03.07.00.54.19; author hubertf; state Exp; branches; next 1.1; 1.1 date 2001.03.07.00.17.29; author hubertf; state Exp; branches; next ; 1.5.2.1 date 2002.08.23.05.09.12; author jlam; state Exp; branches; next ; desc @@ 1.12 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-aa,v 1.11 2002/11/23 22:49:48 jschauma Exp $ --- Makefile.inc.orig Sat Nov 23 17:37:17 2002 +++ Makefile.inc Sat Nov 23 17:39:38 2002 @@@@ -3,6 +3,9 @@@@ .include +.if !defined(PRINTOBJDIR) +PRINTOBJDIR= printf "xxx: .MAKE\n\t@@echo \$${.OBJDIR}\n" | ${MAKE} -B -s -f- +.endif LIBINSTALL != cd ${.CURDIR}/../lib && ${PRINTOBJDIR} CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG} -DBINDIR='"${BINDIR}"' @@@@ -29,7 +32,7 @@@@ #CHMOD_CMD?= /bin/chmod #CHOWN_CMD?= /usr/sbin/chown #CHGRP_CMD?= /usr/bin/chgrp -WARNS=2 +WARNS=1 #CPPFLAGS+= -DCHMOD_CMD='"${CHMOD_CMD}"' -DCHOWN_CMD='"${CHOWN_CMD}"' #CPPFLAGS+= -DCHGRP_CMD='"${CHGRP_CMD}"' @ 1.11 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 @d1 1 a1 1 $NetBSD: $ @ 1.10 log @Darwin needs -DTAR_MISSING_FAST_READ, as noted by "Masahiro =Rhythm Drive= Ishiyama" on tech-pkg@@. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Makefile.inc.orig Thu Aug 1 04:46:30 2002 +++ Makefile.inc d15 4 a18 4 @@@@ -20,11 +23,11 @@@@ OPSYS="unknown" CHMOD?= /bin/chmod CHOWN?= /usr/sbin/chown CHGRP?= /usr/bin/chgrp a20 35 .elif ${OPSYS} == "SunOS" LOCALBASE?= /usr/pkg TAR_CMD?= tar -FTP_CMD?= tar +FTP_CMD?= ftp ZOULARISBASE?= ${LOCALBASE}/bsd TAR_FULLPATHNAME?= ${ZOULARISBASE}/bin/${TAR_CMD} FTP_FULLPATHNAME?= ${ZOULARISBASE}/bin/${FTP_CMD} @@@@ -36,9 +39,28 @@@@ CHOWN?= /usr/bin/chown CHGRP?= /usr/bin/chgrp WARNS=0 .elif ${OPSYS} == "Linux" +LOCALBASE?= /usr/pkg CHMOD?= /bin/chmod CHOWN?= /bin/chown CHGRP?= /bin/chgrp +LDADD+= -ldb1 +.PATH: ${DIGESTDIR} +CPPFLAGS+= -I${DIGESTDIR} +MKCATPAGES= no +TAR_CMD?= tar +TAR_FULLPATHNAME?= /bin/${TAR_CMD} +CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"' +CPPFLAGS+=-DTAR_MISSING_FAST_READ -DFGETLN_MISSING +.elif ${OPSYS} == "Darwin" +CHMOD?= /bin/chmod +CHOWN?= /usr/sbin/chown +CHGRP?= /usr/bin/chgrp +TAR_CMD?= gnutar +TAR_FULLPATHNAME?= /usr/bin/${TAR_CMD} +CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"' +CPPFLAGS+=-DTAR_MISSING_FAST_READ +.PATH: ${DIGESTDIR} +CPPFLAGS+= -I${DIGESTDIR} .endif d22 2 a23 1 CPPFLAGS+= -DCHMOD='"${CHMOD}"' -DCHOWN='"${CHOWN}"' -DCHGRP='"${CHGRP}"' @ 1.9 log @Reduce warning levels on NetBSD, to make this compile on the netbsd-1-5 branch. WARNS=2 turns on all kinds of stuff that isn't really appropriate, and isn't turned on in current. "-Wwrite-strings", in particular, triggers an error on a bit of harmless code in "file.c". Closes PR pkg/17840. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2002/08/03 18:29:53 seb Exp $ d3 1 a3 1 --- Makefile.inc.orig Thu Aug 1 03:46:30 2002 d15 1 a15 1 @@@@ -20,11 +23,11 @@@@ d29 1 a29 1 @@@@ -36,9 +39,27 @@@@ d52 1 @ 1.8 log @Until this package is updated one more time from basesrc, provide a patch for Solaris on FTP_CMD value in Makefile.inc. Fixed in revision 1.19 of basesrc/usr.sbin/pkg_install/Makefile.inc. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.inc.orig Thu Aug 1 10:46:30 2002 d15 6 a20 1 @@@@ -24,7 +27,7 @@@@ WARNS=2 d29 1 a29 1 @@@@ -36,9 +39,27 @@@@ CHOWN?= /usr/bin/chown @ 1.7 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-aa,v 1.6 2002/07/03 22:43:40 abs Exp $ d4 1 a4 1 +++ Makefile.inc Thu Aug 1 10:56:14 2002 d15 10 a24 1 @@@@ -36,9 +39,27 @@@@ @ 1.6 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 --- Makefile.inc.orig Sun Apr 8 15:11:48 2001 +++ Makefile.inc d15 1 a15 1 @@@@ -32,9 +35,27 @@@@ @ 1.5 log @Update the pkg_* tools to version 20020218. Changes summary: - Support digital signatures in binary packages. - Use full path name to tar. - Fix ``pkg_add -u'' for packages without dependencies. - Add ``-U'' and ``-I'' options to pkg_create. - Close some memory leaks. - Add ``-n'' argument to pkg_info to show needed packages. - Fix pkg_info to not FTP unneccessarily - Improve version number handling: - recognition of "pl" ("patchlevel") and "rc" ("release candidate") strings - recognition of '_' and "pl" as pseudonyms for '.' (1.2pl2 == 1.2.2) - handle alphabetic characters properly (1.2e == 1.2.5) - 64-bit integers are used internally for each component of the version number. - Various internal cleanups, bugfixes, and API tweaks. @ text @d3 3 a5 4 --- Makefile.orig Fri Feb 8 19:18:50 2002 +++ Makefile @@@@ -2,5 +2,7 @@@@ # Original from FreeBSD, no rcs id. d7 1 a7 4 -SUBDIR=lib .WAIT add admin create delete info +SUBDIR=lib add admin create delete info + +all-add all-admin all-create all-delete all-info: all-lib d9 34 a42 1 .include @ 1.5.2.1 log @Merge changes from HEAD of pkgsrc/pkgtools to buildlink2 branch. @ text @d3 4 a6 3 --- Makefile.inc.orig Thu Aug 1 04:46:30 2002 +++ Makefile.inc @@@@ -3,6 +3,9 @@@@ d8 4 a11 1 .include d13 1 a13 49 +.if !defined(PRINTOBJDIR) +PRINTOBJDIR= printf "xxx: .MAKE\n\t@@echo \$${.OBJDIR}\n" | ${MAKE} -B -s -f- +.endif LIBINSTALL != cd ${.CURDIR}/../lib && ${PRINTOBJDIR} CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG} -DBINDIR='"${BINDIR}"' @@@@ -20,11 +23,11 @@@@ OPSYS="unknown" CHMOD?= /bin/chmod CHOWN?= /usr/sbin/chown CHGRP?= /usr/bin/chgrp -WARNS=2 +WARNS=1 .elif ${OPSYS} == "SunOS" LOCALBASE?= /usr/pkg TAR_CMD?= tar -FTP_CMD?= tar +FTP_CMD?= ftp ZOULARISBASE?= ${LOCALBASE}/bsd TAR_FULLPATHNAME?= ${ZOULARISBASE}/bin/${TAR_CMD} FTP_FULLPATHNAME?= ${ZOULARISBASE}/bin/${FTP_CMD} @@@@ -36,9 +39,28 @@@@ CHOWN?= /usr/bin/chown CHGRP?= /usr/bin/chgrp WARNS=0 .elif ${OPSYS} == "Linux" +LOCALBASE?= /usr/pkg CHMOD?= /bin/chmod CHOWN?= /bin/chown CHGRP?= /bin/chgrp +LDADD+= -ldb1 +.PATH: ${DIGESTDIR} +CPPFLAGS+= -I${DIGESTDIR} +MKCATPAGES= no +TAR_CMD?= tar +TAR_FULLPATHNAME?= /bin/${TAR_CMD} +CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"' +CPPFLAGS+=-DTAR_MISSING_FAST_READ -DFGETLN_MISSING +.elif ${OPSYS} == "Darwin" +CHMOD?= /bin/chmod +CHOWN?= /usr/sbin/chown +CHGRP?= /usr/bin/chgrp +TAR_CMD?= gnutar +TAR_FULLPATHNAME?= /usr/bin/${TAR_CMD} +CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"' +CPPFLAGS+=-DTAR_MISSING_FAST_READ +.PATH: ${DIGESTDIR} +CPPFLAGS+= -I${DIGESTDIR} .endif CPPFLAGS+= -DCHMOD='"${CHMOD}"' -DCHOWN='"${CHOWN}"' -DCHGRP='"${CHGRP}"' @ 1.4 log @fix. really. now. @ text @d3 2 a4 2 --- Makefile.orig Wed Jan 10 03:25:36 2001 +++ Makefile Wed Mar 7 02:10:41 2001 a8 2 +# .WAIT was introduced in post-1.5 NetBSD-current: +#HF#SUBDIR=lib .WAIT add admin create delete info d10 2 @ 1.3 log @Next fix - go back to MD5 checksums, and rework patch @ text @d4 2 a5 2 +++ Makefile @@@@ -2,4 +2,6 @@@@ d8 1 d11 1 a11 1 SUBDIR=lib .WAIT add admin create delete info d13 1 @ 1.2 log @ * Forgot patch-sum file from last commit * Reduce context from patch-aa, as it contains a RCS Id (that's what you get for not using pkgdiff!) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2001/03/07 00:17:29 hubertf Exp $ d3 3 a5 8 Index: Makefile =================================================================== RCS file: /cvsroot/basesrc/usr.sbin/pkg_install/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 2001/01/09 03:13:43 1.5 +++ Makefile 2001/03/06 23:54:39 @@@@ -1,6 +1,7 @@@@ d8 1 a8 1 -SUBDIR=lib .WAIT add admin create delete info d10 1 a10 1 +SUBDIR=lib add admin create delete info @ 1.1 log @Fix this to compile on systems that don't have a make(1) from post-1.5 NetBSD-current. XXX is removal of NO_PATCH ok here? (Zoularis context etc.) @ text @d1 1 a1 1 $NetBSD$ a10 1 # $NetBSD: Makefile,v 1.5 2001/01/09 03:13:43 lukem Exp $ a16 1 .include @