diff options
| author | agc <agc> | 2001-10-30 14:17:02 +0000 |
|---|---|---|
| committer | agc <agc> | 2001-10-30 14:17:02 +0000 |
| commit | 204a9b0279938e9a91a11c909e2b8155252a7dd2 (patch) | |
| tree | 36090515457d9ff3778ddfdb73e8ff773112a937 /pkgtools | |
| parent | ecdb881098f3ba8eb4c1e7a28b086068242114d8 (diff) | |
| download | pkgsrc-204a9b0279938e9a91a11c909e2b8155252a7dd2.tar.gz | |
Add patches for Darwin
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/distinfo | 5 | ||||
| -rw-r--r-- | pkgtools/pkg_install/patches/patch-ab | 22 | ||||
| -rw-r--r-- | pkgtools/pkg_install/patches/patch-ac | 32 |
3 files changed, 49 insertions, 10 deletions
diff --git a/pkgtools/pkg_install/distinfo b/pkgtools/pkg_install/distinfo index 3690e13e05b..e2fbdb3bdde 100644 --- a/pkgtools/pkg_install/distinfo +++ b/pkgtools/pkg_install/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/07/24 15:02:14 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/10/30 14:17:02 agc Exp $ SHA1 (pkg_install-20010724.tar.gz) = 313c28bdde6e7206c16be1d29f1990ff84460bf0 Size (pkg_install-20010724.tar.gz) = 75229 bytes SHA1 (patch-aa) = 5bf9b47353a457673b57ccf4a872ea94eb490b08 -SHA1 (patch-ab) = 1296ab3e41848154a91da1075f5de410e5fd0426 +SHA1 (patch-ab) = 9eab139268bc26d8769800fa03c5f7d285dc3798 +SHA1 (patch-ac) = 3e28ba2a0a665092015dac847e2cd4e6237fec4c diff --git a/pkgtools/pkg_install/patches/patch-ab b/pkgtools/pkg_install/patches/patch-ab index 1a5450850b3..a217f3aec46 100644 --- a/pkgtools/pkg_install/patches/patch-ab +++ b/pkgtools/pkg_install/patches/patch-ab @@ -1,12 +1,7 @@ -$NetBSD: patch-ab,v 1.1 2001/03/07 00:17:30 hubertf Exp $ +$NetBSD: patch-ab,v 1.2 2001/10/30 14:17:03 agc Exp $ -Index: Makefile.inc -=================================================================== -RCS file: /cvsroot/basesrc/usr.sbin/pkg_install/Makefile.inc,v -retrieving revision 1.14 -diff -u -r1.14 Makefile.inc ---- Makefile.inc 2001/01/07 08:00:58 1.14 -+++ Makefile.inc 2001/03/06 23:54:39 +--- Makefile.inc Mon Oct 29 15:55:48 2001 ++++ Makefile.inc Mon Oct 29 15:47:43 2001 @@ -3,6 +3,9 @@ .include <bsd.own.mk> @@ -17,3 +12,14 @@ diff -u -r1.14 Makefile.inc LIBINSTALL != cd ${.CURDIR}/../lib && ${PRINTOBJDIR} CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG} -DBINDIR='"${BINDIR}"' +@@ -35,6 +38,10 @@ + CHMOD?= /bin/chmod + CHOWN?= /bin/chown + CHGRP?= /bin/chgrp ++.elif ${OPSYS} == "Darwin" ++CHMOD?= /bin/chmod ++CHOWN?= /usr/sbin/chown ++CHGRP?= /usr/bin/chgrp + .endif + + CPPFLAGS+= -DCHMOD='"${CHMOD}"' -DCHOWN='"${CHOWN}"' -DCHGRP='"${CHGRP}"' diff --git a/pkgtools/pkg_install/patches/patch-ac b/pkgtools/pkg_install/patches/patch-ac new file mode 100644 index 00000000000..6d1693eb1b3 --- /dev/null +++ b/pkgtools/pkg_install/patches/patch-ac @@ -0,0 +1,32 @@ +$NetBSD: patch-ac,v 1.1 2001/10/30 14:17:03 agc Exp $ + +On Darwin, grab the md5 files and headers from the digest package + +--- lib/Makefile 2001/10/29 21:07:57 1.1 ++++ lib/Makefile 2001/10/29 21:08:11 +@@ -5,13 +5,25 @@ + SRCS+= exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \ + plist.c str.c version.c + ++OPSYS!= uname -s ++ ++.if ${OPSYS} == "Darwin" ++.PATH: ${DIGESTDIR} ++SRCS+= md5c.c md5hl.c ++CPPFLAGS+= -I${DIGESTDIR} ++.endif ++ + 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 + |