diff options
| -rw-r--r-- | archivers/p7zip/Makefile | 6 | ||||
| -rw-r--r-- | archivers/p7zip/distinfo | 12 | ||||
| -rw-r--r-- | archivers/p7zip/patches/patch-aa | 13 | ||||
| -rw-r--r-- | archivers/p7zip/patches/patch-ac | 7 |
4 files changed, 20 insertions, 18 deletions
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile index 8461d137304..5504369e8ca 100644 --- a/archivers/p7zip/Makefile +++ b/archivers/p7zip/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2007/06/01 00:54:47 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2007/07/02 07:19:03 adam Exp $ -DISTNAME= p7zip_4.47_src_all -PKGNAME= p7zip-4.47 +DISTNAME= p7zip_4.48_src_all +PKGNAME= p7zip-4.48 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/} EXTRACT_SUFX= .tar.bz2 diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo index 0fe4a1793a9..12df179cebb 100644 --- a/archivers/p7zip/distinfo +++ b/archivers/p7zip/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.25 2007/05/29 12:24:51 adam Exp $ +$NetBSD: distinfo,v 1.26 2007/07/02 07:19:03 adam Exp $ -SHA1 (p7zip_4.47_src_all.tar.bz2) = 568abf5571fe92c18798feb582604c0f5563a6b0 -RMD160 (p7zip_4.47_src_all.tar.bz2) = 7bb770ad4f721bdc024052e24d9c5fbb1bc3c04c -Size (p7zip_4.47_src_all.tar.bz2) = 1477689 bytes -SHA1 (patch-aa) = a95d9721db8de642ae8ff38e58ea3107f9518287 +SHA1 (p7zip_4.48_src_all.tar.bz2) = d800f3e7abaffc62d91fd0320eb588a53dafd17c +RMD160 (p7zip_4.48_src_all.tar.bz2) = 2caae333dea746221cb074dc976444f9de5d5daf +Size (p7zip_4.48_src_all.tar.bz2) = 1487947 bytes +SHA1 (patch-aa) = 5e7d8175440a500642adba3fe0579dd40329e166 SHA1 (patch-ab) = 98578e58d3abf4e0fe0615f10c563cac78ceb047 -SHA1 (patch-ac) = ed38fe44c9b1ee3fb502edef47cf28ed5852a95b +SHA1 (patch-ac) = ad7be88ca5af55c8c40fdef2a0f9a19cb20db38b diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa index 2fa85579d7a..e4d14279d2f 100644 --- a/archivers/p7zip/patches/patch-aa +++ b/archivers/p7zip/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.15 2007/04/30 09:12:54 adam Exp $ +$NetBSD: patch-aa,v 1.16 2007/07/02 07:19:03 adam Exp $ ---- makefile.machine.orig 2007-04-21 21:01:38.000000000 +0200 +--- makefile.machine.orig 2007-07-01 19:02:13.000000000 +0200 +++ makefile.machine -@@ -3,19 +3,19 @@ +@@ -3,20 +3,20 @@ # LITTLE_ENDIAN and BIG_ENDIAN are already defined by the system headers # -OPTFLAGS=-O +OPTFLAGS= --ALLFLAGS=${OPTFLAGS} -s -fPIC \ +-ALLFLAGS=${OPTFLAGS} -s \ +ALLFLAGS=${OPTFLAGS} -Wall \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -DNDEBUG -D_REENTRANT -DENV_UNIX \ @@ -17,9 +17,12 @@ $NetBSD: patch-aa,v 1.15 2007/04/30 09:12:54 adam Exp $ -CXX=g++ $(ALLFLAGS) -CC=gcc $(ALLFLAGS) +-CC_SHARED=-fPIC +-LINK_SHARED=-fPIC -shared +CXX+=$(ALLFLAGS) +CC+=$(ALLFLAGS) - LINK_SHARED=-shared ++CC_SHARED= ++LINK_SHARED=-shared -LOCAL_LIBS=-lpthread -LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl diff --git a/archivers/p7zip/patches/patch-ac b/archivers/p7zip/patches/patch-ac index ed09c9d3307..dc1171b6675 100644 --- a/archivers/p7zip/patches/patch-ac +++ b/archivers/p7zip/patches/patch-ac @@ -1,9 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2005/06/24 14:32:13 wiz Exp $ +$NetBSD: patch-ac,v 1.5 2007/07/02 07:19:03 adam Exp $ ---- makefile.glb.orig 2005-01-29 20:13:32.000000000 +0100 +--- makefile.glb.orig 2007-06-28 10:07:11.000000000 +0200 +++ makefile.glb -@@ -2,7 +2,7 @@ - MY_HOME=../../../myWindows +@@ -1,6 +1,6 @@ RM=rm -f -CFLAGS=-c \ |