Updated to latest release, 3.91. Minor whitespace fixes in the Makefile.

Use BUILD_DIRS and MAKE_ENV instead of writing do-install phase manually.
Add sparc{,64} support to package. Fixes build on OpenBSD/sparc64 at least.
Defuzz patches. From NEWS:

==================================================================
User visible changes for UPX
==================================================================

Changes in 3.91 (30 Sep 2013):
  * Added experimental support for Windows 64-bit PE files, based on
    work by Stefan Widmann. Please use for testing only!
  * bug fixes

==================================================================

Changes in 3.09 (18 Feb 2013):
  * New option --preserve-build-id for GNU ELF.
  * Allow for code signing and LC_UUID on Mac OS X executables.
  * Allow non-contiguous LC_SEGMENTs and 0==.vmsize for Mach-O.
  * Allow zero-filled final page in PackUnix::canUnpack().
  * bug fixes

6 files changed, 48 insertions, 31 deletions

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 20f75007947..00c87334d63 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2013/05/31 12:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/05/26 01:30:39 rodent Exp $
 
-DISTNAME=	upx-3.08-src
-PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	2
-CATEGORIES=	misc archivers
+DISTNAME=	upx-3.91-src
+PKGNAME=	${DISTNAME:S/-src//1}
+CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=upx/}
 EXTRACT_SUFX=	.tar.bz2
 # consult src/stub/src/c/Makevars.lzma for the supported LZMA SDK version
@@ -15,9 +14,11 @@ HOMEPAGE=	http://upx.sourceforge.net/
 COMMENT=	Ultimate packer for executables
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake perl pod2man pod2html pod2text
-NO_CONFIGURE=		yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake perl pod2man pod2html pod2text
+NO_CONFIGURE=	yes
+BUILD_DIRS=	src doc
+MAKE_ENV+=	PREFIX=${PREFIX} UCLDIR=${PREFIX} LDLIBDIRS=-L${PREFIX}/lib
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/upx
 
@@ -32,11 +33,6 @@ post-extract:
 	mkdir -p ${WRKSRC}/src/stub/src/c/lzma-sdk
 	ln -sf ${WRKDIR}/C ${WRKSRC}/src/stub/src/c/lzma-sdk/C
 
-do-build:
-	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
-		PREFIX=${PREFIX} UCLDIR=${PREFIX} LDLIBDIRS=-L${PREFIX}/lib
-	cd ${WRKSRC}/doc && ${MAKE_PROGRAM}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${DESTDIR}${PREFIX}/bin/upx
 	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index fe1a645fc62..6d42491f225 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2012/05/02 08:26:21 adam Exp $
+$NetBSD: distinfo,v 1.10 2014/05/26 01:30:39 rodent Exp $
 
 SHA1 (lzma443.tar.bz2) = 1667abfb40da82d53fa2690f3cd58a0e7e751e55
 RMD160 (lzma443.tar.bz2) = f4f19c9f9bd8ded26318208e75ac14c8869c4ef8
 Size (lzma443.tar.bz2) = 178493 bytes
-SHA1 (upx-3.08-src.tar.bz2) = 5ccbc0aacfd3aaee407eceab06ec5989bf1d153a
-RMD160 (upx-3.08-src.tar.bz2) = 3fd7b3c4c66a90ddd622b5fb0ba0502c7145da62
-Size (upx-3.08-src.tar.bz2) = 877691 bytes
-SHA1 (patch-ab) = 710c49b92caeed1ac196abb5d45cfaff01faea6c
-SHA1 (patch-src_Makefile) = 9b97e10d6b11a75f64c64b49f6c6cd5aa51ddf23
-SHA1 (patch-src_p__exe.cpp) = 5455be2fe1e3335c784cb044b31046da2eb40ef4
-SHA1 (patch-src_p__exe.h) = 899f6dbc2e90167bd1cc44b0081fc1797d050430
+SHA1 (upx-3.91-src.tar.bz2) = da962c0affb27eae11aa9b6fbd751c3699717b36
+RMD160 (upx-3.91-src.tar.bz2) = 9da4a4136dc0a1f923dbcd68ceefc9c6afcd2345
+Size (upx-3.91-src.tar.bz2) = 904747 bytes
+SHA1 (patch-ab) = f7f963e90f0762325685c487dc9b13e5450d33a2
+SHA1 (patch-src_Makefile) = ccb781a80a6c15d46de863d8678cf7317b16c107
+SHA1 (patch-src_p__exe.cpp) = 21814e235022afe48102b0de021b066b717b3917
+SHA1 (patch-src_p__exe.h) = a03d88ad312c1e85ccc43b78c7bea5b5ce613a09
diff --git a/archivers/upx/patches/patch-ab b/archivers/upx/patches/patch-ab
index 78ee25e5fa7..eccd9f10be0 100644
--- a/archivers/upx/patches/patch-ab
+++ b/archivers/upx/patches/patch-ab
@@ -1,8 +1,29 @@
-$NetBSD: patch-ab,v 1.4 2012/05/02 06:45:14 adam Exp $
+$NetBSD: patch-ab,v 1.5 2014/05/26 01:30:39 rodent Exp $
 
---- src/miniacc.h.orig	2012-05-02 06:06:11.000000000 +0000
+Add sparc{,64} support.
+
+--- src/miniacc.h.orig	2013-09-30 15:51:00.000000000 +0000
 +++ src/miniacc.h
-@@ -1944,7 +1944,6 @@ extern "C" {
+@@ -914,6 +914,9 @@
+ #elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8)
+ #  define ACC_ARCH_SPARC            1
+ #  define ACC_INFO_ARCH             "sparc"
++#elif defined(__sparc64__) 
++#  define ACC_ARCH_SPARC64          1
++#  define ACC_INFO_ARCH             "sparc64"
+ #elif defined(__SPU__)
+ #  define ACC_ARCH_SPU              1
+ #  define ACC_INFO_ARCH             "spu"
+@@ -2005,6 +2008,8 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEO
+ #  define ACC_ABI_BIG_ENDIAN        1
+ #elif 1 && (ACC_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__)
+ #  define ACC_ABI_LITTLE_ENDIAN     1
++#elif (ACC_ARCH_SPARC || ACC_ARCH_SPARC64)
++#  define ACC_ABI_BIG_ENDIAN        1
+ #endif
+ #endif
+ #if (ACC_ABI_BIG_ENDIAN) && (ACC_ABI_LITTLE_ENDIAN)
+@@ -2623,7 +2628,6 @@ ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(ac
  #define HAVE_FCNTL_H 1
  #define HAVE_FLOAT_H 1
  #define HAVE_LIMITS_H 1
diff --git a/archivers/upx/patches/patch-src_Makefile b/archivers/upx/patches/patch-src_Makefile
index 41b04ad4ad0..9a848bab8df 100644
--- a/archivers/upx/patches/patch-src_Makefile
+++ b/archivers/upx/patches/patch-src_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_Makefile,v 1.1 2012/05/02 08:26:21 adam Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2014/05/26 01:30:39 rodent Exp $
 
 Enable ZLIB support.
 
---- src/Makefile.orig	2012-05-02 08:09:20.000000000 +0000
+--- src/Makefile.orig	2013-09-30 15:51:00.000000000 +0000
 +++ src/Makefile
 @@ -57,6 +57,7 @@ ifneq ($(wildcard $(UPX_UCLDIR)/include/
  INCLUDES += -I$(UPX_UCLDIR)/include
diff --git a/archivers/upx/patches/patch-src_p__exe.cpp b/archivers/upx/patches/patch-src_p__exe.cpp
index 38cf4f9b5f9..5f978805161 100644
--- a/archivers/upx/patches/patch-src_p__exe.cpp
+++ b/archivers/upx/patches/patch-src_p__exe.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_p__exe.cpp,v 1.2 2012/05/02 06:45:14 adam Exp $
+$NetBSD: patch-src_p__exe.cpp,v 1.3 2014/05/26 01:30:39 rodent Exp $
 
---- src/p_exe.cpp.orig	2011-12-12 16:08:00.000000000 +0000
+--- src/p_exe.cpp.orig	2013-09-30 15:51:00.000000000 +0000
 +++ src/p_exe.cpp
 @@ -110,7 +110,7 @@ int PackExe::fillExeHeader(struct exe_he
          oh.ss += 0x20;
diff --git a/archivers/upx/patches/patch-src_p__exe.h b/archivers/upx/patches/patch-src_p__exe.h
index 21810c207f8..b4f46dd85c0 100644
--- a/archivers/upx/patches/patch-src_p__exe.h
+++ b/archivers/upx/patches/patch-src_p__exe.h
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_p__exe.h,v 1.2 2012/05/02 06:45:14 adam Exp $
+$NetBSD: patch-src_p__exe.h,v 1.3 2014/05/26 01:30:39 rodent Exp $
 
---- src/p_exe.h.orig	2002-06-01 13:20:17.000000000 +0200
-+++ src/p_exe.h	2012-01-11 15:33:21.472848400 +0100
+--- src/p_exe.h.orig	2013-09-30 15:51:00.000000000 +0000
++++ src/p_exe.h
 @@ -105,7 +105,7 @@ protected:
      enum {
          NORELOC = 1,