Update "xmcd" to 2.3 patchlevel 0 on Hubert's request.

5 files changed, 73 insertions, 25 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index fa7de212d53..98d46291e3f 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:15 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/06/02 21:50:06 tron Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/09/08 13:20:10 tg Exp 
 #
 
-DISTNAME=	xmcd-2.2
-PKGNAME=	xmcd-2.2pl1
+DISTNAME=	xmcd-2.3
 CATEGORIES=	audio
-MASTER_SITES=	http://mercury.hypersurf.com/~amb/download/xmcd-2.2/src/
+MASTER_SITES=	http://mercury.hypersurf.com/~amb/download/xmcd/src/
 
 MAINTAINER=	hubertf@netbsd.org
 
@@ -13,16 +12,17 @@ REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
 IS_INTERACTIVE=	yes	# asks a lot of questions
 
-CAT1=		xmcd.0 cda.0 wm2xmcd.0
-MAN1=		xmcd.1 cda.1 wm2xmcd.1
+MAN1=		xmcd.1 cda.1 cddbcmd.1 wm2xmcd.1
+CAT1=		xmcd.0 cda.0 cddbcmd.0 wm2xmcd.0
 
 post-install:
 	@strip ${PREFIX}/bin/xmcd
 	@strip ${PREFIX}/bin/cda
+	@strip ${PREFIX}/bin/cddbcmd
 	@strip ${PREFIX}/bin/wm2xmcd
-	${CP} ${WRKSRC}/README ${PREFIX}/lib/X11/xmcd
 	${MV} ${PREFIX}/man/cat1/xmcd.1 ${PREFIX}/man/man1/xmcd.1
 	${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/wm2xmcd.1 ${PREFIX}/man/man1/wm2xmcd.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmcd/files/md5 b/audio/xmcd/files/md5
index 0bde8c5fb95..eff9b8af8de 100644
--- a/audio/xmcd/files/md5
+++ b/audio/xmcd/files/md5
@@ -1 +1 @@
-MD5 (xmcd-2.2.tar.gz) = a47e379e7b93c597b9bf729d79c13ded
+MD5 (xmcd-2.3.tar.gz) = cd36c43c388f001767495e7edf88182f
diff --git a/audio/xmcd/patches/patch-aa b/audio/xmcd/patches/patch-aa
index ee4bcf547f6..0b74767bab2 100644
--- a/audio/xmcd/patches/patch-aa
+++ b/audio/xmcd/patches/patch-aa
@@ -73,16 +73,3 @@
   
   /*
    * C Source files
-*** ./dbconv_d/Imakefile.orig	Thu Apr  4 23:33:09 1996
---- ./dbconv_d/Imakefile	Thu Apr  4 23:33:53 1996
-***************
-*** 24,29 ****
---- 24,31 ----
-   *
-   */
-  
-+ MANSUFFIX = 1
-+ 
-  
-  /*
-   * Add local include path
diff --git a/audio/xmcd/patches/patch-ac b/audio/xmcd/patches/patch-ac
new file mode 100644
index 00000000000..9761aca265f
--- /dev/null
+++ b/audio/xmcd/patches/patch-ac
@@ -0,0 +1,27 @@
+--- util_d/Imakefile.orig	Sat May 23 08:31:58 1998
++++ util_d/Imakefile	Tue Jun  2 23:19:11 1998
+@@ -34,8 +34,12 @@
+ /*
+  * Source files
+  */
+-SRCS=	cddbcmd.c wm2xmcd.c
+ 
++SRCS1=	cddbcmd.c
++OBJS1=	cddbcmd.o
++
++SRCS2=	wm2xmcd.c
++OBJS2=	wm2xmcd.o
+ 
+ /*
+  * No X11 libraries needed for utilities in this directory
+@@ -47,8 +51,8 @@
+  * Build rule
+  */
+ AllTarget(cddbcmd wm2xmcd)
+-NormalProgramTarget(cddbcmd,cddbcmd.o,,,)
+-NormalProgramTarget(wm2xmcd,wm2xmcd.o,,,)
++ComplexProgramTarget_1(cddbcmd,,)
++ComplexProgramTarget_2(wm2xmcd,,)
+ DependTarget()
+ LintTarget()
+ 
diff --git a/audio/xmcd/pkg/PLIST b/audio/xmcd/pkg/PLIST
index c6e65b1b787..6380fe976d4 100644
--- a/audio/xmcd/pkg/PLIST
+++ b/audio/xmcd/pkg/PLIST
@@ -1,15 +1,27 @@
-@comment $NetBSD: PLIST,v 1.6 1998/02/15 19:05:16 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/06/02 21:50:06 tron Exp $
 bin/xmcd
 bin/cda
+bin/cddbcmd
 bin/wm2xmcd
 lib/X11/app-defaults/XMcd
-lib/X11/xmcd/README
+lib/X11/xmcd/help/DpWeb.btn
+lib/X11/xmcd/help/DtDir.btn
+lib/X11/xmcd/help/HpAbout.btn
+lib/X11/xmcd/help/HpCancel.btn
+lib/X11/xmcd/help/Mode.btn
+lib/X11/xmcd/help/Quit.btn
+lib/X11/xmcd/help/WwCancel.btn
+lib/X11/xmcd/help/WwGo.btn
+lib/X11/xmcd/help/DpTotTim.lbl
+lib/X11/xmcd/help/HpText.txw
+lib/X11/xmcd/help/WwSelect.rbx
+lib/X11/xmcd/help/HpTopic.opt
+lib/X11/xmcd/help/WwSearch.opt
 lib/X11/xmcd/help/Ab.btn
 lib/X11/xmcd/help/DbProg.btn
 lib/X11/xmcd/help/DdCancel.btn
 lib/X11/xmcd/help/DdClr.btn
 lib/X11/xmcd/help/DdOk.btn
-lib/X11/xmcd/help/DpAbout.btn
 lib/X11/xmcd/help/DpAddPgm.btn
 lib/X11/xmcd/help/DpCancel.btn
 lib/X11/xmcd/help/DpClrPgm.btn
@@ -45,7 +57,6 @@ lib/X11/xmcd/help/OpReset.btn
 lib/X11/xmcd/help/OpSave.btn
 lib/X11/xmcd/help/Options.btn
 lib/X11/xmcd/help/PlayPaus.btn
-lib/X11/xmcd/help/Power.btn
 lib/X11/xmcd/help/PrevDisc.btn
 lib/X11/xmcd/help/PrevIdx.btn
 lib/X11/xmcd/help/PrevTrk.btn
@@ -91,6 +102,21 @@ lib/X11/xmcd/pixmaps/xmcd.icon
 lib/X11/xmcd/pixmaps/xmcd_a.px
 lib/X11/xmcd/pixmaps/xmcd_b.px
 lib/X11/xmcd/pixmaps/xmcd.xpm
+lib/X11/xmcd/docs/ACKS
+lib/X11/xmcd/docs/CDDB
+lib/X11/xmcd/docs/CHANGES
+lib/X11/xmcd/docs/COPYING
+lib/X11/xmcd/docs/COPYING.LIB
+lib/X11/xmcd/docs/DRIVES
+lib/X11/xmcd/docs/FAQ
+lib/X11/xmcd/docs/FEATURES
+lib/X11/xmcd/docs/INSTALL
+lib/X11/xmcd/docs/INSTALL.VMS
+lib/X11/xmcd/docs/PLATFORM
+lib/X11/xmcd/docs/PORTING
+lib/X11/xmcd/docs/README
+lib/X11/xmcd/docs/RELNOTES
+lib/X11/xmcd/docs/WEB
 lib/X11/xmcd/config/common.cfg
 lib/X11/xmcd/config/device.cfg
 lib/X11/xmcd/config/.tbl/Acer
@@ -124,17 +150,23 @@ lib/X11/xmcd/config/.tbl/Sanyo
 lib/X11/xmcd/config/.tbl/Sony
 lib/X11/xmcd/config/.tbl/Stratus
 lib/X11/xmcd/config/.tbl/Sun
+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/config.sh
+lib/X11/xmcd/scripts/ncsarmt
+lib/X11/xmcd/scripts/ncsawrap
+lib/X11/xmcd/scripts/nswrap
 @comment remove the CD drive configuration file(s). Its name is unknown.
 @unexec rm -f %D/lib/X11/xmcd/config/*
 man/cat1/xmcd.0
 man/cat1/cda.0
+man/cat1/cddbcmd.0
 man/cat1/wm2xmcd.0
 man/man1/xmcd.1
 man/man1/cda.1
+man/man1/cddbcmd.1
 man/man1/wm2xmcd.1
 @exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/soundtrack
 @exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/rock
@@ -146,8 +178,10 @@ man/man1/wm2xmcd.1
 @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
+@dirrm lib/X11/xmcd/scripts
 @dirrm lib/X11/xmcd/pixmaps
 @dirrm lib/X11/xmcd/help
+@dirrm lib/X11/xmcd/docs
 @dirrm lib/X11/xmcd/config/.tbl
 @dirrm lib/X11/xmcd/config
 @comment in case users requested using internet cddb server