From 827643d4bb8f5f83c28919b7df0d42108769e37d Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 15 Jun 2006 20:40:15 +0000 Subject: Split out deinstall portions of INSTALL scripts into DEINSTALL scripts. This avoids the need for a confusing line of the form: DEINSTALL_TEMPLATE+= path/to/INSTALL in the package Makefile, and actually removes the need to specify it altogether since by convention, the existence of the DEINSTALL script is enough to add it to DEINSTALL_TEMPLATE. --- print/foomatic-ppds-cups/DEINSTALL | 10 ++++++++++ print/foomatic-ppds-cups/INSTALL | 8 +------- print/foomatic-ppds-cups/Makefile | 4 +--- 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 print/foomatic-ppds-cups/DEINSTALL (limited to 'print/foomatic-ppds-cups') diff --git a/print/foomatic-ppds-cups/DEINSTALL b/print/foomatic-ppds-cups/DEINSTALL new file mode 100644 index 00000000000..3733be7d0c4 --- /dev/null +++ b/print/foomatic-ppds-cups/DEINSTALL @@ -0,0 +1,10 @@ +# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $ + +CUPS_DATADIR="@CUPS_DATADIR@" + +case ${STAGE} in +DEINSTALL) + ${ECHO} "Removing Foomatic PPDs from CUPS PPD database." + ${RM} -f ${CUPS_DATADIR}/foomatic-ppds + ;; +esac diff --git a/print/foomatic-ppds-cups/INSTALL b/print/foomatic-ppds-cups/INSTALL index d964aa0cea1..1b1fd03f8f9 100644 --- a/print/foomatic-ppds-cups/INSTALL +++ b/print/foomatic-ppds-cups/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.1.1.1 2005/12/17 18:41:43 jlam Exp $ +# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:16 jlam Exp $ CUPS_DATADIR="@CUPS_DATADIR@" @@ -9,11 +9,5 @@ POST-INSTALL) { ${ECHO} "Adding Foomatic PPDs to CUPS PPD database."; ${LN} -fs ${PKG_PREFIX}/share/foomatic/ppd \ ${CUPS_DATADIR}/foomatic-ppds; } - - ;; - -DEINSTALL) - ${ECHO} "Removing Foomatic PPDs from CUPS PPD database." - ${RM} -f ${CUPS_DATADIR}/foomatic-ppds ;; esac diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile index 56c5f9acb03..5834d16ca23 100644 --- a/print/foomatic-ppds-cups/Makefile +++ b/print/foomatic-ppds-cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/03/14 01:14:32 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/15 20:40:16 jlam Exp $ .include "../../print/foomatic-ppds/Makefile.common" @@ -22,8 +22,6 @@ EVAL_PREFIX+= CUPS_PREFIX=cups CUPS_DATADIR= ${CUPS_PREFIX:Q}/share/cups/model FILES_SUBST+= CUPS_DATADIR=${CUPS_DATADIR} -DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL - do-build: # empty do-install: # empty -- cgit v1.2.3