diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-03 07:53:55 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-03 07:53:55 +0000 |
| commit | 30fd24550341d9a6a22039d9bb6945580121ddcb (patch) | |
| tree | 9cb48f2be1841e9623a6a549001a14c6db96561f /archivers | |
| parent | 8df039bdcec90706ec3e3b537c7705aa09db805e (diff) | |
| download | pkgsrc-30fd24550341d9a6a22039d9bb6945580121ddcb.tar.gz | |
unzipsfx does not need libz. Patch provided by Hrvoje Habjanic in
http://mail-index.netbsd.org/pkgsrc-users/2006/11/02/0003.html
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/unzip/Makefile | 6 | ||||
| -rw-r--r-- | archivers/unzip/distinfo | 3 | ||||
| -rw-r--r-- | archivers/unzip/patches/patch-ad | 27 |
3 files changed, 32 insertions, 4 deletions
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index 9d1ae9e4784..0d7a3c4155c 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2006/09/09 02:41:54 obache Exp $ +# $NetBSD: Makefile,v 1.66 2006/11/03 07:53:55 rillig Exp $ DISTNAME= unzip552 PKGNAME= unzip-5.52 @@ -24,8 +24,8 @@ BUILD_TARGET= generic_zlib unzipsfx CFLAGS+= -DBSD .endif CFLAGS+= -I. -DUNIX -Dunix -DUSE_UNSHRINK -MAKE_FLAGS+= CF=${CPPFLAGS:M*:Q}\ ${CFLAGS:M*:Q} -MAKE_FLAGS+= LF2=${_STRIPFLAG_CC:Q}\ ${LDFLAGS:M*:Q}\ -lz +MAKE_FLAGS+= CF=${CPPFLAGS:Q}\ ${CFLAGS:Q} +MAKE_FLAGS+= LF2=${_STRIPFLAG_CC:Q}\ ${LDFLAGS:Q}\ -lz INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc diff --git a/archivers/unzip/distinfo b/archivers/unzip/distinfo index 472b88974eb..6305bc05bde 100644 --- a/archivers/unzip/distinfo +++ b/archivers/unzip/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2005/10/10 01:57:08 rillig Exp $ +$NetBSD: distinfo,v 1.16 2006/11/03 07:53:55 rillig Exp $ SHA1 (unzip-5.52/unzip552.tar.gz) = 1831bd59b9e607a69052f83b263384895e2d4a19 RMD160 (unzip-5.52/unzip552.tar.gz) = b749b0923bc4cceaa6f937aef688e9713a84328c @@ -6,3 +6,4 @@ Size (unzip-5.52/unzip552.tar.gz) = 1140291 bytes SHA1 (patch-aa) = de66b7b5c45904167e8596ce5235d957c2df4d2a SHA1 (patch-ab) = dd426fdf4b774bd73f4ee46da470ffa3c2cf6513 SHA1 (patch-ac) = ada9059d9b3384396bbf6437f55fa40f2f6c0c73 +SHA1 (patch-ad) = a0ad66bc1f13dd1ec9f9d7c9eb5b49ca3edb09be diff --git a/archivers/unzip/patches/patch-ad b/archivers/unzip/patches/patch-ad new file mode 100644 index 00000000000..604b13444cd --- /dev/null +++ b/archivers/unzip/patches/patch-ad @@ -0,0 +1,27 @@ +$NetBSD: patch-ad,v 1.1 2006/11/03 07:53:55 rillig Exp $ + +unzipsfx does not need libz, so a special compile rule is needed for it. + +--- unix/Makefile.orig Mon Oct 30 22:45:35 2006 ++++ unix/Makefile Mon Oct 30 22:48:02 2006 +@@ -87,7 +87,7 @@ + OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $M$O + LOBJS = $(OBJS) + OBJSDLL = $(OBJS:.o=.pic.o) api.pic.o +-OBJX = unzipsfx$O $(CRC32)$O crctab_$O crypt_$O extract_$O fileio_$O \ ++OBJX = unzipsfx$O crc32_$O crctab_$O crypt_$O extract_$O fileio_$O \ + globals_$O inflate_$O match_$O process_$O ttyio_$O $M_$O + LOBJX = $(OBJX) + OBJF = funzip$O $(CRC32)$O cryptf$O globalsf$O inflatef$O ttyiof$O +@@ -306,6 +306,11 @@ + -$(CP) unzip.c unzipsfx.c + $(CC) -c $(CF) -DSFX unzipsfx.c + $(RM) unzipsfx.c ++ ++crc32_$O: crc32.c $(UNZIP_H) zip.h # unzipsfx only ++ -$(CP) crc32.c crc32_.c ++ $(CC) -c $(CF) -DSFX crc32_.c ++ $(RM) crc32_.c + + crctab_$O: crctab.c $(UNZIP_H) zip.h + -$(CP) crctab.c crctab_.c |