Update for V2.2 pl1

4 files changed, 35 insertions, 34 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index a096f2f706f..cbcb5b4974e 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	xmcd
-# Version required:	2.2
-# Date created:		16 Februar 1995
-# Whom:			Gennady Sorokopud <gena@NetVision.net.il>
+# Version required:	2.2 (pl1)
+# Date created:		21 December 1997
+# Whom:			hubertf@netbsd.org
 #
-# $NetBSD: Makefile,v 1.2 1997/10/29 01:18:30 augustss Exp $
+# $NetBSD: Makefile,v 1.3 1997/12/21 02:11:55 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/09/08 13:20:10 tg Exp 
 #
 
 DISTNAME=	xmcd-2.2
+PKGNAME=	xmcd-2.2pl1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications/xmcd
+MASTER_SITES=	ftp://ftp.netcom.com/pub/tk/tkan/xmcd-2.2/src/
 
-MAINTAINER=	deischen@iworks.InterWorks.org
+MAINTAINER=	hubertf@netbsd.org
 
 REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
@@ -20,5 +20,8 @@ IS_INTERACTIVE=	yes	# asks a lot of questions
 
 post-install:
 	${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/wm2xmcd.1 ${PREFIX}/man/man1/wm2xmcd.1
 
 .include <bsd.port.mk>
diff --git a/audio/xmcd/files/md5 b/audio/xmcd/files/md5
index 4562ae2314c..0bde8c5fb95 100644
--- a/audio/xmcd/files/md5
+++ b/audio/xmcd/files/md5
@@ -1 +1 @@
-MD5 (xmcd-2.2.tar.gz) = aec0ee581c93247d6282ca70a3f2ca08
+MD5 (xmcd-2.2.tar.gz) = a47e379e7b93c597b9bf729d79c13ded
diff --git a/audio/xmcd/patches/patch-ad b/audio/xmcd/patches/patch-ad
index 168b0b25a22..d32270fa563 100644
--- a/audio/xmcd/patches/patch-ad
+++ b/audio/xmcd/patches/patch-ad
@@ -1,13 +1,14 @@
---- libdi_d/config.sh.orig	Wed Nov 26 12:23:57 1997
-+++ libdi_d/config.sh	Wed Nov 26 12:24:03 1997
-@@ -382,10 +382,11 @@
+--- libdi_d/config.sh.orig	Mon Dec  1 00:36:16 1997
++++ libdi_d/config.sh	Sun Dec 21 00:57:00 1997
+@@ -382,11 +382,11 @@
  ask_nonscsi_config()
  {
  	$ECHO "\n  Non-SCSI drives are currently supported only on the"
--	$ECHO "  Digital UNIX, IBM AIX, Linux, FreeBSD, SCO Open Server,"
--	$ECHO "  QNX and Sun Solaris/x86 platforms.  You must have the"
--	$ECHO "  appropriate CD-ROM driver configured in your kernel.  QNX"
--	$ECHO "  users must use the QNX ioctl method, even for SCSI drives."
+-	$ECHO "  Digital UNIX, FreeBSD, IBM AIX, Linux, NetBSD, OpenBSD, QNX,"
+-	$ECHO "  SCO Open Server and Sun Solaris/x86 platforms.  You must"
+-	$ECHO "  have the appropriate CD-ROM driver configured in your kernel."
+-	$ECHO "  QNX users must use the QNX ioctl method, even for SCSI"
+-	$ECHO "  drives."
 +	$ECHO "  Digital UNIX, IBM AIX, Linux, FreeBSD, NetBSD,"
 +	$ECHO "  SCO Open Server, QNX and Sun Solaris/x86 platforms."
 +	$ECHO "  You must have the appropriate CD-ROM driver configured"
@@ -16,21 +17,3 @@
  
  	YNDEF=y
  	getyn "\n  Do you want to continue"
-@@ -399,7 +400,7 @@
- 	#
- 	$ECHO "\n  Please select a Device Interface Method:\n"
- 	$ECHO "  1.\tSunOS/Solaris/Linux/QNX ioctl method"
--	$ECHO "  2.\tFreeBSD ioctl method"
-+	$ECHO "  2.\tFreeBSD/NetBSD ioctl method"
- 	$ECHO "  3.\tIBM AIX IDE ioctl method"
- 	$ECHO "  4.\tSCO Open Server ATAPI BTLD"
- 	$ECHO "  5.\tDigital UNIX ATAPI"
-@@ -482,7 +483,7 @@
- 		CURPOSFMT=False
- 		PLAYNOTUR=False
- 		;;
--	2)	# FreeBSD ioctl method
-+	2)	# FreeBSD/NetBSD ioctl method
- 		METHOD=2
- 		VENDOR=0
- 		VOLBASE=0
diff --git a/audio/xmcd/pkg/PLIST b/audio/xmcd/pkg/PLIST
index 51ede14de7b..29234fbcaec 100644
--- a/audio/xmcd/pkg/PLIST
+++ b/audio/xmcd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1997/11/27 11:09:24 augustss Exp $
+@comment $NetBSD: PLIST,v 1.5 1997/12/21 02:11:58 hubertf Exp $
 bin/xmcd
 bin/cda
 bin/wm2xmcd
@@ -133,6 +133,21 @@ lib/X11/xmcd/config/config.sh
 man/cat1/xmcd.0
 man/cat1/cda.0
 man/cat1/wm2xmcd.0
+man/man1/xmcd.1
+man/man1/cda.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
+@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
+@comment in case users requested using internet cddb server
+@unexec rm -fr %D/lib/X11/xmcd/cddbd
 @dirrm lib/X11/xmcd/pixmaps
 @dirrm lib/X11/xmcd/help
 @dirrm lib/X11/xmcd/config/.tbl