[Midnightbsd-cvs] mports [16823] fix build of p7zip
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 6 11:52:43 EDT 2014
Revision: 16823
http://svnweb.midnightbsd.org/mports/?rev=16823
Author: laffer1
Date: 2014-09-06 11:52:43 -0400 (Sat, 06 Sep 2014)
Log Message:
-----------
fix build of p7zip
Modified Paths:
--------------
trunk/archivers/p7zip/Makefile
trunk/archivers/p7zip/files/7z
trunk/archivers/p7zip/pkg-plist
Property Changed:
----------------
trunk/archivers/p7zip/files/7z
trunk/archivers/p7zip/files/patch-CPP-Windows-System.cpp
Modified: trunk/archivers/p7zip/Makefile
===================================================================
--- trunk/archivers/p7zip/Makefile 2014-09-06 15:43:39 UTC (rev 16822)
+++ trunk/archivers/p7zip/Makefile 2014-09-06 15:52:43 UTC (rev 16823)
@@ -2,6 +2,7 @@
PORTNAME= p7zip
PORTVERSION= 9.20.1
+PORTREVISION?= 1
CATEGORIES= archivers
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all
@@ -10,86 +11,45 @@
COMMENT= File archiver with high compression ratio
LICENSE= agg
-OPTIONS= MINIMAL "Support only .7z file format" off \
- MODULES "Build modules" on
+LICENSE?= lpgl2.1
+ALL_TARGET?= all3
USES= tar:bzip2
MAKEFILE= makefile
+MAKE_ARGS= OPTFLAGS="${CXXFLAGS}"
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
-.include <bsd.mport.options.mk>
+CFLAGS_amd64= -fPIC
+CFLAGS_ia64= -fPIC
-.if defined(WITH_MINIMAL)
-MAN1= 7zr.1
-MLINKS= 7zr.1 7z.1
-PLIST_SUB= MODULES="@comment "
-ALL_TARGET= 7zr
-7ZBIN= 7zr
-PLIST_FILES= bin/7zr \
- bin/7z
-.else
-MAN1= 7z.1 7za.1 7zr.1 p7zip.1
-DLLDIR= ${PREFIX}/libexec/p7zip
-ALL_TARGET= 7za 7zr sfx
-7ZBIN= 7za 7zr 7zCon.sfx
-PLIST_FILES= bin/7z \
- bin/7za \
- bin/7zr \
- bin/p7zip \
- libexec/p7zip/7za \
- libexec/p7zip/7zr \
- libexec/p7zip/7zCon.sfx
-.if !defined(WITHOUT_MODULES)
-ALL_TARGET= 7z 7za 7zr Client7z sfx
-7ZBIN= 7z 7za 7zr Client7z 7zCon.sfx
-PLIST_DIRS+= libexec/p7zip/Codecs
-PLIST_FILES+= libexec/p7zip/7z \
- libexec/p7zip/7z.so \
- libexec/p7zip/Client7z \
- libexec/p7zip/Codecs/Rar29.so
-.endif
-PLIST_DIRS+= libexec/p7zip
-.endif
+OPTIONS_DEFINE= DOCS
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CFLAGS+= -fPIC
-.endif
-
post-patch:
- ${SED} -e 's!-O!${CFLAGS} ${PTHREAD_CFLAGS}!' \
- -e 's!g\+\+!${CXX}!' \
+ ${SED} -e 's!g\+\+!${CXX}!' \
-e 's!gcc!${CC}!' \
-e 's/-D_LARGEFILE_SOURCE//' \
-e 's/-D_FILE_OFFSET_BITS=64//' \
- -e 's/-lpthread/${PTHREAD_LIBS}/' \
${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine
${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \
${WRKSRC}/man1/*
${MV} ${WRKSRC}/README ${WRKSRC}/DOCS/readme.unix
- ${MV} ${WRKSRC}/contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 ${WRKSRC}/man1/
+.if ! defined(PKGNAMESUFFIX)
do-install:
-.if defined(WITH_MINIMAL)
- cd ${WRKSRC}/bin/&&${INSTALL_PROGRAM} ${7ZBIN} ${PREFIX}/bin/
- ${LN} -sf ${PREFIX}/bin/7zr ${PREFIX}/bin/7z
-.else
- ${INSTALL} -d ${DLLDIR}/
- cd ${WRKSRC}/bin/&&${INSTALL_PROGRAM} ${7ZBIN} ${DLLDIR}/
- ${INSTALL_SCRIPT} ${FILESDIR}/7z ${PREFIX}/bin/
- ${LN} -sf 7z ${PREFIX}/bin/7za
- ${LN} -sf 7z ${PREFIX}/bin/7zr
- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/gzip-like_CLI_wrapper_for_7z/p7zip ${PREFIX}/bin/
-.if !defined(WITHOUT_MODULES)
- ${INSTALL} -d ${DLLDIR}/Codecs/
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/Codecs/Rar29.so ${DLLDIR}/Codecs/
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z.so ${DLLDIR}/
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/p7zip
+.for BINARY in 7z 7za 7zr 7zCon.sfx
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINARY} ${STAGEDIR}${PREFIX}/libexec/p7zip
+.endfor
+ ${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${STAGEDIR}${PREFIX}/libexec/p7zip
+
+ ${INSTALL_SCRIPT} ${FILESDIR}/7z ${STAGEDIR}${PREFIX}/bin
+ ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za
+ ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr
+
+ (cd ${WRKSRC}/DOCS && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+ (cd ${WRKSRC}/man1 && \
+ ${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1)
.endif
-.endif
-.if !defined(NOPORTDOCS)
- @cd ${WRKSRC}/DOCS/&&${COPYTREE_SHARE} . ${DOCSDIR}/
-.endif
- @cd ${WRKSRC}/man1/&&${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/archivers/p7zip/files/7z
===================================================================
--- trunk/archivers/p7zip/files/7z 2014-09-06 15:43:39 UTC (rev 16822)
+++ trunk/archivers/p7zip/files/7z 2014-09-06 15:52:43 UTC (rev 16823)
@@ -1,9 +1,6 @@
-#! /bin/sh
+#!/bin/sh
PROGNAME=${0##*/}
BINPATH=$(dirname $(realpath $0))/../libexec/p7zip
-if [ $PROGNAME = "7z" -a ! -x "$BINPATH/7z" -a -x "$BINPATH/7za" ]; then
- PROGNAME=7za
-fi
exec "$BINPATH/$PROGNAME" "$@"
Property changes on: trunk/archivers/p7zip/files/7z
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/archivers/p7zip/files/patch-CPP-Windows-System.cpp
===================================================================
--- trunk/archivers/p7zip/files/patch-CPP-Windows-System.cpp 2014-09-06 15:43:39 UTC (rev 16822)
+++ trunk/archivers/p7zip/files/patch-CPP-Windows-System.cpp 2014-09-06 15:52:43 UTC (rev 16823)
Property changes on: trunk/archivers/p7zip/files/patch-CPP-Windows-System.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/archivers/p7zip/pkg-plist
===================================================================
--- trunk/archivers/p7zip/pkg-plist 2014-09-06 15:43:39 UTC (rev 16822)
+++ trunk/archivers/p7zip/pkg-plist 2014-09-06 15:52:43 UTC (rev 16823)
@@ -1,3 +1,14 @@
+bin/7z
+bin/7za
+bin/7zr
+libexec/p7zip/7z
+libexec/p7zip/7z.so
+libexec/p7zip/7zCon.sfx
+libexec/p7zip/7za
+libexec/p7zip/7zr
+man/man1/7z.1.gz
+man/man1/7za.1.gz
+man/man1/7zr.1.gz
%%PORTDOCS%%%%DOCSDIR%%/7zC.txt
%%PORTDOCS%%%%DOCSDIR%%/7zFormat.txt
%%PORTDOCS%%%%DOCSDIR%%/License.txt
@@ -51,3 +62,4 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%/MANUAL/switches
%%PORTDOCS%%@dirrm %%DOCSDIR%%/MANUAL
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrmtry libexec/p7zip
More information about the Midnightbsd-cvs
mailing list