Honor CFLAGS, LOCALBASE; some clean-up.

converters/ppmtoTbmp/Makefile

@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2002/03/21 20:46:24 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2002/09/12 20:21:34 naddy Exp $
 
 COMMENT=	"PPM to Pilot bitmap converter"
 
 DISTNAME=	ppmtoTbmp-1.1
 CATEGORIES=	converters graphics
-NEED_VERSION=	1.515
-MASTER_SITES=	http://www.isaac.cs.berkeley.edu/pilot/
 HOMEPAGE=	http://www.isaac.cs.berkeley.edu/pilot/
 
 MAINTAINER=	Dorqus Maximus <dorqus@bsdfreek.com>
@@ -15,12 +13,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-do-install:
+MASTER_SITES=	${HOMEPAGE}
-	${INSTALL_PROGRAM} ${WRKSRC}/Tbmptopnm ${PREFIX}/bin
+
-	${INSTALL_PROGRAM} ${WRKSRC}/ppmtoTbmp ${PREFIX}/bin
+MAKE_FLAGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDLIBS="-L${LOCALBASE}/lib -lpnm -lppm -lpgm -lpbm"
 
 LIB_DEPENDS=	pnm,ppm,pgm,pbm::graphics/netpbm
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKBUILD}/Tbmptopnm ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKBUILD}/ppmtoTbmp ${PREFIX}/bin
+
 REGRESS_TARGET=	test
 
 .include <bsd.port.mk>

converters/ppmtoTbmp/patches/patch-Makefile

@@ -1,9 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2001/06/01 05:41:32 shell Exp $
---- Makefile.orig	Tue May 22 18:46:07 2001
-+++ Makefile	Tue May 22 18:46:40 2001
-@@ -1,4 +1,4 @@
--CFLAGS = -Wall -O2 -I/opt/netpbm/include
-+CFLAGS = -Wall -O2 -I/usr/local/include -L/usr/local/lib
- LDLIBS = -lpnm -lppm -lpgm -lpbm
- 
- BINS = ppmtoTbmp Tbmptopnm

converters/ppmtoTbmp/pkg/DESCR

@@ -1,3 +1,3 @@
-programs that convert between ppm and Pilot bitmap formats
+Programs that convert between ppm and Pilot bitmap formats.
 
 WWW: ${HOMEPAGE}