From 1097b9bf6128354e5aac34620625754ad929295e Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Thu, 12 Sep 2002 20:21:34 +0000
Subject: [PATCH] Honor CFLAGS, LOCALBASE; some clean-up.

---
 converters/ppmtoTbmp/Makefile               | 15 +++++++++------
 converters/ppmtoTbmp/patches/patch-Makefile |  9 ---------
 converters/ppmtoTbmp/pkg/DESCR              |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 converters/ppmtoTbmp/patches/patch-Makefile

diff --git a/converters/ppmtoTbmp/Makefile b/converters/ppmtoTbmp/Makefile
index a7e9935c103..aae42819ac6 100644
--- a/converters/ppmtoTbmp/Makefile
+++ b/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:
-	${INSTALL_PROGRAM} ${WRKSRC}/Tbmptopnm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/ppmtoTbmp ${PREFIX}/bin
+MASTER_SITES=	${HOMEPAGE}
+
+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>
diff --git a/converters/ppmtoTbmp/patches/patch-Makefile b/converters/ppmtoTbmp/patches/patch-Makefile
deleted file mode 100644
index 399815ccf1b..00000000000
--- a/converters/ppmtoTbmp/patches/patch-Makefile
+++ /dev/null
@@ -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
diff --git a/converters/ppmtoTbmp/pkg/DESCR b/converters/ppmtoTbmp/pkg/DESCR
index 803cf789b07..1a831115042 100644
--- a/converters/ppmtoTbmp/pkg/DESCR
+++ b/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}