From 76abbc961279fb7b4d43ba6857ea0d16aeb58797 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 22 Jul 2000 10:05:47 +0000
Subject: Reinstate stuff removed the last time around "just to please
 pkglint". There's no reason to degrade package maintainability just to
 appease pkglint.

Also find xpm headers if xpkgwedge is installed.  Closes PR#8373 by
Michael South <msouth@scruz.net>.
---
 x11/xpmroot/Makefile         | 15 ++++++++++-----
 x11/xpmroot/files/patch-sum  |  4 ++--
 x11/xpmroot/patches/patch-ab | 16 ++++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'x11')

diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index e88f5084658..81b21e0aca5 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 1999/11/01 08:50:49 rh Exp $
+# $NetBSD: Makefile,v 1.10 2000/07/22 10:05:47 jlam Exp $
 #
 
-DISTNAME=       fvwm-2.2.2
-PKGNAME=	xpmroot-2.2.2
+DISTNAME=       fvwm-${PKG_VERSION}
+PKGNAME=	xpmroot-${PKG_VERSION}
+PKG_VERSION=	2.2.2
 CATEGORIES=	x11
 MASTER_SITES=   ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
@@ -16,9 +17,13 @@ HOMEPAGE=	http://www.fvwm.org/xpmroot.html
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
 USE_X11BASE=	YES
-WRKSRC=		${WRKDIR}/fvwm-2.2.2/utils
+WRKSRC=		${WRKDIR}/${DISTNAME}/utils
+
+EVAL_PREFIX=	XPMDIR=xpm
+
 MAKE_ENV+=	INSTALL_PROGRAM='${INSTALL_PROGRAM}'
 MAKE_ENV+=	INSTALL_MAN='${INSTALL_MAN}'
-MAKE_ENV+=	VERSION=${V}
+MAKE_ENV+=	VERSION=${PKG_VERSION}
+MAKE_ENV+=	XPMDIR=${XPMDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/files/patch-sum b/x11/xpmroot/files/patch-sum
index da37c0cba3e..8ecf11cea9b 100644
--- a/x11/xpmroot/files/patch-sum
+++ b/x11/xpmroot/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 1999/11/01 08:50:50 rh Exp $
+$NetBSD: patch-sum,v 1.4 2000/07/22 10:05:48 jlam Exp $
 
 MD5 (patch-aa) = d99f4fa5789c6351f0a924fc6fef57bb
-MD5 (patch-ab) = 7c8028c2c6908dc1936dc1b249e2337c
+MD5 (patch-ab) = 1af4b93c4bffdbae446cd3d2ec9943c4
diff --git a/x11/xpmroot/patches/patch-ab b/x11/xpmroot/patches/patch-ab
index 903371011d7..a3910822211 100644
--- a/x11/xpmroot/patches/patch-ab
+++ b/x11/xpmroot/patches/patch-ab
@@ -1,15 +1,19 @@
-$NetBSD: patch-ab,v 1.2 1999/11/01 08:44:26 rh Exp $
+$NetBSD: patch-ab,v 1.3 2000/07/22 10:05:48 jlam Exp $
 
---- /dev/null	Mon Nov  1 09:23:05 1999
-+++ Makefile	Mon Nov  1 09:34:50 1999
-@@ -0,0 +1,11 @@
-+CFLAGS+=	-I${X11BASE}/include -L${X11BASE}/lib -DVERSION=\"${VERSION}\"
+--- /dev/null	Sat Jul 22 05:53:21 2000
++++ Makefile	Sat Jul 22 05:53:02 2000
+@@ -0,0 +1,15 @@
 +#CFLAGS+=	-ggdb
 +CFLAGS+=	-O2
 +
++CPPFLAGS+=	-DVERSION=\"${VERSION}\"
++CPPFLAGS+=	-I${X11BASE}/include -I${XPMDIR}/include
++
++LDFLAGS+=	-L${X11BASE}/lib
++
 +all: xpmroot
 +xpmroot: xpmroot.c
-+	${CC} ${CFLAGS} xpmroot.c -o xpmroot ${LDFLAGS} -lXpm -lX11
++	${CC} ${CFLAGS} ${CPPFLAGS} -o xpmroot xpmroot.c ${LDFLAGS} -lXpm -lX11
 +
 +install:
 +	${INSTALL_PROGRAM} xpmroot	${PREFIX}/bin
-- 
cgit v1.2.3