pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Drop use of INSTALL_SRC and DEINSTALL_SRC and instead ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/65423ffbeaeb
branches: trunk
changeset: 515628:65423ffbeaeb
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Jul 05 06:53:12 2006 +0000
description:
Drop use of INSTALL_SRC and DEINSTALL_SRC and instead set the proper
variables so that the default INSTALL/DEINSTALL scripts from the
pkginstall framework do the right thing. Where possible, move some
post-install directions for package setup into MESSAGE files so that
they may be re-inspected by querying the installed package using
"pkg_info -D ...".
diffstat:
emulators/vmware-module/INSTALL | 30 ---------------------
emulators/vmware-module/MESSAGE | 23 ++++++++++++++++
emulators/vmware-module/Makefile | 7 +----
emulators/vmware-module3/INSTALL | 30 ---------------------
emulators/vmware-module3/MESSAGE | 23 ++++++++++++++++
emulators/vmware-module3/Makefile | 7 +----
games/ivan/DEINSTALL | 26 ++++++++++--------
games/ivan/Makefile | 8 ++---
games/ivan/PLIST | 3 +-
games/tetrinetx/DEINSTALL | 37 ++++++++-----------------
games/tetrinetx/Makefile | 5 +--
games/xscavenger/DEINSTALL | 19 -------------
games/xscavenger/Makefile | 6 +--
inputmethod/ja-freewnn-lib/Makefile.common | 7 +---
inputmethod/ja-freewnn-lib/files/INSTALL | 26 ------------------
inputmethod/ja-freewnn-server-bin/Makefile | 4 +-
inputmethod/skkinput/INSTALL | 14 ----------
inputmethod/skkinput/Makefile | 8 +----
inputmethod/skkinput/PLIST | 3 +-
net/nocol/DEINSTALL | 23 ----------------
net/nocol/Makefile | 7 ++--
parallel/glunix/DEINSTALL | 15 ----------
parallel/glunix/INSTALL | 35 -------------------------
parallel/glunix/Makefile | 42 ++++++-----------------------
parallel/glunix/PLIST | 4 +--
25 files changed, 103 insertions(+), 309 deletions(-)
diffs (truncated from 682 to 300 lines):
diff -r 26b21faa6c31 -r 65423ffbeaeb emulators/vmware-module/INSTALL
--- a/emulators/vmware-module/INSTALL Wed Jul 05 06:15:49 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.3 2003/08/30 20:22:51 jlam Exp $
-
-case $2 in
-POST-INSTALL)
- /bin/cat << EOF
-===========================================================================
-Copy the following files from ${PKG_PREFIX}/etc/rc.d to /etc/rc.d:
-
-linuxrtc vmmon vmnet vmnetif
-
-and append the content of ${PKG_PREFIX}/etc/rc.conf.d/vmware to /etc/rc.conf:
-
-vmware_prefix=${PKG_PREFIX}
-vmmon=YES
-vmnet=YES
-linuxrtc=NO
-# XXX should cater for multiple interfaces
-vmnetif=YES
-vmnetifname=vmnet1
-vmnetdev=/dev/vmnet1
-vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
-vmnetif_use_dhcpd=NO
-
-Then, reboot your system.
-===========================================================================
-EOF
- ;;
-esac
diff -r 26b21faa6c31 -r 65423ffbeaeb emulators/vmware-module/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vmware-module/MESSAGE Wed Jul 05 06:53:12 2006 +0000
@@ -0,0 +1,23 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/07/05 06:53:12 jlam Exp $
+
+To use ${PKGNAME}, you will need to copy the following files from
+${PREFIX}/etc/rc.d to /etc/rc.d:
+
+ linuxrtc vmmon vmnet vmnetif
+
+and append the following content to /etc/rc.conf:
+
+ vmware_prefix="${PREFIX}"
+ vmmon=YES
+ vmnet=YES
+ linuxrtc=NO
+ # XXX should cater for multiple interfaces
+ vmnetif=YES
+ vmnetifname=vmnet1
+ vmnetdev=/dev/vmnet1
+ vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
+ vmnetif_use_dhcpd=NO
+
+Then, reboot your system.
+===========================================================================
diff -r 26b21faa6c31 -r 65423ffbeaeb emulators/vmware-module/Makefile
--- a/emulators/vmware-module/Makefile Wed Jul 05 06:15:49 2006 +0000
+++ b/emulators/vmware-module/Makefile Wed Jul 05 06:53:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/05/18 20:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/05 06:53:12 jlam Exp $
DISTNAME= vmware-netbsd-1.2
PKGNAME= vmware-module-1.2
@@ -18,8 +18,6 @@
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
-DEINSTALL_SRC= # empty
-INSTALL_SRC= ${PKGDIR}/INSTALL
NO_SRC_ON_FTP= already there
@@ -69,9 +67,6 @@
${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmware.patched \
${PREFIX}/etc/rc.conf.d/vmware
-post-install:
- PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
-
.include "../../mk/bsd.pkg.mk"
LDFLAGS= # empty since we use BSD-style makefiles
diff -r 26b21faa6c31 -r 65423ffbeaeb emulators/vmware-module3/INSTALL
--- a/emulators/vmware-module3/INSTALL Wed Jul 05 06:15:49 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:52 jlam Exp $
-
-case $2 in
-POST-INSTALL)
- /bin/cat << EOF
-===========================================================================
-Copy the following files from ${PKG_PREFIX}/etc/rc.d to /etc/rc.d:
-
-linuxrtc vmmon vmnet vmnetif
-
-and append the content of ${PKG_PREFIX}/etc/rc.conf.d/vmware to /etc/rc.conf:
-
-vmware_prefix=${PKG_PREFIX}
-vmmon=YES
-vmnet=YES
-linuxrtc=NO
-# XXX should cater for multiple interfaces
-vmnetif=YES
-vmnetifname=vmnet1
-vmnetdev=/dev/vmnet1
-vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
-vmnetif_use_dhcpd=NO
-
-Then, reboot your system.
-===========================================================================
-EOF
- ;;
-esac
diff -r 26b21faa6c31 -r 65423ffbeaeb emulators/vmware-module3/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vmware-module3/MESSAGE Wed Jul 05 06:53:12 2006 +0000
@@ -0,0 +1,23 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/07/05 06:53:12 jlam Exp $
+
+To use ${PKGNAME}, you will need to copy the following files from
+${PREFIX}/etc/rc.d to /etc/rc.d:
+
+ linuxrtc vmmon vmnet vmnetif
+
+and append the following content to /etc/rc.conf:
+
+ vmware_prefix="${PREFIX}"
+ vmmon=YES
+ vmnet=YES
+ linuxrtc=NO
+ # XXX should cater for multiple interfaces
+ vmnetif=YES
+ vmnetifname=vmnet1
+ vmnetdev=/dev/vmnet1
+ vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
+ vmnetif_use_dhcpd=NO
+
+Then, reboot your system.
+===========================================================================
diff -r 26b21faa6c31 -r 65423ffbeaeb emulators/vmware-module3/Makefile
--- a/emulators/vmware-module3/Makefile Wed Jul 05 06:15:49 2006 +0000
+++ b/emulators/vmware-module3/Makefile Wed Jul 05 06:53:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/26 21:34:51 veego Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/05 06:53:12 jlam Exp $
DISTNAME= vmware-netbsd-3.2.1.8
PKGNAME= vmware-module-3.2.1.8
@@ -15,8 +15,6 @@
ONLY_FOR_PLATFORM= NetBSD-*-i386
NO_CONFIGURE= yes
-DEINSTALL_SRC= # empty
-INSTALL_SRC= ${PKGDIR}/INSTALL
NO_SRC_ON_FTP= already there
@@ -63,9 +61,6 @@
${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmware.patched \
${PREFIX}/etc/rc.conf.d/vmware
-post-install:
- PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
-
.include "../../mk/bsd.pkg.mk"
LDFLAGS= # empty since we use BSD-style makefiles
diff -r 26b21faa6c31 -r 65423ffbeaeb games/ivan/DEINSTALL
--- a/games/ivan/DEINSTALL Wed Jul 05 06:15:49 2006 +0000
+++ b/games/ivan/DEINSTALL Wed Jul 05 06:53:12 2006 +0000
@@ -1,17 +1,19 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2004/08/18 17:52:25 ben Exp $
-#
-
-case $2 in
- DEINSTALL) cat << EOF
+# $NetBSD: DEINSTALL,v 1.2 2006/07/05 06:53:12 jlam Exp $
-=============================================================
-The records, log and bones were not wiped out by this
-deletion process. If you don't want them around, please
-remove ${PKG_PREFIX}/share/ivan.
-=============================================================
+case "${STAGE}" in
+DEINSTALL)
+ DATADIR="${PKG_PREFIX}/share/ivan"
+ ${RMDIR} -p ${DATADIR} 2>/dev/null || ${TRUE}
+ if ${TEST} -d ${DATADIR}; then
+ ${CAT} << EOF
+======================================================================
+The records, log and bones were not wiped out by this deletion process.
+If you don't want them around, then please remove the following
+directory:
+ ${DATADIR}
+======================================================================
EOF
+ fi
;;
esac
diff -r 26b21faa6c31 -r 65423ffbeaeb games/ivan/Makefile
--- a/games/ivan/Makefile Wed Jul 05 06:15:49 2006 +0000
+++ b/games/ivan/Makefile Wed Jul 05 06:53:12 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/06/12 16:28:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/05 06:53:12 jlam Exp $
#
DISTNAME= ivan-0.50
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ivan/}
@@ -17,9 +17,7 @@
USE_LANGUAGES= c++
-DEINSTALL_SRC= ${PKGDIR}/DEINSTALL
-INSTALL_SRC= # empty
-
+REQD_DIRS+= share/ivan
CONF_FILES_PERMS+= /dev/null ${PREFIX}/share/ivan/ivan-highscore.scores \
${ROOT_USER} games 664
diff -r 26b21faa6c31 -r 65423ffbeaeb games/ivan/PLIST
--- a/games/ivan/PLIST Wed Jul 05 06:15:49 2006 +0000
+++ b/games/ivan/PLIST Wed Jul 05 06:53:12 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/19 07:15:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/07/05 06:53:13 jlam Exp $
bin/ivan
share/ivan/Graphics/Char.pcx
share/ivan/Graphics/Cursor.pcx
@@ -23,4 +23,3 @@
@dirrm share/ivan/Bone
@dirrm share/ivan/Graphics
@dirrm share/ivan/Script
-@dirrm share/ivan
diff -r 26b21faa6c31 -r 65423ffbeaeb games/tetrinetx/DEINSTALL
--- a/games/tetrinetx/DEINSTALL Wed Jul 05 06:15:49 2006 +0000
+++ b/games/tetrinetx/DEINSTALL Wed Jul 05 06:53:12 2006 +0000
@@ -1,27 +1,14 @@
-#!/bin/sh
-# $NetBSD: DEINSTALL,v 1.1.1.1 2006/02/14 17:03:54 rillig Exp $
-
-PKGNAME=$1
-STAGE=$2
-LIST="${PKG_PREFIX}/share/tetrinetx/game.log"
+# $NetBSD: DEINSTALL,v 1.2 2006/07/05 06:53:13 jlam Exp $
-case ${STAGE} in
- DEINSTALL)
- for to_trash in ${LIST}; do
- if [ -d "${to_trash}" ]; then
- rm -rf ${to_trash}/*
- elif [ -f "${to_trash}" ]; then
- rm ${to_trash}
- fi
- done
- ;;
-
- POST-DEINSTALL)
- ;;
-
- *)
- echo "Unexpected argument: ${STAGE}"
- exit 1
- ;;
+case "${STAGE}" in
+DEINSTALL)
+ LIST="${PKG_PREFIX}/share/tetrinetx/game.log"
+ for to_trash in ${LIST}; do
+ if ${TEST} -d "$to_trash"; then
+ ${RM} -fr $to_trash/*
+ elif ${TEST} -f "$to_trash"; then
+ ${RM} -f $to_trash
+ fi
+ done
+ ;;
esac
-exit 0
diff -r 26b21faa6c31 -r 65423ffbeaeb games/tetrinetx/Makefile
--- a/games/tetrinetx/Makefile Wed Jul 05 06:15:49 2006 +0000
+++ b/games/tetrinetx/Makefile Wed Jul 05 06:53:12 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/03/14 01:14:29 jlam Exp $
Home |
Main Index |
Thread Index |
Old Index