From 349fbf0d3eb4aed239b74b92be6120627ec22ddf Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 10 Mar 2006 20:18:38 +0000
Subject: Use the pkginstall framework to generate the INSTALL/DEINSTALL
 scripts instead.

---
 misc/jitterbug/Makefile | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 0b9bd463271..4a9eae52b8d 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/01/10 18:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/10 20:18:38 jlam Exp $
 
 DISTNAME=	jitterbug-1.6.2
 PKGREVISION=	1
@@ -19,8 +19,8 @@ ADDGROUP=		${LOCALBASE}/sbin/groupadd
 .endif
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
-INSTALL_FILE=	${WRKDIR}/INSTALL
-DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
+INSTALL_SRC=	${PKGDIR}/INSTALL
+DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
 CONFIGDIR=	${WRKDIR}/${PKGNAME_NOREV}/config
 DOCSDIR=	${WRKDIR}/${PKGNAME_NOREV}/docs
 CGIBINDIR=	libexec/cgi-bin
@@ -60,6 +60,12 @@ PLIST_SUBST+=	JB_PACKAGE=${JB_PACKAGE:Q}
 PLIST_SUBST+=	JB_USER=${JB_USER:Q}
 PLIST_SUBST+=	JB_GROUP=${JB_GROUP:Q}
 
+FILES_SUBST+=	JB_USER=${JB_USER} JB_USERID=${JB_USERID}		\
+		JB_GROUP=${JB_GROUP} JB_GROUPID=${JB_GROUPID}		\
+		JB_PACKAGE=${JB_PACKAGE}				\
+		ADDUSER=${ADDUSER} ADDGROUP=${ADDGROUP}			\
+		CHGRP=${CHGRP} ID=${ID} TOUCH=${TOUCH} RM=${RM}
+
 pre-extract:
 	@(if [ "X${JB_HOSTNAME}" = "X${JB_LONGNAME}" ]; then                  \
 	${ECHO};                                                              \
@@ -128,19 +134,6 @@ pre-install:
 	@${ECHO} "Arrrgggghhh. JB_USER not defined. Please send-pr!"
 	@${FALSE}
 .endif
-	@${SED}                                                               \
-		-e 's|@JB_USER@|${JB_USER}|g'                                 \
-		-e 's|@JB_USERID@|${JB_USERID}|g'                             \
-		-e 's|@JB_GROUP@|${JB_GROUP}|g'                               \
-		-e 's|@JB_GROUPID@|${JB_GROUPID}|g'                           \
-		-e 's|@ADDUSER@|${ADDUSER}|g'				      \
-		-e 's|@ADDGROUP@|${ADDGROUP}|g'				      \
-		-e 's|@CHGRP@|${CHGRP}|g'                                     \
-		-e 's|@ID@|${ID}|g'                                           \
-		-e 's|@TOUCH@|${TOUCH}|g'                                     \
-		-e 's|@RM@|${RM}|g'                                           \
-			<${PKGDIR}/INSTALL                                    \
-			>${INSTALL_FILE}
 	@${SED}                                                               \
 		-e 's|@JB_USER@|${JB_USER}|g'                                 \
 			<${FILESDIR}/jitterbug.auth                           \
@@ -151,19 +144,12 @@ pre-install:
 		-e 's|@PREFIX@|${PREFIX}|g'                                   \
 			<${FILESDIR}/NEWPACKAGE                               \
 			>${WRKDIR}/NEWPACKAGE
-	@${SED}                                                               \
-		-e 's|@JB_USER@|${JB_USER}|g'                                 \
-		-e 's|@JB_GROUP@|${JB_GROUP}|g'                               \
-		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'                           \
-			<${PKGDIR}/DEINSTALL                                  \
-			>${DEINSTALL_FILE}
 	@${SED}								      \
 		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'			      \
 		-e 's|@JB_USER@|${JB_USER}|g'				      \
 		-e 's|@PREFIX@|${PREFIX}|g'				      \
 			< ${FILESDIR}/httpd.conf			      \
 			> ${WRKDIR}/httpd.conf
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${JB_CONFIGDIR}
-- 
cgit v1.2.3