pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/xmms-meta-input {DE,}INSTALL_SRC is not actually...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a507537d2345
branches:  trunk
changeset: 514875:a507537d2345
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jun 19 23:16:33 2006 +0000

description:
{DE,}INSTALL_SRC is not actually obsolete without some other changes
to the DEINSTALL/INSTALL scripts so that they are the correct format
as expected by the pkginstall framework.  Fix the DEINSTALL script.

Also, use REQD_DIRS to manage the Input/Meta directory instead of
using @unexecJ lines in the PLIST.

diffstat:

 audio/xmms-meta-input/DEINSTALL |  26 ++++++++++++++------------
 audio/xmms-meta-input/Makefile  |   3 ++-
 audio/xmms-meta-input/PLIST     |   4 +---
 3 files changed, 17 insertions(+), 16 deletions(-)

diffs (68 lines):

diff -r c6389d355d7c -r a507537d2345 audio/xmms-meta-input/DEINSTALL
--- a/audio/xmms-meta-input/DEINSTALL   Mon Jun 19 23:09:59 2006 +0000
+++ b/audio/xmms-meta-input/DEINSTALL   Mon Jun 19 23:16:33 2006 +0000
@@ -1,17 +1,19 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1.1.1 2003/12/24 00:09:55 ben Exp $
-#
-
-case $2 in
-       DEINSTALL) cat << EOF
+# $NetBSD: DEINSTALL,v 1.2 2006/06/19 23:16:33 jlam Exp $
 
-=============================================================
-The xmms-meta-input player scripts were not wiped out by
-this deletion process.  If you don't want them around,
-please remove ${PKG_PREFIX}/lib/xmms/Input/Meta.
-=============================================================
+case "${STAGE}" in
+DEINSTALL)
+       INPUT_MESA_SCRIPTDIR="${PKG_PREFIX}/lib/xmms/Input/Meta"
+       ${RMDIR} -p ${INPUT_MESA_SCRIPTDIR} 2>/dev/null || ${TRUE}
+       if ${TEST} -d ${INPUT_MESA_SCRIPTDIR}; then
+               ${CAT} << EOF
+======================================================================
+The xmms-meta-input player scripts were not wiped out by this deletion
+process.  If you don't want them around, then please remove the
+following directory:
 
+       ${INPUT_MESA_SCRIPTDIR}
+======================================================================
 EOF
+       fi
        ;;
 esac
diff -r c6389d355d7c -r a507537d2345 audio/xmms-meta-input/Makefile
--- a/audio/xmms-meta-input/Makefile    Mon Jun 19 23:09:59 2006 +0000
+++ b/audio/xmms-meta-input/Makefile    Mon Jun 19 23:16:33 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/17 19:29:11 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/06/19 23:16:34 jlam Exp $
 #
 
 DISTNAME=              xmms-meta-input-0.4
@@ -11,6 +11,7 @@
 COMMENT=               XMMS plugin wrapper for shell scripts
 
 INSTALLATION_DIRS=     lib/xmms/Input
+REQD_DIRS+=            lib/xmms/Input/Mesa
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/libmetainput.so ${PREFIX}/lib/xmms/Input
diff -r c6389d355d7c -r a507537d2345 audio/xmms-meta-input/PLIST
--- a/audio/xmms-meta-input/PLIST       Mon Jun 19 23:09:59 2006 +0000
+++ b/audio/xmms-meta-input/PLIST       Mon Jun 19 23:16:33 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/05 15:07:33 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/06/19 23:16:34 jlam Exp $
 lib/xmms/Input/libmetainput.so
 share/doc/xmms-input/README
 share/examples/xmms-meta-input/dsp_input
@@ -10,6 +10,4 @@
 share/examples/xmms-meta-input/vorbis
 @dirrm share/examples/xmms-meta-input
 @dirrm share/doc/xmms-input
-@exec ${MKDIR} %D/lib/xmms/Input/Meta
-@dirrm lib/xmms/Input/Meta
 @comment in xmms: @dirrm lib/xmms/Input



Home | Main Index | Thread Index | Old Index