From 7bdb2422136497980da09918af3edf3d78981442 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 30 Aug 2003 19:45:00 +0000
Subject: Don't bother with overriding the main templates... just add on to the
 scripts.

---
 misc/rpm/DEINSTALL | 12 +-----------
 misc/rpm/INSTALL   | 12 +-----------
 misc/rpm/Makefile  |  5 +----
 3 files changed, 3 insertions(+), 26 deletions(-)

(limited to 'misc')

diff --git a/misc/rpm/DEINSTALL b/misc/rpm/DEINSTALL
index 7112c5d4ded..2ec0fd7581f 100644
--- a/misc/rpm/DEINSTALL
+++ b/misc/rpm/DEINSTALL
@@ -1,13 +1,8 @@
-# DEINSTALL_TMPL replacement
-#
-# $NetBSD: DEINSTALL,v 1.2 2002/10/20 23:09:27 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2003/08/30 19:45:00 jlam Exp $
 
 RPMDIR="@RPMDIR@"
 
 case ${STAGE} in
-DEINSTALL)
-	;;
-
 POST-DEINSTALL)
 	for db in ${RPMDIR}/*.rpm; do
 		if [ ${RPMDIR}/.pre-timestamp -ot $db ] && \
@@ -36,9 +31,4 @@ packages!
 EOF
 	fi
 	;;
-
-*)
-	${ECHO} "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
 esac
diff --git a/misc/rpm/INSTALL b/misc/rpm/INSTALL
index 6e59debf22f..78674f56f62 100755
--- a/misc/rpm/INSTALL
+++ b/misc/rpm/INSTALL
@@ -1,14 +1,9 @@
-# INSTALL_TMPL replacement
-#
-# $NetBSD: INSTALL,v 1.2 2002/10/20 23:09:27 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2003/08/30 19:45:00 jlam Exp $
 
 RPM="${PKG_PREFIX}/bin/rpm"
 RPMDIR="@RPMDIR@"
 
 case ${STAGE} in
-PRE-INSTALL)
-	;;
-
 POST-INSTALL)
 	${MKDIR} ${RPMDIR}
 	${TOUCH} ${RPMDIR}/.pre-timestamp
@@ -20,9 +15,4 @@ POST-INSTALL)
 	sleep 1
 	${TOUCH} ${RPMDIR}/.post-timestamp
 	;;
-
-*)
-	${ECHO} "Unexpected argument ${STAGE}"
-	exit 1
-	;;
 esac
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 3ea3daf9ec5..11be5f13cca 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2003/07/17 21:49:52 grant Exp $
+# $NetBSD: Makefile,v 1.43 2003/08/30 19:45:00 jlam Exp $
 
 DISTNAME=	rpm-2.5.4
 PKGREVISION=	1
@@ -19,9 +19,6 @@ USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 
-DEINSTALL_TMPL=		${.CURDIR}/DEINSTALL
-INSTALL_TMPL=		${.CURDIR}/INSTALL
-
 # The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm.
 CONFIGURE_ENV+=		varprefix="${RPM_DB_PREFIX}"
 
-- 
cgit v1.2.3