Update "xmcd" package to version 2.5.

4 files changed, 80 insertions, 22 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index f80372e4d72..31d306f7b79 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 1999/04/13 01:25:35 abs Exp $
+# $NetBSD: Makefile,v 1.16 1999/06/28 07:49:05 tron Exp $
 #
 
-DISTNAME=	xmcd-2.4
+DISTNAME=	xmcd-2.5
 CATEGORIES=	audio
 MASTER_SITES=	http://mercury.hypersurf.com/~amb/download/xmcd/src/
 
@@ -13,12 +13,13 @@ DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 USE_MOTIF=	yes
 USE_IMAKE=	yes
 IS_INTERACTIVE=	yes	# asks a lot of questions
+MAKE_ENV+=	MACHINE_ARCH="${MACHINE_ARCH}" SHELL=/bin/sh
 
 post-install:
-	@strip ${PREFIX}/bin/cda
-	@strip ${PREFIX}/bin/cddbcmd
-	@strip ${PREFIX}/bin/wm2xmcd
-	@strip ${PREFIX}/bin/xmcd
+.for FILE in cda cddbcmd wm2xmcd xmcd
+	@test -n "${STRIPFLAG}" && \
+	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/cddbcmd.1 ${PREFIX}/man/man1/cddbcmd.1
 	${MV} ${PREFIX}/man/cat1/dp2xmcd.1 ${PREFIX}/man/man1/dp2xmcd.1
diff --git a/audio/xmcd/files/md5 b/audio/xmcd/files/md5
index f84b136b182..c2bbbd390ec 100644
--- a/audio/xmcd/files/md5
+++ b/audio/xmcd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1998/11/05 06:26:08 mycroft Exp $
+$NetBSD: md5,v 1.6 1999/06/28 07:49:06 tron Exp $
 
-MD5 (xmcd-2.4.tar.gz) = 34de843d84620b0e0e593faf0fc0fc2f
+MD5 (xmcd-2.5.tar.gz) = de8d66770be5acc492e0c7c3ff03e0a0
diff --git a/audio/xmcd/patches/patch-ad b/audio/xmcd/patches/patch-ad
new file mode 100644
index 00000000000..f12bfb5f52f
--- /dev/null
+++ b/audio/xmcd/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 1999/06/28 07:49:06 tron Exp $
+
+--- install.sh.orig	Sat Apr 24 03:40:51 1999
++++ install.sh	Sat Jun 26 01:34:32 1999
+@@ -401,7 +401,7 @@
+ #
+ OS_SYS=`(uname -s) 2>/dev/null`
+ OS_VER=`(uname -r) 2>/dev/null`
+-OS_MACH=`(uname -m) 2>/dev/null`
++OS_MACH=$MACHINE_ARCH
+ 
+ if [ -z "$OS_SYS" ]
+ then
diff --git a/audio/xmcd/pkg/PLIST b/audio/xmcd/pkg/PLIST
index b2980606ace..244666ae965 100644
--- a/audio/xmcd/pkg/PLIST
+++ b/audio/xmcd/pkg/PLIST
@@ -1,10 +1,15 @@
-@comment $NetBSD: PLIST,v 1.8 1998/11/05 06:26:08 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.9 1999/06/28 07:49:06 tron Exp $
 bin/cda
 bin/cddbcmd
 bin/dp2xmcd
 bin/wm2xmcd
 bin/xmcd
-lib/X11/app-defaults/XMcd
+lib/X11/xmcd/app-defaults/XMcd
+lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/cda
+lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/cddbcmd
+lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/dp2xmcd
+lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/wm2xmcd
+lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/xmcd
 lib/X11/xmcd/config/.tbl/Acer
 lib/X11/xmcd/config/.tbl/Apple
 lib/X11/xmcd/config/.tbl/Aztech
@@ -32,6 +37,7 @@ lib/X11/xmcd/config/.tbl/Pioneer
 lib/X11/xmcd/config/.tbl/Plextor
 lib/X11/xmcd/config/.tbl/Procom
 lib/X11/xmcd/config/.tbl/Regal
+lib/X11/xmcd/config/.tbl/Ricoh
 lib/X11/xmcd/config/.tbl/SGI
 lib/X11/xmcd/config/.tbl/Samsung
 lib/X11/xmcd/config/.tbl/Sanyo
@@ -48,6 +54,20 @@ lib/X11/xmcd/config/device.cfg
 lib/X11/xmcd/config/sites
 @comment remove the CD drive configuration file(s). Its name is unknown.
 @unexec rm -f %D/lib/X11/xmcd/config/*
+lib/X11/xmcd/discog/bkgnd.gif
+lib/X11/xmcd/discog/xmcdlogo.gif
+lib/X11/xmcd/discog/discog.html
+lib/X11/xmcd/discog/blues/index.html
+lib/X11/xmcd/discog/classical/index.html
+lib/X11/xmcd/discog/country/index.html
+lib/X11/xmcd/discog/data/index.html
+lib/X11/xmcd/discog/folk/index.html
+lib/X11/xmcd/discog/jazz/index.html
+lib/X11/xmcd/discog/misc/index.html
+lib/X11/xmcd/discog/newage/index.html
+lib/X11/xmcd/discog/reggae/index.html
+lib/X11/xmcd/discog/rock/index.html
+lib/X11/xmcd/discog/soundtrack/index.html
 lib/X11/xmcd/docs/ACKS
 lib/X11/xmcd/docs/CDDB
 lib/X11/xmcd/docs/CHANGES
@@ -73,6 +93,16 @@ lib/X11/xmcd/help/DdOk.btn
 lib/X11/xmcd/help/Disc.lbl
 lib/X11/xmcd/help/DiscId.lbl
 lib/X11/xmcd/help/DiscTitl.lbl
+lib/X11/xmcd/help/DlCancel.btn
+lib/X11/xmcd/help/DlChgTo.btn
+lib/X11/xmcd/help/DlDel.btn
+lib/X11/xmcd/help/DlDelAll.btn
+lib/X11/xmcd/help/DlReScan.btn
+lib/X11/xmcd/help/DlShow.btn
+lib/X11/xmcd/help/DpDList.btn
+lib/X11/xmcd/help/DpSubmit.btn
+lib/X11/xmcd/help/DlDisc.lsw
+lib/X11/xmcd/help/DlType.opt
 lib/X11/xmcd/help/DpAddPgm.btn
 lib/X11/xmcd/help/DpCancel.btn
 lib/X11/xmcd/help/DpClrPgm.btn
@@ -83,13 +113,11 @@ lib/X11/xmcd/help/DpLoad.btn
 lib/X11/xmcd/help/DpPgmSeq.txw
 lib/X11/xmcd/help/DpRmDsbl.btn
 lib/X11/xmcd/help/DpSave.btn
-lib/X11/xmcd/help/DpSend.btn
 lib/X11/xmcd/help/DpTExt.btn
 lib/X11/xmcd/help/DpTTitle.txw
 lib/X11/xmcd/help/DpTimSel.btn
 lib/X11/xmcd/help/DpTotTim.lbl
 lib/X11/xmcd/help/DpTrk.lsw
-lib/X11/xmcd/help/DpWeb.btn
 lib/X11/xmcd/help/DsCancel.btn
 lib/X11/xmcd/help/DsDir.lsw
 lib/X11/xmcd/help/DsOk.btn
@@ -154,6 +182,7 @@ lib/X11/xmcd/help/Time.lbl
 lib/X11/xmcd/help/TimeMode.lbl
 lib/X11/xmcd/help/Track.lbl
 lib/X11/xmcd/help/TrkTitle.lbl
+lib/X11/xmcd/help/WWWwarp.btn
 lib/X11/xmcd/help/WwCancel.btn
 lib/X11/xmcd/help/WwGo.btn
 lib/X11/xmcd/help/WwSearch.opt
@@ -162,6 +191,7 @@ lib/X11/xmcd/pixmaps/xmcd.icon
 lib/X11/xmcd/pixmaps/xmcd.xpm
 lib/X11/xmcd/pixmaps/xmcd_a.px
 lib/X11/xmcd/pixmaps/xmcd_b.px
+lib/X11/xmcd/scripts/genidx
 lib/X11/xmcd/scripts/ncsarmt
 lib/X11/xmcd/scripts/ncsawrap
 lib/X11/xmcd/scripts/nswrap
@@ -170,22 +200,36 @@ man/man1/cddbcmd.1
 man/man1/dp2xmcd.1
 man/man1/wm2xmcd.1
 man/man1/xmcd.1
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/soundtrack
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/rock
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/reggae
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/newage
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/jazz
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/folk
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/data
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/country
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/classical
-@exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/blues
+@exec mkdir -p %D/lib/X11/xmcd/cddb/soundtrack
+@exec mkdir -p %D/lib/X11/xmcd/cddb/rock
+@exec mkdir -p %D/lib/X11/xmcd/cddb/reggae
+@exec mkdir -p %D/lib/X11/xmcd/cddb/newage
+@exec mkdir -p %D/lib/X11/xmcd/cddb/jazz
+@exec mkdir -p %D/lib/X11/xmcd/cddb/folk
+@exec mkdir -p %D/lib/X11/xmcd/cddb/data
+@exec mkdir -p %D/lib/X11/xmcd/cddb/country
+@exec mkdir -p %D/lib/X11/xmcd/cddb/classical
+@exec mkdir -p %D/lib/X11/xmcd/cddb/blues
 @dirrm lib/X11/xmcd/scripts
 @dirrm lib/X11/xmcd/pixmaps
 @dirrm lib/X11/xmcd/help
 @dirrm lib/X11/xmcd/docs
+@dirrm lib/X11/xmcd/discog/soundtrack
+@dirrm lib/X11/xmcd/discog/rock
+@dirrm lib/X11/xmcd/discog/reggae
+@dirrm lib/X11/xmcd/discog/newage
+@dirrm lib/X11/xmcd/discog/misc
+@dirrm lib/X11/xmcd/discog/jazz
+@dirrm lib/X11/xmcd/discog/folk
+@dirrm lib/X11/xmcd/discog/data
+@dirrm lib/X11/xmcd/discog/country
+@dirrm lib/X11/xmcd/discog/classical
+@dirrm lib/X11/xmcd/discog/blues
+@dirrm lib/X11/xmcd/discog
 @dirrm lib/X11/xmcd/config/.tbl
 @dirrm lib/X11/xmcd/config
+@dirrm lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}
+@dirrm lib/X11/xmcd/app-defaults
 @comment in case users requested using internet cddb server
 @unexec rm -fr %D/lib/X11/xmcd/cddb
 @dirrm lib/X11/xmcd