summaryrefslogtreecommitdiff
path: root/archivers/zip
diff options
context:
space:
mode:
authordsainty <dsainty>2009-08-30 22:52:58 +0000
committerdsainty <dsainty>2009-08-30 22:52:58 +0000
commit204c4dd6938a45d9cc599f5c0d5ebc971ec8f89a (patch)
treefd723fb5b2f8b7b06aafb45749025f8925619093 /archivers/zip
parentbecf4d3875310c0b08823947dd627e5a8040459e (diff)
downloadpkgsrc-204c4dd6938a45d9cc599f5c0d5ebc971ec8f89a.tar.gz
Patch zip's Makefile to pass LDFLAGS at link time to include Pkgsrc's run time
link path. Required for finding non-builtin bzip2 library. Bump PKGREVISION, since the problem only comes to light at run time.
Diffstat (limited to 'archivers/zip')
-rw-r--r--archivers/zip/Makefile3
-rw-r--r--archivers/zip/distinfo3
-rw-r--r--archivers/zip/patches/patch-aa16
3 files changed, 20 insertions, 2 deletions
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 6b402101b5a..0f19e055cd8 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2009/08/26 22:33:15 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2009/08/30 22:52:58 dsainty Exp $
DISTNAME= zip30
PKGNAME= zip-3.0
+PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/
EXTRACT_SUFX= .tgz
diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo
index 04b0e292d0c..3d6f0bfa9b9 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2009/08/26 22:33:15 wiz Exp $
+$NetBSD: distinfo,v 1.11 2009/08/30 22:52:58 dsainty Exp $
SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182
RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232
Size (zip30.tgz) = 1118845 bytes
+SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3
diff --git a/archivers/zip/patches/patch-aa b/archivers/zip/patches/patch-aa
new file mode 100644
index 00000000000..2728cfd9f12
--- /dev/null
+++ b/archivers/zip/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.3 2009/08/30 22:52:58 dsainty Exp $
+
+Pass LDFLAGS at link time to include Pkgsrc's run time link path. Required
+for finding non-builtin bzip2 library.
+
+--- unix/Makefile.orig 2009-08-31 10:36:31.754566116 +1200
++++ unix/Makefile 2009-08-31 10:34:26.602678228 +1200
+@@ -23,7 +23,7 @@
+
+ # (to use the GNU compiler, change cc to gcc in CC)
+ CC = cc
+-BIND = $(CC)
++BIND = $(CC) $(LDFLAGS)
+ AS = $(CC) -c
+ CPP = /lib/cpp
+ E =