pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Split out deinstall portions of INSTALL scripts into D...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d2a478abb126
branches: trunk
changeset: 514652:d2a478abb126
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Jun 15 20:40:15 2006 +0000
description:
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.
diffstat:
databases/shared-mime-info/DEINSTALL | 9 +++++++++
databases/shared-mime-info/INSTALL | 5 +----
databases/shared-mime-info/Makefile | 4 +---
fonts/ghostscript-cidfonts/DEINSTALL | 18 ++++++++++++++++++
fonts/ghostscript-cidfonts/INSTALL | 23 +++++------------------
fonts/ghostscript-cidfonts/Makefile | 4 +---
fonts/ghostscript-cmaps/DEINSTALL | 18 ++++++++++++++++++
fonts/ghostscript-cmaps/INSTALL | 21 ++++-----------------
fonts/ghostscript-cmaps/Makefile | 4 +---
mail/mutt-devel/DEINSTALL | 7 +++++++
mail/mutt-devel/INSTALL | 6 +-----
mail/mutt-devel/Makefile | 3 +--
mail/mutt/DEINSTALL | 7 +++++++
mail/mutt/INSTALL | 6 +-----
mail/mutt/Makefile | 3 +--
misc/openoffice2-bin/DEINSTALL | 15 +++++++++++++++
misc/openoffice2-bin/INSTALL | 20 ++++----------------
misc/openoffice2-bin/Makefile | 4 +---
print/apsfilter/DEINSTALL | 18 ++++++++++++++++++
print/apsfilter/INSTALL | 18 ++----------------
print/apsfilter/Makefile | 4 +---
print/foomatic-filters-cups/DEINSTALL | 10 ++++++++++
print/foomatic-filters-cups/INSTALL | 8 +-------
print/foomatic-filters-cups/Makefile | 4 +---
print/foomatic-filters/Makefile | 4 ++--
print/foomatic-ppds-cups/DEINSTALL | 10 ++++++++++
print/foomatic-ppds-cups/INSTALL | 8 +-------
print/foomatic-ppds-cups/Makefile | 4 +---
sysutils/desktop-file-utils/DEINSTALL | 9 +++++++++
sysutils/desktop-file-utils/INSTALL | 5 +----
sysutils/desktop-file-utils/Makefile | 4 +---
textproc/scrollkeeper/DEINSTALL | 9 +++++++++
textproc/scrollkeeper/INSTALL | 5 +----
textproc/scrollkeeper/Makefile | 4 +---
x11/gtk/DEINSTALL | 11 +++++++++++
x11/gtk/INSTALL | 7 +------
x11/gtk/Makefile | 6 +-----
37 files changed, 178 insertions(+), 147 deletions(-)
diffs (truncated from 717 to 300 lines):
diff -r a07dc6d1bafe -r d2a478abb126 databases/shared-mime-info/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/shared-mime-info/DEINSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:15 jlam Exp $
+
+MIMEDB_PATH="@MIMEDB_PATH@"
+
+case ${STAGE} in
+POST-DEINSTALL)
+ ${RM} -rf ${MIMEDB_PATH}
+ ;;
+esac
diff -r a07dc6d1bafe -r d2a478abb126 databases/shared-mime-info/INSTALL
--- a/databases/shared-mime-info/INSTALL Thu Jun 15 20:36:08 2006 +0000
+++ b/databases/shared-mime-info/INSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1 2004/08/31 11:43:44 jmmv Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:15 jlam Exp $
MIMEDB_PATH="@MIMEDB_PATH@"
UPDATE_MIMEDB="@UPDATE_MIMEDB@"
@@ -7,7 +7,4 @@
POST-INSTALL)
${UPDATE_MIMEDB} ${MIMEDB_PATH} >/dev/null
;;
-POST-DEINSTALL)
- ${RM} -rf ${MIMEDB_PATH}
- ;;
esac
diff -r a07dc6d1bafe -r d2a478abb126 databases/shared-mime-info/Makefile
--- a/databases/shared-mime-info/Makefile Thu Jun 15 20:36:08 2006 +0000
+++ b/databases/shared-mime-info/Makefile Thu Jun 15 20:40:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/08 09:56:43 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/06/15 20:40:15 jlam Exp $
#
DISTNAME= shared-mime-info-0.17
@@ -28,8 +28,6 @@
CFLAGS+= -c99
.endif
-DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL
-
FILES_SUBST+= MIMEDB_PATH="${PREFIX}/share/mime"
FILES_SUBST+= UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database"
diff -r a07dc6d1bafe -r d2a478abb126 fonts/ghostscript-cidfonts/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/ghostscript-cidfonts/DEINSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:15 jlam Exp $
+
+ADOBE_RESOURCEDIR="@ADOBE_RESOURCEDIR@"
+GS_RESOURCEDIR="@GS_RESOURCEDIR@"
+PKG_INFO="@PKG_INFO@"
+
+case ${STAGE} in
+DEINSTALL)
+ ${PKG_INFO} -qL adobe-cidfonts | ${GREP} "/Resource/CIDFont/" |
+ while read src; do
+ base=`${BASENAME} $src`
+ dest="${GS_RESOURCEDIR}/CIDFont/$base"
+ ${RM} -f $dest
+ done
+ ;;
+esac
diff -r a07dc6d1bafe -r d2a478abb126 fonts/ghostscript-cidfonts/INSTALL
--- a/fonts/ghostscript-cidfonts/INSTALL Thu Jun 15 20:36:08 2006 +0000
+++ b/fonts/ghostscript-cidfonts/INSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -1,32 +1,19 @@
#!/bin/sh
#
-# $NetBSD: INSTALL,v 1.1.1.1 2002/09/13 22:35:01 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:15 jlam Exp $
ADOBE_RESOURCEDIR="@ADOBE_RESOURCEDIR@"
GS_RESOURCEDIR="@GS_RESOURCEDIR@"
PKG_INFO="@PKG_INFO@"
-FONTFILES=` \
- ${PKG_INFO} -f adobe-cidfonts | \
- ${AWK} '/File:.*\/Resource\/CIDFont\// { print $2 }' \
-`
-
case ${STAGE} in
POST-INSTALL)
- for file in ${FONTFILES}; do
- base=`${BASENAME} $file`
- dest="${GS_RESOURCEDIR}/CIDFont/$base"
- src="../../../../$file"
- ${RM} -f $dest
- ${LN} -sf $src $dest
- done
- ;;
-
-DEINSTALL)
- for file in ${FONTFILES}; do
- base=`${BASENAME} $file`
+ ${PKG_INFO} -qL adobe-cidfonts | ${GREP} "/Resource/CIDFont/" |
+ while read src; do
+ base=`${BASENAME} $src`
dest="${GS_RESOURCEDIR}/CIDFont/$base"
${RM} -f $dest
+ ${LN} -fs $src $dest
done
;;
esac
diff -r a07dc6d1bafe -r d2a478abb126 fonts/ghostscript-cidfonts/Makefile
--- a/fonts/ghostscript-cidfonts/Makefile Thu Jun 15 20:36:08 2006 +0000
+++ b/fonts/ghostscript-cidfonts/Makefile Thu Jun 15 20:40:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:28 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/15 20:40:15 jlam Exp $
DISTNAME= ghostscript-cidfonts-20000901
PKGREVISION= 2
@@ -21,8 +21,6 @@
NO_BUILD= yes
USE_TOOLS+= gs:run
-DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL
-
FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q}
FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q}
FILES_SUBST+= PKG_INFO=${PKG_INFO:Q}
diff -r a07dc6d1bafe -r d2a478abb126 fonts/ghostscript-cmaps/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/ghostscript-cmaps/DEINSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:15 jlam Exp $
+
+ADOBE_RESOURCEDIR="@ADOBE_RESOURCEDIR@"
+GS_RESOURCEDIR="@GS_RESOURCEDIR@"
+PKG_INFO="@PKG_INFO@"
+
+case ${STAGE} in
+DEINSTALL)
+ ${PKG_INFO} -qL adobe-cmaps | ${GREP} "/Resource/CMap/" |
+ while read src; do
+ base=`${BASENAME} $src`
+ dest="${GS_RESOURCEDIR}/CMap/$base"
+ ${RM} -f $dest
+ done
+ ;;
+esac
diff -r a07dc6d1bafe -r d2a478abb126 fonts/ghostscript-cmaps/INSTALL
--- a/fonts/ghostscript-cmaps/INSTALL Thu Jun 15 20:36:08 2006 +0000
+++ b/fonts/ghostscript-cmaps/INSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -1,32 +1,19 @@
#!/bin/sh
#
-# $NetBSD: INSTALL,v 1.2 2002/09/13 22:38:33 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2006/06/15 20:40:15 jlam Exp $
ADOBE_RESOURCEDIR="@ADOBE_RESOURCEDIR@"
GS_RESOURCEDIR="@GS_RESOURCEDIR@"
PKG_INFO="@PKG_INFO@"
-FONTFILES=` \
- ${PKG_INFO} -f adobe-cmaps | \
- ${AWK} '/File:.*\/Resource\/CMap\// { print $2 }' \
-`
-
case ${STAGE} in
POST-INSTALL)
- for file in ${FONTFILES}; do
- base=`${BASENAME} $file`
+ ${PKG_INFO} -qL adobe-cmaps | ${GREP} "/Resource/CMap/" |
+ while read src; do
+ base=`${BASENAME} $src`
dest="${GS_RESOURCEDIR}/CMap/$base"
- src="../../../../$file"
${RM} -f $dest
${LN} -sf $src $dest
done
;;
-
-DEINSTALL)
- for file in ${FONTFILES}; do
- base=`${BASENAME} $file`
- dest="${GS_RESOURCEDIR}/CMap/$base"
- ${RM} -f $dest
- done
- ;;
esac
diff -r a07dc6d1bafe -r d2a478abb126 fonts/ghostscript-cmaps/Makefile
--- a/fonts/ghostscript-cmaps/Makefile Thu Jun 15 20:36:08 2006 +0000
+++ b/fonts/ghostscript-cmaps/Makefile Thu Jun 15 20:40:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:28 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/06/15 20:40:15 jlam Exp $
DISTNAME= ghostscript-cmaps-20020913
PKGREVISION= 2
@@ -21,8 +21,6 @@
NO_CONFIGURE= yes
NO_BUILD= yes
-DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL
-
FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q}
FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q}
FILES_SUBST+= PKG_INFO=${PKG_INFO:Q}
diff -r a07dc6d1bafe -r d2a478abb126 mail/mutt-devel/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt-devel/DEINSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+ ${RM} -f @DOCDIR@/samples
+ ;;
+esac
diff -r a07dc6d1bafe -r d2a478abb126 mail/mutt-devel/INSTALL
--- a/mail/mutt-devel/INSTALL Thu Jun 15 20:36:08 2006 +0000
+++ b/mail/mutt-devel/INSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -1,12 +1,8 @@
-# $NetBSD: INSTALL,v 1.3 2004/07/21 22:37:10 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2006/06/15 20:40:16 jlam Exp $
case ${STAGE} in
POST-INSTALL)
${RM} -f @DOCDIR@/samples
${LN} -sf ../../examples/mutt @DOCDIR@/samples
;;
-
-DEINSTALL)
- ${RM} -f @DOCDIR@/samples
- ;;
esac
diff -r a07dc6d1bafe -r d2a478abb126 mail/mutt-devel/Makefile
--- a/mail/mutt-devel/Makefile Thu Jun 15 20:36:08 2006 +0000
+++ b/mail/mutt-devel/Makefile Thu Jun 15 20:40:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2006/06/15 20:40:16 jlam Exp $
DISTNAME= mutt-1.5.11
PKGREVISION= 4
@@ -44,7 +44,6 @@
LDFLAGS+= ${_STRIPFLAG_CC}
-DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL
DOCDIR= ${PREFIX}/share/doc/mutt
EGDIR= ${PREFIX}/share/examples/mutt
CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
diff -r a07dc6d1bafe -r d2a478abb126 mail/mutt/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt/DEINSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+ ${RM} -f @DOCDIR@/samples
+ ;;
+esac
diff -r a07dc6d1bafe -r d2a478abb126 mail/mutt/INSTALL
--- a/mail/mutt/INSTALL Thu Jun 15 20:36:08 2006 +0000
+++ b/mail/mutt/INSTALL Thu Jun 15 20:40:15 2006 +0000
@@ -1,12 +1,8 @@
-# $NetBSD: INSTALL,v 1.3 2004/08/05 07:19:25 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2006/06/15 20:40:16 jlam Exp $
case ${STAGE} in
POST-INSTALL)
${RM} -f @DOCDIR@/samples
${LN} -sf ../../examples/mutt @DOCDIR@/samples
;;
-
-DEINSTALL)
- ${RM} -f @DOCDIR@/samples
- ;;
esac
diff -r a07dc6d1bafe -r d2a478abb126 mail/mutt/Makefile
--- a/mail/mutt/Makefile Thu Jun 15 20:36:08 2006 +0000
+++ b/mail/mutt/Makefile Thu Jun 15 20:40:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2006/05/22 07:00:55 rillig Exp $
+# $NetBSD: Makefile,v 1.141 2006/06/15 20:40:16 jlam Exp $
DISTNAME= mutt-1.4.2.1i
PKGNAME= ${DISTNAME:C/i$//}
@@ -71,7 +71,6 @@
LDFLAGS+= ${_STRIPFLAG_CC}
-DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL
DOCDIR= ${PREFIX}/share/doc/mutt
EGDIR= ${PREFIX}/share/examples/mutt
CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
diff -r a07dc6d1bafe -r d2a478abb126 misc/openoffice2-bin/DEINSTALL
Home |
Main Index |
Thread Index |
Old Index