[pkgsrc/trunk]: pkgsrc/print/LPRng-core Use INSTALL_EXTRA_TMPL and DEINSTALL_...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cfdbbbaacbbc
branches:  trunk
changeset: 506796:cfdbbbaacbbc
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 22 00:57:02 2006 +0000

description:
Use INSTALL_EXTRA_TMPL and DEINSTALL_EXTRA_TMPL. Fix the output of
DEINSTALL to only print the delimiting line if the opening line was
written as well. Makes the output a bit nicer when no file was
modified.

diffstat:

 print/LPRng-core/DEINSTALL |  4 ++--
 print/LPRng-core/Makefile  |  9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r 2fbf3f7808eb -r cfdbbbaacbbc print/LPRng-core/DEINSTALL
--- a/print/LPRng-core/DEINSTALL        Sun Jan 22 00:48:02 2006 +0000
+++ b/print/LPRng-core/DEINSTALL        Sun Jan 22 00:57:02 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.3 2004/09/06 10:44:44 martti Exp $
+# $NetBSD: DEINSTALL,v 1.4 2006/01/22 00:57:02 joerg Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -70,10 +70,10 @@
                do
                        echo "  ${file}"
                done
-       fi
        ${CAT} << EOF
 ===========================================================================
 EOF
+       fi
        ;;
 esac
 exit 0
diff -r 2fbf3f7808eb -r cfdbbbaacbbc print/LPRng-core/Makefile
--- a/print/LPRng-core/Makefile Sun Jan 22 00:48:02 2006 +0000
+++ b/print/LPRng-core/Makefile Sun Jan 22 00:57:02 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:06 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/22 00:57:02 joerg Exp $
 
 DISTNAME=      LPRng-3.8.28
 PKGNAME=       LPRng-core-3.8.28
@@ -43,8 +43,8 @@
 MAKE_ENV+=             POSTINSTALL="NO"
 
 EXAMPLESDIR=           ${PREFIX}/share/examples/LPRng
-DEINSTALL_FILE=                ${WRKDIR}/DEINSTALL
-INSTALL_FILE=          ${WRKDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
 RCD_SCRIPTS=           LPRng
 
 FILES_SUBST+=          CAT=${CAT:Q}
@@ -72,8 +72,6 @@
 pre-install:
        ${SED}  -e "s,@PREFIX@,${PREFIX},g" \
                < ${FILESDIR}/LPRng.sh > ${WRKDIR}/LPRng.sh
-       ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-       ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 
 post-install:
        ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
@@ -81,6 +79,5 @@
                ${INSTALL_DATA} ${WRKSRC}/$${file} \
                        ${EXAMPLESDIR}/$${file}.example; \
        done
-       PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"