diff options
| author | jlam <jlam> | 2006-06-15 20:40:15 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-15 20:40:15 +0000 |
| commit | 98574fa1445ba3682dffba92eee4328eb1772082 (patch) | |
| tree | fdcc07230f85f6fc9861a7659692fa83b1801fd4 /misc | |
| parent | 0dcd925361497ee9fde28008df357e6513c65adb (diff) | |
| download | pkgsrc-98574fa1445ba3682dffba92eee4328eb1772082.tar.gz | |
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 (limited to 'misc')
| -rw-r--r-- | misc/openoffice2-bin/DEINSTALL | 15 | ||||
| -rw-r--r-- | misc/openoffice2-bin/INSTALL | 20 | ||||
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 4 |
3 files changed, 20 insertions, 19 deletions
diff --git a/misc/openoffice2-bin/DEINSTALL b/misc/openoffice2-bin/DEINSTALL new file mode 100644 index 00000000000..f28fe9f7268 --- /dev/null +++ b/misc/openoffice2-bin/DEINSTALL @@ -0,0 +1,15 @@ +# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $ +# +# This file contains the contents of the OOo rpm pre-uninstall, +# post-uninstall scripts. + +PRODUCTINSTALLLOCATION=${PKG_PREFIX}/openoffice.org@VER@ + +case ${STAGE} in +DEINSTALL) + if [ -h $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ] + then + ${RM} $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1 + fi + ;; +esac diff --git a/misc/openoffice2-bin/INSTALL b/misc/openoffice2-bin/INSTALL index dfb1fb35187..067ac40aae9 100644 --- a/misc/openoffice2-bin/INSTALL +++ b/misc/openoffice2-bin/INSTALL @@ -1,15 +1,11 @@ -# $NetBSD: INSTALL,v 1.2 2006/01/04 15:29:41 ghen Exp $ - -# This file contains the contents of the OOo rpm -# pre-install, post-install, pre-uninstall and post-uninstall scripts +# $NetBSD: INSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $ +# +# This file contains the contents of the OOo rpm pre-install, post-install +# scripts. PRODUCTINSTALLLOCATION=${PKG_PREFIX}/openoffice.org@VER@ case ${STAGE} in -PRE-INSTALL) - # nothing to do - ;; - POST-INSTALL) if [ ! -f $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ] then @@ -19,12 +15,4 @@ POST-INSTALL) fi fi ;; - -DEINSTALL) - if [ -h $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ] - then - ${RM} $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1 - fi - ;; - esac diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index 95f3d850057..eb5c24a5fa1 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/05/22 22:22:04 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/06/15 20:40:16 jlam Exp $ PKGNAME= openoffice-bin-2.0.2 CATEGORIES= misc @@ -42,8 +42,6 @@ PLIST_SRC+= ${WRKDIR}/PLIST # ARCH= ${MACHINE_ARCH:C/i[3-6]86/i386/g} -DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL - .if ${OPSYS} == "NetBSD" . if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" . if !exists(/emul/svr4/usr/lib/ld.so) |