Revision: 14924
http://gar.svn.sourceforge.net/gar/?rev=14924&view=rev
Author: dmichelsen
Date: 2011-06-28 13:13:36 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
p7zip: Update to 9.20.1
Modified Paths:
--------------
csw/mgar/pkg/p7zip/trunk/Makefile
csw/mgar/pkg/p7zip/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/p7zip/trunk/files/0001-Disable-unrecognized-pragma.patch
Modified: csw/mgar/pkg/p7zip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/p7zip/trunk/Makefile 2011-06-28 11:37:04 UTC (rev 14923)
+++ csw/mgar/pkg/p7zip/trunk/Makefile 2011-06-28 13:13:36 UTC (rev 14924)
@@ -1,5 +1,5 @@
NAME = p7zip
-VERSION = 9.04
+VERSION = 9.20.1
CATEGORIES = utils
DESCRIPTION = File archiver with high compression ratio
@@ -22,32 +22,45 @@
* Self-extracting capability for 7z format
endef
-MASTER_SITES = http://garr.dl.sourceforge.net/sourceforge/p7zip/
-DISTFILES = $(NAME)_$(VERSION)_src_all.tar.bz2
+MASTER_SITES = $(SF_MIRROR)
+DISTNAME = $(NAME)_$(VERSION)
+DISTFILES = $(DISTNAME)_src_all.tar.bz2
+PATCHFILES += patch-CPP-7zip-Archive-Zip-ZipHandler.cpp
+PATCHFILES += patch-install.sh
+PATCHFILES += 0001-Disable-unrecognized-pragma.patch
-# We define upstream file regex so we can be notifed of new upstream software
-# release, atm not used
-# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+VENDOR_URL = http://p7zip.sourceforge.net/
+LICENSE = DOCS/License.txt
# since there is no configure script, this is intentionally left empty
CONFIGURE_SCRIPTS =
-# add CFLAGS
-BUILD_ARGS = LOCAL_FLAGS="$(CFLAGS)"
+# Defaults taken from makefile.solaris_sparc_CC_32
+EXTRA_CPPFLAGS = -s -mt \
+ -DHAVE_LONG_LONG \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ -DENV_UNIX \
+ -DNDEBUG -D_REENTRANT
+EXTRA_CPPFLAGS += -DBREAK_HANDLER -DUNICODE -D_UNICODE
+EXTRA_CPPFLAGS += -I../../C
-# add INSTALL arguments
-INSTALL_ARGS = DEST_HOME="$(DESTDIR)/$(prefix)"
-INSTALL_ARGS += DEST_MAN="$(DESTDIR)/$(mandir)"
+BUILD_OVERRIDE_VARS = CXX CC CC_SHARED LINK_SHARED LOCAL_LIBS LOCAL_LIBS_DLL
OBJ_CRC32
+BUILD_OVERRIDE_VAR_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS)
+BUILD_OVERRIDE_VAR_CC = $(CC) $(CPPFLAGS) $(CFLAGS)
+BUILD_OVERRIDE_VAR_CC_SHARED = $(LDFLAGS) -KPIC
+BUILD_OVERRIDE_VAR_LINK_SHARED = $(LDFLAGS) -KPIC -G
+BUILD_OVERRIDE_VAR_LOCAL_LIBS = -lpthread -lCrun
+BUILD_OVERRIDE_VAR_LOCAL_LIBS += -norunpath
+BUILD_OVERRIDE_VAR_LOCAL_LIBS_DLL = -lpthread -lCrun -ldl
+BUILD_OVERRIDE_VAR_LOCAL_LIBS_DLL += -norunpath
+BUILD_OVERRIDE_VAR_OBJ_CRC32 = $$(OBJ_CRC32_C)
-# fix distname
-DISTNAME = $(NAME)_$(VERSION)
+INSTALL_ARGS = DEST_HOME="$(DESTDIR)$(prefix)"
+INSTALL_ARGS += DEST_MAN="$(DESTDIR)$(mandir)"
-# patch files
-PATCHFILES = patch-CPP-7zip-Archive-Zip-ZipHandler.cpp
-PATCHFILES += patch-install.sh
+# Location of the system locale
+CHECKPKG_OVERRIDES_CSWp7zip +=
file-with-bad-content|/usr/share|root/opt/csw/share/doc/p7zip/README
+# This is an example
+CHECKPKG_OVERRIDES_CSWp7zip +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/p7zip/README
include gar/category.mk
-
-# makefile
-pre-build-modulated:
- @cp $(WORKSRC)/makefile.solaris_sparc_CC_32 $(WORKSRC)/makefile.machine
Modified: csw/mgar/pkg/p7zip/trunk/checksums
===================================================================
--- csw/mgar/pkg/p7zip/trunk/checksums 2011-06-28 11:37:04 UTC (rev 14923)
+++ csw/mgar/pkg/p7zip/trunk/checksums 2011-06-28 13:13:36 UTC (rev 14924)
@@ -1,3 +1 @@
-9194ebf9a2b3735d236aed001de5f6f8 p7zip_9.04_src_all.tar.bz2
-6d31812ad3facefbc8ba8bd750522be7 patch-CPP-7zip-Archive-Zip-ZipHandler.cpp
-06482af0e45c61b245b2f664602e4742 patch-install.sh
+bd6caaea567dc0d995c990c5cc883c89 p7zip_9.20.1_src_all.tar.bz2
Added: csw/mgar/pkg/p7zip/trunk/files/0001-Disable-unrecognized-pragma.patch
===================================================================
--- csw/mgar/pkg/p7zip/trunk/files/0001-Disable-unrecognized-pragma.patch
(rev 0)
+++ csw/mgar/pkg/p7zip/trunk/files/0001-Disable-unrecognized-pragma.patch
2011-06-28 13:13:36 UTC (rev 14924)
@@ -0,0 +1,34 @@
+From 64f606a0f73a205186f35579a739380f6f92ba4c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Tue, 28 Jun 2011 11:45:39 +0200
+Subject: [PATCH 3/3] Disable unrecognized pragma
+
+---
+ C/Ppmd.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/C/Ppmd.h b/C/Ppmd.h
+index 621d927..d0ecf4a 100644
+--- a/C/Ppmd.h
++++ b/C/Ppmd.h
+@@ -29,7 +29,7 @@ EXTERN_C_BEGIN
+ #define PPMD_N4 ((128 + 3 - 1 * PPMD_N1 - 2 * PPMD_N2 - 3 * PPMD_N3) / 4)
+ #define PPMD_NUM_INDEXES (PPMD_N1 + PPMD_N2 + PPMD_N3 + PPMD_N4)
+
+-#pragma pack(push,1)
++/* #pragma pack(push,1) */
+
+ /* SEE-contexts for PPM-contexts with masked symbols */
+ typedef struct
+@@ -50,7 +50,7 @@ typedef struct
+ UInt16 SuccessorHigh;
+ } CPpmd_State;
+
+-#pragma pack(pop)
++/* #pragma pack(pop) */
+
+ typedef
+ #ifdef PPMD_32BIT
+--
+1.7.5.4
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
