6 files changed, 11 insertions, 73 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 6a6b9e085fe8..1f0bd9d4a08a 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	p7zip
-PORTVERSION=	0.90
+PORTVERSION=	0.91
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	p7zip
@@ -18,15 +18,22 @@ COMMENT=	Command line versions of 7-zip
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
-MAKE_ARGS+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 ONLY_FOR_ARCHS=	alpha amd64 i386 ia64
 
+USE_REINPLACE=	yes
+MMACHINE=	${WRKSRC}/makefile.machine
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500039
 BROKEN=		'Requires wchar functions (mbrtowc(3) etc.) for compilation'
 .endif
 
+post-patch:
+	${ECHO} "LOCAL_LIBS=	${PTHREAD_LIBS}" > ${MMACHINE}
+	${ECHO} "LOCAL_FLAGS+=	${PTHREAD_CFLAGS}" >> ${MMACHINE}
+	${REINPLACE_CMD} -e 's/-O2/${CXXFLAGS}/' ${WRKSRC}/makefile.glb
+
 do-install:
 	${MKDIR} ${PREFIX}/libexec/p7zip/Codecs
 	${MKDIR} ${PREFIX}/libexec/p7zip/Formats
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 2ce404796344..e3850cd107ab 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,2 +1,2 @@
-MD5 (p7zip_0.90.tar.bz2) = 6600fd9711b5cebd52aac2ce4d9ba727
-SIZE (p7zip_0.90.tar.bz2) = 447371
+MD5 (p7zip_0.91.tar.bz2) = 8c6a7b49f360917cbdd8391f3a926a19
+SIZE (p7zip_0.91.tar.bz2) = 448147
diff --git a/archivers/p7zip/files/patch-aa b/archivers/p7zip/files/patch-aa
deleted file mode 100644
index 4f1cae45c679..000000000000
--- a/archivers/p7zip/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: myWindows/makefile
-@@ -1,8 +1,8 @@
- PROG=all.so
- 
--LOCAL_FLAGS=-I. -I.. -I../include_windows
-+LOCAL_FLAGS=-I. -I.. -I../include_windows ${PTHREAD_CFLAGS}
- 
--LOCAL_SHARED=-lpthread -lm
-+LOCAL_SHARED=${PTHREAD_LIBS}
- 
- OBJS=myEvents.o myFiles.o myFindFile.o myDirectoryAndPath.o \
- 	myLastError.o myModuleFileName.o my_itow.o \
diff --git a/archivers/p7zip/files/patch-ab b/archivers/p7zip/files/patch-ab
deleted file mode 100644
index e0453f5acc10..000000000000
--- a/archivers/p7zip/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: 7zip/UI/Console/makefile
-@@ -1,6 +1,6 @@
- PROG=../../../bin/7z
- 
--LOCAL_FLAGS=
-+LOCAL_FLAGS=${PTHREAD_CFLAGS}
- 
- OPERATING_SYSTEM=$(shell uname -o)
- 
-@@ -8,7 +8,7 @@
- # Cygwin does not support -ldl
- LOCAL_LIBS=-lpthread
- else
--LOCAL_LIBS=-lpthread -ldl -lm
-+LOCAL_LIBS=${PTHREAD_LIBS}
- endif
- 
- MY_WINDOWS=$(MY_HOME)/myDirectoryAndPath.o \
diff --git a/archivers/p7zip/files/patch-ac b/archivers/p7zip/files/patch-ac
deleted file mode 100644
index c05d94603c29..000000000000
--- a/archivers/p7zip/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: 7zip/Bundles/Alone/makefile
-@@ -6,7 +6,8 @@
- -DFORMAT_GZIP -DCOMPRESS_LZMA -DCOMPRESS_BCJ_X86 -DCOMPRESS_BCJ2 \
- -DCOMPRESS_COPY -DCOMPRESS_MF_PAT -DCOMPRESS_MF_BT -DCOMPRESS_MF_HC \
- -DCOMPRESS_MF_MT -DCOMPRESS_PPMD -DCOMPRESS_DEFLATE -DCOMPRESS_DEFLATE64 \
---DCOMPRESS_IMPLODE -DCOMPRESS_BZIP2 -DCRYPTO_ZIP -DCRYPTO_7ZAES -DCRYPTO_AES
-+-DCOMPRESS_IMPLODE -DCOMPRESS_BZIP2 -DCRYPTO_ZIP -DCRYPTO_7ZAES -DCRYPTO_AES \
-+${PTHREAD_CFLAGS}
- 
- MY_WINDOWS=$(MY_HOME)/myEvents.o \
- 	$(MY_HOME)/myFiles.o \
-@@ -21,7 +22,7 @@
- 	$(MY_HOME)/wine_strings.o \
- 	$(MY_HOME)/stuff_for_cygwin.o
- 
--LOCAL_SHARED=-lpthread -lm
-+LOCAL_SHARED=${PTHREAD_LIBS}
- 
- 
- OBJS=\
diff --git a/archivers/p7zip/files/patch-ba b/archivers/p7zip/files/patch-ba
deleted file mode 100644
index 744f4115f861..000000000000
--- a/archivers/p7zip/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: Windows/Time.h
-@@ -41,7 +41,7 @@
-   fileTime.dwHighDateTime = DWORD(ll >> 32);
- }
- 
--inline bool FileTimeToUnixTime(const FILETIME &fileTime, long &unixTime)
-+inline bool FileTimeToUnixTime(const FILETIME &fileTime, time_t &unixTime)
- {
-   UINT64 winTime = (((UINT64)fileTime.dwHighDateTime) << 32) + fileTime.dwLowDateTime;
-   if (winTime < kUnixTimeStartValue)
-@@ -49,7 +49,7 @@
-   winTime = (winTime - kUnixTimeStartValue) / kNumTimeQuantumsInSecond;
-   if (winTime >= 0xFFFFFFFF)
-     return false;
--  unixTime = (long)winTime;
-+  unixTime = (time_t)winTime;
-   return true;
- }
-