aboutsummaryrefslogtreecommitdiff
path: root/palm/ppmtoTbmp
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2005-06-07 12:59:45 +0000
committerVolker Stolz <vs@FreeBSD.org>2005-06-07 12:59:45 +0000
commitdf5ba958ff083c0cefbc8f19c4c815afdc3b4ed5 (patch)
tree73a8d6e057d126d6047a33fc243f12d06bcf7a13 /palm/ppmtoTbmp
parent44595560e8fadbd81e7fbd40356d7f94151f4691 (diff)
downloadports-df5ba958ff083c0cefbc8f19c4c815afdc3b4ed5.tar.gz
ports-df5ba958ff083c0cefbc8f19c4c815afdc3b4ed5.zip
Use MAKE_ARGS and friends
Notes
Notes: svn path=/head/; revision=136990
Diffstat (limited to 'palm/ppmtoTbmp')
-rw-r--r--palm/ppmtoTbmp/Makefile5
-rw-r--r--palm/ppmtoTbmp/files/patch-Makefile8
2 files changed, 2 insertions, 11 deletions
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