git: 1db1502ff39a - main - archivers/upx: Update to 3.96

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Tue, 21 Dec 2021 19:41:20 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1db1502ff39aca8efc4acf9d3c9c9aac416ff824

commit 1db1502ff39aca8efc4acf9d3c9c9aac416ff824
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-12-21 18:46:12 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2021-12-21 18:46:12 +0000

    archivers/upx: Update to 3.96
    
    - Remove DOCS option
    - Update pkg-descr
    - Take maintainership
    
    Changes:        https://github.com/upx/upx/releases
---
 archivers/upx/Makefile                    | 25 ++++++++-----------------
 archivers/upx/distinfo                    | 10 +++++-----
 archivers/upx/files/patch-src_miniacc.h   | 13 ++-----------
 archivers/upx/files/patch-src_p__mach.cpp | 11 +++++++++++
 archivers/upx/pkg-descr                   | 14 ++++----------
 5 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 3065b6547821..b2ce10f6a279 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,11 +1,11 @@
 # Created by: Max Khon <fjoe@FreeBSD.org>
 
 PORTNAME=	upx
+PORTVERSION=	3.96
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.95
 CATEGORIES=	archivers
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ultimate Packer for eXecutables
 
 LICENSE=	GPLv2+
@@ -14,30 +14,21 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libucl.so:archivers/ucl
 
 USES=		cpe gmake perl5
-USE_GITHUB=	yes
-USE_PERL5=	build # provides pod2man/pod2html/pod2text required for docs
-
-CPE_VENDOR=	upx_project
-
-GH_TUPLE=	upx:upx-lzma-sdk:${DISTVERSIONPREFIX}${DISTVERSION}:lzma/src/lzma-sdk
+USE_PERL5=	build
 
 MAKE_ENV=	UPX_UCLDIR=${LOCALBASE} \
 		target=freebsd
 
-PORTDOCS=	BUGS COPYING LICENSE NEWS PROJECTS README \
-		README.1ST README.SRC THANKS
-
 PLIST_FILES=	bin/upx \
 		man/man1/upx.1.gz
 
-OPTIONS_DEFINE=	DOCS
+CPE_VENDOR=	upx_project
+
+GH_TUPLE=	upx:upx-lzma-sdk:v${PORTVERSION}:lzma/src/lzma-sdk
+USE_GITHUB=	yes
 
 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}
+	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index d9af759c3508..f3a5a57cb041 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1544570151
-SHA256 (upx-upx-v3.95_GH0.tar.gz) = fdb79c8238360115770e9c13bdaeb48da6fb09c813b0a461c5f9faee176d6fb9
-SIZE (upx-upx-v3.95_GH0.tar.gz) = 1663470
-SHA256 (upx-upx-lzma-sdk-v3.95_GH0.tar.gz) = 4932ed7b79cf47aa91fe737c068f74553e17033161c7e7e532e4b967f02f1557
-SIZE (upx-upx-lzma-sdk-v3.95_GH0.tar.gz) = 109697
+TIMESTAMP = 1638556458
+SHA256 (upx-upx-v3.96_GH0.tar.gz) = 6882b4ea89c7a0ed74b86d3c0f1d07814b492eaf649b43ab8b4dfefa9e2d7387
+SIZE (upx-upx-v3.96_GH0.tar.gz) = 1676172
+SHA256 (upx-upx-lzma-sdk-v3.96_GH0.tar.gz) = e465670abe0900a0995f7e6166bff86caed06b253f6ff02d6490df6263aecc67
+SIZE (upx-upx-lzma-sdk-v3.96_GH0.tar.gz) = 109692
diff --git a/archivers/upx/files/patch-src_miniacc.h b/archivers/upx/files/patch-src_miniacc.h
index 7960e5d6ad4c..14d017d04880 100644
--- a/archivers/upx/files/patch-src_miniacc.h
+++ b/archivers/upx/files/patch-src_miniacc.h
@@ -1,15 +1,6 @@
---- src/miniacc.h.orig	2017-05-12 11:01:20 UTC
+--- src/miniacc.h.orig	2020-01-22 21:29:58 UTC
 +++ src/miniacc.h
-@@ -523,7 +523,7 @@
- #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
- #    define ACC_OS_POSIX_AIX        1
- #    define ACC_INFO_OS_POSIX       "aix"
--#  elif defined(__FreeBSD__)
-+#  elif defined(__FreeBSD__) || defined(__DragonFly__)
- #    define ACC_OS_POSIX_FREEBSD    1
- #    define ACC_INFO_OS_POSIX       "freebsd"
- #  elif defined(__hpux__) || defined(__hpux)
-@@ -2502,11 +2502,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEO
+@@ -2547,11 +2547,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T ==
  #elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN)
  #if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
  #  define ACC_ABI_BIG_ENDIAN        1
diff --git a/archivers/upx/files/patch-src_p__mach.cpp b/archivers/upx/files/patch-src_p__mach.cpp
new file mode 100644
index 000000000000..126767d4a562
--- /dev/null
+++ b/archivers/upx/files/patch-src_p__mach.cpp
@@ -0,0 +1,11 @@
+--- src/p_mach.cpp.orig	2020-01-22 21:29:58 UTC
++++ src/p_mach.cpp
+@@ -467,7 +467,7 @@ PackMachBase<T>::compare_segment_command(void const *c
+     if (a->vmsize)             return -1;  // 'a' is first
+     if (b->vmsize)             return  1;  // 'a' is last
+     // What could remain?
+-                               return  0;
++    return  0;
+ }
+ 
+ #undef PAGE_MASK
diff --git a/archivers/upx/pkg-descr b/archivers/upx/pkg-descr
index 9f2444ea60fe..d44228bb3805 100644
--- a/archivers/upx/pkg-descr
+++ b/archivers/upx/pkg-descr
@@ -1,12 +1,6 @@
-UPX is a free, portable, extendable, high-performance executable
-packer for several different executable formats. It achieves an
-excellent compression ratio and offers very fast decompression.
-Your executables suffer no memory overhead or other drawbacks
-because of in-place decompression.
-
-UPX is copyrighted software distributed under the terms of the
-GNU General Public License, with special exceptions granting
-the free usage for commercial programs as stated in the
-UPX License Agreement.
+UPX is a free, portable, extendable, high-performance executable packer for
+several different executable formats. It achieves an excellent compression ratio
+and offers very fast decompression. Your executables suffer no memory overhead
+or other drawbacks because of in-place decompression.
 
 WWW: https://upx.github.io/