diff options
| author | agc <agc> | 2001-12-17 21:23:42 +0000 |
|---|---|---|
| committer | agc <agc> | 2001-12-17 21:23:42 +0000 |
| commit | 635336b73c251e63b841ce7c356cc1c4bbf2b50d (patch) | |
| tree | 1e59c54f7189546fd422d790d3ed3ae949758d1a /pkgtools | |
| parent | c0ae6523b9856de4bdd0d199ddc580e1693d2986 (diff) | |
| download | pkgsrc-635336b73c251e63b841ce7c356cc1c4bbf2b50d.tar.gz | |
Patches from Yuji Yamano <yyamano@kt.rim.or.jp> to make this compile
properly on Darwin.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/distinfo | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/patches/patch-ab | 10 | ||||
| -rw-r--r-- | pkgtools/pkg_install/patches/patch-ac | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgtools/pkg_install/distinfo b/pkgtools/pkg_install/distinfo index e2fbdb3bdde..b52d4fa9db3 100644 --- a/pkgtools/pkg_install/distinfo +++ b/pkgtools/pkg_install/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/10/30 14:17:02 agc Exp $ +$NetBSD: distinfo,v 1.4 2001/12/17 21:23:42 agc Exp $ SHA1 (pkg_install-20010724.tar.gz) = 313c28bdde6e7206c16be1d29f1990ff84460bf0 Size (pkg_install-20010724.tar.gz) = 75229 bytes SHA1 (patch-aa) = 5bf9b47353a457673b57ccf4a872ea94eb490b08 -SHA1 (patch-ab) = 9eab139268bc26d8769800fa03c5f7d285dc3798 -SHA1 (patch-ac) = 3e28ba2a0a665092015dac847e2cd4e6237fec4c +SHA1 (patch-ab) = 979a94db4a78ed20318abfc06f1188b87252ede4 +SHA1 (patch-ac) = 722a7fe8cd01854fc54afb11907b4d245244887a diff --git a/pkgtools/pkg_install/patches/patch-ab b/pkgtools/pkg_install/patches/patch-ab index a217f3aec46..c66dd3c6b10 100644 --- a/pkgtools/pkg_install/patches/patch-ab +++ b/pkgtools/pkg_install/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2001/10/30 14:17:03 agc Exp $ +$NetBSD: patch-ab,v 1.3 2001/12/17 21:23:42 agc Exp $ ---- Makefile.inc Mon Oct 29 15:55:48 2001 -+++ Makefile.inc Mon Oct 29 15:47:43 2001 +--- Makefile.inc 2001/12/17 21:10:41 1.1 ++++ Makefile.inc 2001/12/17 21:13:54 @@ -3,6 +3,9 @@ .include <bsd.own.mk> @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.2 2001/10/30 14:17:03 agc Exp $ LIBINSTALL != cd ${.CURDIR}/../lib && ${PRINTOBJDIR} CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG} -DBINDIR='"${BINDIR}"' -@@ -35,6 +38,10 @@ +@@ -35,6 +38,12 @@ CHMOD?= /bin/chmod CHOWN?= /bin/chown CHGRP?= /bin/chgrp @@ -20,6 +20,8 @@ $NetBSD: patch-ab,v 1.2 2001/10/30 14:17:03 agc Exp $ +CHMOD?= /bin/chmod +CHOWN?= /usr/sbin/chown +CHGRP?= /usr/bin/chgrp ++.PATH: ${DIGESTDIR} ++CPPFLAGS+= -I${DIGESTDIR} .endif CPPFLAGS+= -DCHMOD='"${CHMOD}"' -DCHOWN='"${CHOWN}"' -DCHGRP='"${CHGRP}"' diff --git a/pkgtools/pkg_install/patches/patch-ac b/pkgtools/pkg_install/patches/patch-ac index 6d1693eb1b3..38d79e150e6 100644 --- a/pkgtools/pkg_install/patches/patch-ac +++ b/pkgtools/pkg_install/patches/patch-ac @@ -1,19 +1,17 @@ -$NetBSD: patch-ac,v 1.1 2001/10/30 14:17:03 agc Exp $ +$NetBSD: patch-ac,v 1.2 2001/12/17 21:23:42 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 @@ +@@ -5,13 +5,23 @@ 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 |