From df5ba958ff083c0cefbc8f19c4c815afdc3b4ed5 Mon Sep 17 00:00:00 2001
From: Volker Stolz <vs@FreeBSD.org>
Date: Tue, 7 Jun 2005 12:59:45 +0000
Subject: Use MAKE_ARGS and friends

---
 palm/ppmtoTbmp/Makefile             | 5 ++---
 palm/ppmtoTbmp/files/patch-Makefile | 8 --------
 2 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 palm/ppmtoTbmp/files/patch-Makefile

(limited to 'palm/ppmtoTbmp')

diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile
index 1aa7541d4f4d..9c8bbd197a60 100644
--- a/palm/ppmtoTbmp/Makefile
+++ b/palm/ppmtoTbmp/Makefile
@@ -16,11 +16,10 @@ COMMENT=	PPM to Pilot bitmap converter
 LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
 
 USE_REINPLACE=	yes
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDLIBS=-lnetpbm
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|^CFLAGS =.*|CFLAGS += -I${LOCALBASE}/include|g; \
-		s|^LDLIBS =|LDLIBS = -L${LOCALBASE}/lib|g" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/^#include "ppmcmap.h"/d' ${WRKSRC}/ppmtoTbmp.c
 
 do-install:
diff --git a/palm/ppmtoTbmp/files/patch-Makefile b/palm/ppmtoTbmp/files/patch-Makefile
deleted file mode 100644
index 8d3b7fba0f32..000000000000
--- a/palm/ppmtoTbmp/files/patch-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.old        Sat Jul  6 13:24:04 2002
-+++ Makefile    Sat Jul  6 13:24:12 2002
-@@ -1,5 +1,5 @@
- CFLAGS = -Wall -O2 -I/opt/netpbm/include
--LDLIBS = -lpnm -lppm -lpgm -lpbm
-+LDLIBS = -lnetpbm
-
- BINS = ppmtoTbmp Tbmptopnm
-- 
cgit v1.2.3