summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-10-04 21:51:57 +0000
committerwiz <wiz@pkgsrc.org>2013-10-04 21:51:57 +0000
commit23c046e925911a0a698bd0354a68bb3c35870886 (patch)
treebad3b041576c607c799b048c2311d70abe889474 /archivers
parente9dbc0245f8c1a6b701333271a13fa4f512a8056 (diff)
downloadpkgsrc-23c046e925911a0a698bd0354a68bb3c35870886.tar.gz
Add support for WIM archives.
Based on PR 48261 by Nat Sloss. Bump PKGREVISION.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/p7zip/Makefile12
-rw-r--r--archivers/p7zip/PLIST3
2 files changed, 12 insertions, 3 deletions
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 137da8a63b8..e28b875f043 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2012/09/11 19:46:59 asau Exp $
+# $NetBSD: Makefile,v 1.52 2013/10/04 21:51:57 wiz Exp $
DISTNAME= p7zip_9.20.1_src_all
PKGNAME= p7zip-9.20.1
+PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/}
EXTRACT_SUFX= .tar.bz2
@@ -22,10 +23,11 @@ PTHREAD_OPTS+= require
PLIST_VARS= dll
# compiles, but does not recognize any archives as supported
-DYNAMIC_7Z= NO
+DYNAMIC_7Z= YES
.if !empty(DYNAMIC_7Z:MYES)
BUILD_TARGET= all2
PLIST.dll= yes
+CFLAGS+= -fPIC
.endif
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/-/_/}
@@ -42,6 +44,11 @@ INSTALLATION_DIRS+= share/doc/p7zip
INSTALLATION_DIRS+= share/doc/p7zip/commands
INSTALLATION_DIRS+= share/doc/p7zip/switches
+SUBST_CLASSES+= lib
+SUBST_FILES.lib+= CPP/7zip/UI/Common/LoadCodecs.cpp
+SUBST_SED.lib+= -e "s,getenv(.P7ZIP_HOME_DIR.),\"${PREFIX}/lib\","
+SUBST_STAGE.lib= post-patch
+
.include "../../mk/endian.mk"
.if !empty(MACHINE_ENDIAN:Mbig)
@@ -53,6 +60,7 @@ CFLAGS+= -DLITTLE_ENDIAN
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin
.if !empty(DYNAMIC_7Z:MYES)
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z.so ${DESTDIR}${PREFIX}/lib/
${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z
ln -f -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \
diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST
index 01a0edefd4d..697e847b643 100644
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.17 2011/03/21 13:45:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2013/10/04 21:51:57 wiz Exp $
bin/7z
bin/7za
+${PLIST.dll}lib/7z.so
${PLIST.dll}lib/7z/7z
${PLIST.dll}lib/7z/Codecs/Rar29.so
man/man1/7z.1