* buildlink1 -> buildlink2

* Properly handle local discography when installing/deinstalling the binary
  package.
* Use bsd.pkg.install.mk to preserve local configuration files when
  reinstalling xmcd.

8 files changed, 114 insertions, 86 deletions

diff --git a/audio/xmcd/DEINSTALL b/audio/xmcd/DEINSTALL
index 5709c17ee78..48e38832605 100644
--- a/audio/xmcd/DEINSTALL
+++ b/audio/xmcd/DEINSTALL
@@ -1,32 +1,30 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2002/01/08 09:56:19 tron Exp $
+# $NetBSD: DEINSTALL,v 1.3 2002/10/08 11:50:04 jlam Exp $
 #
 
-PKGNAME=$1
-STAGE=$2
+XMCDDIR=${PKG_PREFIX}/lib/X11/xmcd
 
 case ${STAGE} in
-DEINSTALL)
-	;;
-
 POST-DEINSTALL)
-	cat << EOF
+	${CAT} << EOF
 =============================================================================
 If you won't be using ${PKGNAME} any longer, you may want to remove
-any cached CD informations in
-	${PKG_PREFIX}/lib/X11/xmcd/cddb
-and any drive informations in
-	${PKG_PREFIX}/lib/X11/xmcd/config
-e.g. by deleting the corresponding directory. Please note that config
+any cached CD information in
+
+	${XMCDDIR}/cdinfo
+
+any local discography collection in
+
+	${XMCDDIR}/discog
+
+and any drive information in
+
+	${XMCDDIR}/config
+
+e.g., by deleting the corresponding directory.  Please note that config
 files will get overwritten on re-install if you don't save them manually.
 =============================================================================
 EOF
 	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
 esac
-exit 0
diff --git a/audio/xmcd/INSTALL b/audio/xmcd/INSTALL
new file mode 100644
index 00000000000..8ea1556ac3e
--- /dev/null
+++ b/audio/xmcd/INSTALL
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2002/10/08 11:50:04 jlam Exp $
+#
+
+XMCDDIR=${PKG_PREFIX}/lib/X11/xmcd
+
+case ${STAGE} in
+POST-INSTALL)
+	#
+	# Generate the index.html files in the local discography collection.
+	#
+	${XMCDDIR}/scripts/genidx
+	;;
+esac
diff --git a/audio/xmcd/MESSAGE b/audio/xmcd/MESSAGE
new file mode 100644
index 00000000000..6a434590213
--- /dev/null
+++ b/audio/xmcd/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2002/10/08 11:50:04 jlam Exp $
+
+Before using xmcd/cda for the first time, you must set up the software by
+running the following interactive script as ${ROOT_USER}:
+
+        ${PREFIX}/lib/X11/xmcd/config/config.sh
+
+Xmcd/cda will not work until that is done.
+===========================================================================
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index ff291da426b..87cdef8220d 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/07/02 11:29:11 agc Exp $
+# $NetBSD: Makefile,v 1.33 2002/10/08 11:50:04 jlam Exp $
 
 DISTNAME=	xmcd-3.0.2
 CATEGORIES=	audio
@@ -13,12 +13,29 @@ PATCHFILES=		xmcd-3.0.2-proxyauth-patch
 PATCH_DIST_STRIP=	-p1
 
 WRKSRC=		${WRKDIR}/xmcd-3.0
-USE_NCURSES=	yes
-USE_IMAKE=	yes
-INTERACTIVE_STAGE=	install
-MAKE_ENV+=	SHELL=${SH}
 
-post-patch:
+USE_BUILDLINK2=		# defined
+USE_NCURSES=		# defined
+USE_IMAKE=		# defined
+MAKE_ENV+=		BATCH_BINDIR=${PREFIX}/bin
+MAKE_ENV+=		BATCH_LIBDIR=${PREFIX}/lib/X11
+MAKE_ENV+=		BATCH_MANDIR=${PREFIX}/man/man1
+MAKE_ENV+=		SHELL=${SH}
+
+ARCHBIN=	${PREFIX}/lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}
+XMCDDIR=	${PREFIX}/lib/X11/xmcd
+
+_SETUID_ROOT=	${ROOT_USER} ${ROOT_GROUP} 4711
+SPECIAL_PERMS=	${ARCHBIN}/cda ${_SETUID_ROOT}
+SPECIAL_PERMS+=	${ARCHBIN}/xmcd ${_SETUID_ROOT}
+
+SFILES=		common.cfg device.cfg wwwwarp.cfg
+.for FILE in ${SFILES}
+SUPPORT_FILES+=	${XMCDDIR}/config/${FILE}.dist ${XMCDDIR}/config/${FILE}
+.endfor
+MAKE_DIRS=	${XMCDDIR} ${XMCDDIR}/cdinfo ${XMCDDIR}/config ${XMCDDIR}/discog
+
+pre-configure:
 	cd ${WRKSRC} && \
 	for f in libdi_d/config.sh misc_d/start.sh install.sh; do \
 		${SED} -e "s/@MACHINE_ARCH@/${MACHINE_ARCH}/" $$f > $$f.new; \
@@ -26,17 +43,15 @@ post-patch:
 	done
 
 post-install:
-.for FILE in cda xmcd gobrowser
-	@${TEST} -n "${_STRIPFLAG_INSTALL}" && \
-	strip ${PREFIX}/lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/${FILE}
-.endfor
-	${MV} ${PREFIX}/man/cat1/cda.1 ${PREFIX}/man/man1/cda.1
-	${MV} ${PREFIX}/man/cat1/xmcd.1 ${PREFIX}/man/man1/xmcd.1
-.if ! defined(BATCH)
-	${PREFIX}/lib/X11/xmcd/config/config.sh
-.endif
-
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
+	if [ -n "${_STRIPFLAG_INSTALL}" ]; then				\
+		for file in cda xmcd gobrowser; do			\
+			strip ${ARCHBIN}/$$file;			\
+		done;							\
+	fi
+
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmcd/PLIST b/audio/xmcd/PLIST
index d9b23ea9791..1bfc5dda4bd 100644
--- a/audio/xmcd/PLIST
+++ b/audio/xmcd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:30 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/10/08 11:50:04 jlam Exp $
 bin/cda
 bin/xmcd
 bin/xmcd_start
@@ -48,21 +48,10 @@ lib/X11/xmcd/config/.tbl/Tatung
 lib/X11/xmcd/config/.tbl/Teac
 lib/X11/xmcd/config/.tbl/Toshiba
 lib/X11/xmcd/config/.tbl/Yamaha
-lib/X11/xmcd/config/common.cfg
+lib/X11/xmcd/config/common.cfg.dist
 lib/X11/xmcd/config/config.sh
-lib/X11/xmcd/config/device.cfg
-lib/X11/xmcd/config/wwwwarp.cfg
-lib/X11/xmcd/discog/Blues/General_Blues/index.html
-lib/X11/xmcd/discog/Classical/General_Classical/index.html
-lib/X11/xmcd/discog/Country/General_Country/index.html
-lib/X11/xmcd/discog/Data/General_Data/index.html
-lib/X11/xmcd/discog/Folk/General_Folk/index.html
-lib/X11/xmcd/discog/Jazz/General_Jazz/index.html
-lib/X11/xmcd/discog/Newage/General_Newage/index.html
-lib/X11/xmcd/discog/Rock/General_Rock/index.html
-lib/X11/xmcd/discog/Soundtrack/General_Soundtrack/index.html
-lib/X11/xmcd/discog/Unclassifiable/General_Unclassifiable/index.html
-lib/X11/xmcd/discog/World/Reggae/index.html
+lib/X11/xmcd/config/device.cfg.dist
+lib/X11/xmcd/config/wwwwarp.cfg.dist
 lib/X11/xmcd/discog/bkgnd.gif
 lib/X11/xmcd/discog/cda.html
 lib/X11/xmcd/discog/discog.html
@@ -242,6 +231,7 @@ lib/X11/xmcd/help/Xm/TimeMode.lbl
 lib/X11/xmcd/help/Xm/Track.lbl
 lib/X11/xmcd/help/Xm/TrkTitle.lbl
 lib/X11/xmcd/help/Xm/WWWwarp.btn
+@exec ${MKDIR} %D/lib/X11/xmcd/lib-${OPSYS}-${MACHINE_ARCH}
 lib/X11/xmcd/pixmaps/xmcd.icon
 lib/X11/xmcd/pixmaps/xmcd.xpm
 lib/X11/xmcd/pixmaps/xmcd_a.px
@@ -267,31 +257,7 @@ man/man1/xmcd.1
 @dirrm lib/X11/xmcd/help/Cr
 @dirrm lib/X11/xmcd/help
 @dirrm lib/X11/xmcd/docs
-@dirrm lib/X11/xmcd/discog/World/Reggae
-@dirrm lib/X11/xmcd/discog/World
-@dirrm lib/X11/xmcd/discog/Unclassifiable/General_Unclassifiable
-@dirrm lib/X11/xmcd/discog/Unclassifiable
-@dirrm lib/X11/xmcd/discog/Soundtrack/General_Soundtrack
-@dirrm lib/X11/xmcd/discog/Soundtrack
-@dirrm lib/X11/xmcd/discog/Rock/General_Rock
-@dirrm lib/X11/xmcd/discog/Rock
-@dirrm lib/X11/xmcd/discog/Newage/General_Newage
-@dirrm lib/X11/xmcd/discog/Newage
-@dirrm lib/X11/xmcd/discog/Jazz/General_Jazz
-@dirrm lib/X11/xmcd/discog/Jazz
-@dirrm lib/X11/xmcd/discog/Folk/General_Folk
-@dirrm lib/X11/xmcd/discog/Folk
-@dirrm lib/X11/xmcd/discog/Data/General_Data
-@dirrm lib/X11/xmcd/discog/Data
-@dirrm lib/X11/xmcd/discog/Country/General_Country
-@dirrm lib/X11/xmcd/discog/Country
-@dirrm lib/X11/xmcd/discog/Classical/General_Classical
-@dirrm lib/X11/xmcd/discog/Classical
-@dirrm lib/X11/xmcd/discog/Blues/General_Blues
-@dirrm lib/X11/xmcd/discog/Blues
-@dirrm lib/X11/xmcd/discog
 @dirrm lib/X11/xmcd/config/.tbl
-@unexec ${RMDIR} %D/lib/X11/xmcd/config 2>/dev/null || true
 @dirrm lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}
 @dirrm lib/X11/xmcd/lib-${OPSYS}-${MACHINE_ARCH}
 @dirrm lib/X11/xmcd/scripts
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index ef257f2fc24..42efeff448a 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.9 2002/01/25 08:38:34 tron Exp $
+$NetBSD: distinfo,v 1.10 2002/10/08 11:50:04 jlam Exp $
 
 SHA1 (xmcd-3.0.2.tar.gz) = 10258f299f917c94780d3e6d9feb57535d4603b5
 Size (xmcd-3.0.2.tar.gz) = 690285 bytes
 SHA1 (xmcd-3.0.2-proxyauth-patch) = a6114c73e5470747fe2dcfe16cb11bc7c5e5b4dd
 Size (xmcd-3.0.2-proxyauth-patch) = 2922 bytes
 SHA1 (patch-aa) = 0a446d2943dd9ac9d66938674daa16d1d629e470
-SHA1 (patch-ab) = 5cb710c688caf4db56f0d04f366bedcc94dcde5d
+SHA1 (patch-ab) = e262ffe7ce8d6d87a7867c9bc4de9a210f0a0b73
 SHA1 (patch-ac) = 19440a72fda657bf73811c20aabab5c955369516
-SHA1 (patch-ad) = b62086c7f1801cf500cb8bc93e262e97f015b540
+SHA1 (patch-ad) = b887cbc81cb57bc5598a65dcb70e136eb427044b
 SHA1 (patch-ae) = 3de0e9fd004fcb6012f033739ff1b66bd059d655
 SHA1 (patch-af) = e8bc1a3b791f6df15f12f074712a55423fa3fadf
 SHA1 (patch-ag) = cdca79fa131a6b2e74c7cea377167f8d0290c162
diff --git a/audio/xmcd/patches/patch-ab b/audio/xmcd/patches/patch-ab
index 254f9eb0453..2b7578752ee 100644
--- a/audio/xmcd/patches/patch-ab
+++ b/audio/xmcd/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2001/07/24 16:00:02 nra Exp $
+$NetBSD: patch-ab,v 1.9 2002/10/08 11:50:04 jlam Exp $
 
 --- cda_d/Imakefile.orig	Mon Jul 16 12:52:16 2001
 +++ cda_d/Imakefile	Mon Jul 23 14:43:24 2001
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.8 2001/07/24 16:00:02 nra Exp $
  #if defined(__bsdi__)
  .if exists(/usr/include/ncurses.h)
 -LOCAL_LIBRARIES=-lncurses
-+LOCAL_LIBRARIES=-I/usr/pkg/include -L/usr/pkg/lib -lncurses
++LOCAL_LIBRARIES=-I${LOCALBASE}/include -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lncurses
  .else
  LOCAL_LIBRARIES=
  .endif
diff --git a/audio/xmcd/patches/patch-ad b/audio/xmcd/patches/patch-ad
index 5987d54dea6..b2bbe44c758 100644
--- a/audio/xmcd/patches/patch-ad
+++ b/audio/xmcd/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2001/07/24 16:00:02 nra Exp $
+$NetBSD: patch-ad,v 1.8 2002/10/08 11:50:04 jlam Exp $
 
---- install.sh.orig	Mon Jul 16 12:51:58 2001
-+++ install.sh	Mon Jul 23 14:35:29 2001
-@@ -57,7 +57,7 @@
+--- install.sh.orig	Tue Aug  7 17:14:54 2001
++++ install.sh
+@@ -57,7 +57,7 @@ XBINOWNER=root
  XBINGROUP=bin
  ERRFILE=/tmp/xmcd.err
  TMPFILE=/tmp/xmcdinst.$$
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.7 2001/07/24 16:00:02 nra Exp $
  
  #
  # Utility functions
-@@ -493,7 +493,7 @@
+@@ -493,7 +493,7 @@ trap "rm -f $TMPFILE; exit 1" 1 2 3 5 15
  #
  OS_SYS=`(uname -s) 2>/dev/null`
  OS_REL=`(uname -r) 2>/dev/null`
@@ -20,3 +20,27 @@ $NetBSD: patch-ad,v 1.7 2001/07/24 16:00:02 nra Exp $
  
  if [ -z "$OS_SYS" ]
  then
+@@ -1226,20 +1226,11 @@ do
+ done
+ 
+ # Configuration files
+-if [ -f $XMCDLIB/config/common.cfg ]
+-then
+-	diff $XMCDLIB/config/common.cfg libdi_d/common.cfg >/dev/null 2>&1
+-	if [ $? -ne 0 ]
+-	then
+-		# Save old config file for use by config.sh
+-		mv $XMCDLIB/config/common.cfg $XMCDLIB/config/common.cfg.old
+-	fi
+-fi
+-inst_file libdi_d/common.cfg $XMCDLIB/config/common.cfg \
++inst_file libdi_d/common.cfg $XMCDLIB/config/common.cfg.dist \
+ 	$FILEPERM $OWNER $GROUP
+-inst_file libdi_d/device.cfg $XMCDLIB/config/device.cfg \
++inst_file libdi_d/device.cfg $XMCDLIB/config/device.cfg.dist \
+ 	$FILEPERM $OWNER $GROUP
+-inst_file cdinfo_d/wwwwarp.cfg $XMCDLIB/config/wwwwarp.cfg \
++inst_file cdinfo_d/wwwwarp.cfg $XMCDLIB/config/wwwwarp.cfg.dist \
+ 	$FILEPERM $OWNER $GROUP
+ 
+ rm -f $XMCDLIB/config/.tbl/*