4 files changed, 40 insertions, 24 deletions

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 4e0b3ea41338..89fd59762c89 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -2,28 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	upx
-PORTVERSION=	3.91
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.94
 CATEGORIES=	archivers
-MASTER_SITES=	http://upx.sourceforge.net/download/\
-		SF/sevenzip/7-Zip/${LZMA_VER}:lzma
-DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
-		7z${LZMA_VER:S/.//g}${EXTRACT_SUFX}:lzma
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The Ultimate Packer for eXecutables
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 LIB_DEPENDS=	libucl.so:archivers/ucl
 
-LZMA_VER=	4.65
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
-USES=		tar:bzip2 gmake perl5
-USE_PERL5=	build
-MAKE_ENV=	UPX_UCLDIR=${LOCALBASE}\
-		UPX_LZMADIR=${WRKDIR}\
+USES=		gmake
+USE_GITHUB=	yes
+GH_TUPLE=	upx:upx-lzma-sdk:${DISTVERSIONPREFIX}${DISTVERSION}:lzma/src/lzma-sdk
+
+MAKE_ENV=	UPX_UCLDIR=${LOCALBASE} \
 		target=freebsd
 
-PORTDOCS=	BUGS COPYING LICENSE NEWS PROJECTS README\
-		README.1ST README.SRC THANKS TODO
+PORTDOCS=	BUGS COPYING LICENSE NEWS PROJECTS README \
+		README.1ST README.SRC THANKS
+
 PLIST_FILES=	bin/upx \
 		man/man1/upx.1.gz
 
@@ -32,6 +32,8 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx
 	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index e9e02c202718..967c6809702d 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,4 +1,5 @@
-SHA256 (upx-3.91-src.tar.bz2) = 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c
-SIZE (upx-3.91-src.tar.bz2) = 904747
-SHA256 (7z465.tar.bz2) = cce25c2b7c98ccb598b1393c302ff56a5c51fe2a5aae9c3885bec007eb06fc70
-SIZE (7z465.tar.bz2) = 658088
+TIMESTAMP = 1532707968
+SHA256 (upx-upx-v3.94_GH0.tar.gz) = 2ddd9d409620b6946319bfdab6cf9d570c6057a89cd5b0b4707fc5e13cc95929
+SIZE (upx-upx-v3.94_GH0.tar.gz) = 1601225
+SHA256 (upx-upx-lzma-sdk-v3.94_GH0.tar.gz) = 9e9cea6112bd93fbc71c61d1ff068cc324b2d7bb7789043928b68c5d3cc0672d
+SIZE (upx-upx-lzma-sdk-v3.94_GH0.tar.gz) = 109693
diff --git a/archivers/upx/files/patch-src_Makefile b/archivers/upx/files/patch-src_Makefile
index 17c9907cfea8..0e8e6d2398ea 100644
--- a/archivers/upx/files/patch-src_Makefile
+++ b/archivers/upx/files/patch-src_Makefile
@@ -1,6 +1,6 @@
---- src/Makefile.orig	2013-09-30 15:51:00 UTC
+--- src/Makefile.orig	2017-05-12 11:01:20 UTC
 +++ src/Makefile
-@@ -55,7 +55,7 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.c
+@@ -48,7 +48,7 @@ endif
  # we need UCL and zlib - you can set envvar UPX_UCLDIR
  ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
  INCLUDES += -I$(UPX_UCLDIR)/include
@@ -8,4 +8,17 @@
 +LIBS += -L$(UPX_UCLDIR)/lib
  endif
  LIBS += -lucl -lz
- # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK
+ # LZMA from https://github.com/upx/upx-lzma-sdk
+@@ -62,9 +62,9 @@ CXXFLAGS_OPTIMIZE ?= -O2
+ endif
+ CXXFLAGS += $(CXXFLAGS_OPTIMIZE)
+ # protect against security threats caused by misguided C++ compiler "optimizations"
+-ifeq ($(findstring clang,$(CXX)),)
+-CXXFLAGS += -fno-delete-null-pointer-checks
+-endif
++# ifeq ($(findstring clang,$(CXX)),)
++# CXXFLAGS += -fno-delete-null-pointer-checks
++# endif
+ CXXFLAGS += -fno-strict-aliasing -fwrapv
+ CXXFLAGS += -funsigned-char
+ CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wshadow -Wvla -Wwrite-strings
diff --git a/archivers/upx/files/patch-src_miniacc.h b/archivers/upx/files/patch-src_miniacc.h
index d2a2a7217b2b..7960e5d6ad4c 100644
--- a/archivers/upx/files/patch-src_miniacc.h
+++ b/archivers/upx/files/patch-src_miniacc.h
@@ -1,6 +1,6 @@
---- src/miniacc.h.orig	2013-09-30 15:51:00 UTC
+--- src/miniacc.h.orig	2017-05-12 11:01:20 UTC
 +++ src/miniacc.h
-@@ -485,7 +485,7 @@
+@@ -523,7 +523,7 @@
  #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
  #    define ACC_OS_POSIX_AIX        1
  #    define ACC_INFO_OS_POSIX       "aix"
@@ -9,14 +9,14 @@
  #    define ACC_OS_POSIX_FREEBSD    1
  #    define ACC_INFO_OS_POSIX       "freebsd"
  #  elif defined(__hpux__) || defined(__hpux)
-@@ -1968,11 +1968,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T ==
+@@ -2502,11 +2502,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEO
  #elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN)
  #if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
  #  define ACC_ABI_BIG_ENDIAN        1
 -#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_WIN64)
 +#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_POSIX_FREEBSD || ACC_OS_WIN64)
  #  define ACC_ABI_LITTLE_ENDIAN     1
- #elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430)
+ #elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430 || ACC_ARCH_RISCV)
  #  define ACC_ABI_LITTLE_ENDIAN     1
 -#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU)
 +#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU || ACC_ARCH_SPARC)