Don't leak rpath into build area. Add DESTDIR support. Bump revision.

3 files changed, 28 insertions, 10 deletions

diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index b081bfb9fc5..9e800b4c9d8 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2007/08/12 14:06:55 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/10/02 17:40:43 joerg Exp $
 #
 
 DISTNAME=		nocol-4.3.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		net
 MASTER_SITES=	http://www.netplex-tech.com/software/nocol/downloads/
 
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.netplex-tech.com/software/nocol/
 COMMENT=		Extensible network and system monitoring utility
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	< ${WRKSRC}/answers
@@ -29,6 +31,13 @@ DEPENDS+=		tk-Tix-[0-9]*:../../x11/tk-Tix
 REPLACE_PERL=		perlnocol/hostmon-osclients/hostmon-client*
 REPLACE_TK_TIX=		tknocol/tkNocol.tix
 
+INSTALLATION_DIRS=	share/nocol/gifs
+INSTALL_MAKE_FLAGS+=	ROOTDIR=${DESTDIR}${PREFIX} \
+			MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/mann \
+			PIDDIR=${DESTDIR}/var/run \
+			DATADIR=${DESTDIR}/var/run/data \
+			MSGSDIR=${DESTDIR}/var/run/msgs
+
 post-patch:
 	@(hostname=`/bin/hostname`;					\
 	dir="";								\
@@ -52,21 +61,16 @@ pre-configure:
 	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmp
 	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmpapps
 
-
 post-install:
-	# Ensure webnocol audio and images files are available if needed
-	#
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nocol/gifs
-
 	for f in critical.wav error.wav warning.wav ; do		\
-	    ${INSTALL_DATA} ${WRKSRC}/webnocol/$$f ${PREFIX}/share/nocol; \
+	    ${INSTALL_DATA} ${WRKSRC}/webnocol/$$f ${DESTDIR}${PREFIX}/share/nocol; \
 	done
 
 	for f in bluesq.gif critical.jpg empty.gif error.jpg		\
 		greensq.gif help.jpg info.jpg redsq.gif warning.jpg	\
 		yellowsq.gif ; do					\
 	    ${INSTALL_DATA} ${WRKSRC}/webnocol/gifs/$$f			\
-			    ${PREFIX}/share/nocol/gifs;			\
+			    ${DESTDIR}${PREFIX}/share/nocol/gifs;	\
 	done
 
 .include "../../mk/resolv.buildlink3.mk"
diff --git a/net/nocol/distinfo b/net/nocol/distinfo
index 77248ef25b8..f60258e06dd 100644
--- a/net/nocol/distinfo
+++ b/net/nocol/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/07/03 13:54:46 joerg Exp $
+$NetBSD: distinfo,v 1.11 2008/10/02 17:40:43 joerg Exp $
 
 SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325
 RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8
@@ -20,3 +20,4 @@ SHA1 (patch-ap) = 45f30a886adda7831df056cf0f7a136b97a7e17d
 SHA1 (patch-aq) = 13697bbaed2c324851810d6df7677ff807844a6e
 SHA1 (patch-ar) = cba8de7526efde9d8598b9119ca8d27e3c60279f
 SHA1 (patch-as) = be1b999af6459b83fe7bfcab9e83b2e830198da6
+SHA1 (patch-at) = c49b96d1c2158d0a8f67228922f0e4bff5df2908
diff --git a/net/nocol/patches/patch-at b/net/nocol/patches/patch-at
new file mode 100644
index 00000000000..253c169966f
--- /dev/null
+++ b/net/nocol/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2008/10/02 17:40:44 joerg Exp $
+
+--- cmu-snmp/snmpapps/configure.orig	2008-10-02 19:33:22.000000000 +0200
++++ cmu-snmp/snmpapps/configure
+@@ -1937,7 +1937,7 @@ LIBS="${LIBS} -L$SNMP_DIR/lib${ABILIBDIR
+ INCS="${INCS} -I$SNMP_DIR/include"
+ 
+ # Use libtool
+-RUNPATH="-rpath $SNMP_DIR/lib${ABILIBDIR}"
++RUNPATH="-rpath $PREFIX/lib"
+ echo "$ac_t""found in $SNMP_DIR" 1>&6
+ 
+