From e56d3e4a889f51a16c491f8b88c566b596a2c1b6 Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Wed, 2 Mar 2005 04:35:38 +0000
Subject: Honor LDFLAGS.

---
 archivers/upx/Makefile         |  6 ++++--
 archivers/upx/distinfo         |  4 ++--
 archivers/upx/patches/patch-aa | 17 +++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'archivers/upx')

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index fe9f4dea727..9ebdae58f26 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/02/10 15:51:38 ben Exp $
+# $NetBSD: Makefile,v 1.6 2005/03/02 04:35:38 minskim Exp $
 
 DISTNAME=	upx-1.25-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -16,7 +16,9 @@ USE_PERL5=	build
 USE_BUILDLINK3=	yes
 
 do-build:
-	cd ${WRKSRC}/src && ${MAKE_PROGRAM} PREFIX=${PREFIX} target=netbsd UCLDIR=${PREFIX} LDLIBDIRS=-L${PREFIX}/lib
+	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} PREFIX=${PREFIX} target=netbsd		\
+			UCLDIR=${PREFIX} LDLIBDIRS=-L${PREFIX}/lib
 	cd ${WRKSRC}/doc && ${MAKE_PROGRAM}
 
 do-install:
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index 2fe7a9feeed..a5b90b1ecf0 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 14:45:27 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/03/02 04:35:38 minskim Exp $
 
 SHA1 (upx-1.25-src.tar.gz) = 7ce05370efe969832d841a73dd165e6a4292f9d4
 RMD160 (upx-1.25-src.tar.gz) = 1c73a1eb8d98d32ef63ed351ca494526f895a9de
 Size (upx-1.25-src.tar.gz) = 250849 bytes
-SHA1 (patch-aa) = cdd5c258c956148601cc6316854e02cc4d8d5c07
+SHA1 (patch-aa) = d638e86e98e16b629179b188acfccac6cd3140de
diff --git a/archivers/upx/patches/patch-aa b/archivers/upx/patches/patch-aa
index 7b259b46593..95aaee2b4d8 100644
--- a/archivers/upx/patches/patch-aa
+++ b/archivers/upx/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2005/02/10 15:51:38 ben Exp $
+$NetBSD: patch-aa,v 1.3 2005/03/02 04:35:38 minskim Exp $
 
---- ../upx-1.25-orig/src/Makefile.bld      2004-06-24 20:35:14.000000000 +0200
-+++ src/Makefile.bld   2005-02-10 13:25:03.000000000 +0100
-@@ -144,6 +144,26 @@
+--- src/Makefile.bld.orig	2004-06-24 13:35:14.000000000 -0500
++++ src/Makefile.bld
+@@ -76,7 +76,7 @@ CXXFLAGS_OUTPUT = $(CFLAGS_OUTPUT)
+ # CXXLD defaults
+ CXXLD = $(CXX)
+ CXXLDARCH = $(CXXARCH)
+-LDFLAGS =
++#LDFLAGS =
+ LINK_EXE_OUTPUT =
+ LDLIBS =
+ LINK_EXE_LDFLAGS =
+@@ -144,6 +144,26 @@ ifeq ($(target),gcc)
  include $(srcdir)/Makedefs.gcc
  endif
  
-- 
cgit v1.2.3