Make this port non-interactive. The configuration script is

installed under ${PREFIX} for package users anyway.  Also minor
cleanup of PLIST to get rid of warnings, and delete one non-existent
file.

Submitted by:	Brett Taylor <brett@peloton.physics.montana.edu>
                (the non-interactiveness part.)

3 files changed, 56 insertions, 38 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 39e5d7b5b610..3fecf7c4a5ac 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 Februar 1995
 # Whom:			Gennady Sorokopud <gena@NetVision.net.il>
 #
-# $Id: Makefile,v 1.8 1997/09/08 13:20:10 tg Exp $
+# $Id: Makefile,v 1.9 1998/05/27 03:07:06 mph Exp $
 #
 
 DISTNAME=	xmcd-2.3
@@ -14,8 +14,10 @@ MAINTAINER=	deischen@iworks.InterWorks.org
 
 REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
-IS_INTERACTIVE=	yes	# asks a lot of questions
 
 MAN1=		cddbcmd.1 wm2xmcd.1
 
+post-install:
+	@${CAT} ${PKGDIR}/MESSAGE
+
 .include <bsd.port.mk>
diff --git a/audio/xmcd/files/patch-ab b/audio/xmcd/files/patch-ab
index b4646bbae0cc..6d0ce971513f 100644
--- a/audio/xmcd/files/patch-ab
+++ b/audio/xmcd/files/patch-ab
@@ -1,8 +1,8 @@
-*** install.sh.orig	Tue Aug 12 19:12:27 1997
---- install.sh	Sun Sep  7 16:23:43 1997
+*** install.sh.orig	Sat May 23 00:31:42 1998
+--- install.sh	Wed Aug 12 17:24:14 1998
 ***************
-*** 48,53 ****
---- 48,56 ----
+*** 46,51 ****
+--- 46,54 ----
   ERRFILE=/tmp/xmcd.err
   TMPFILE=/tmp/xmcdinst.$$
   
@@ -13,7 +13,7 @@
   # Utility functions
   #
 ***************
-*** 586,592 ****
+*** 594,600 ****
   
   while :
   do
@@ -21,7 +21,7 @@
   	then
   		if [ -d "$ANS" ]
   		then
---- 589,599 ----
+--- 597,607 ----
   
   while :
   do
@@ -34,7 +34,7 @@
   		if [ -d "$ANS" ]
   		then
 ***************
-*** 634,640 ****
+*** 642,648 ****
   
   while :
   do
@@ -42,7 +42,7 @@
   	then
   		if [ -d "$ANS" ]
   		then
---- 641,651 ----
+--- 649,659 ----
   
   while :
   do
@@ -55,7 +55,7 @@
   		if [ -d "$ANS" ]
   		then
 ***************
-*** 657,663 ****
+*** 665,671 ****
   APPDEFAULTSDIR=$LIBDIR/app-defaults
   while :
   do
@@ -63,7 +63,7 @@
   	then
   		if [ -d "$ANS" ]
   		then
---- 668,678 ----
+--- 676,686 ----
   APPDEFAULTSDIR=$LIBDIR/app-defaults
   while :
   do
@@ -76,15 +76,15 @@
   		if [ -d "$ANS" ]
   		then
 ***************
-*** 680,686 ****
+*** 688,694 ****
   XMCDLIB=$LIBDIR/xmcd
   while :
   do
 ! 	if getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
   	then
-  		if [ -d "$ANS" ]
-  		then
---- 695,705 ----
+  		UDIR="$ANS"
+  		if [ -d "$UDIR" ]
+--- 703,713 ----
   XMCDLIB=$LIBDIR/xmcd
   while :
   do
@@ -94,10 +94,10 @@
 ! 		break
 ! 	elif getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
   	then
-  		if [ -d "$ANS" ]
-  		then
+  		UDIR="$ANS"
+  		if [ -d "$UDIR" ]
 ***************
-*** 733,739 ****
+*** 742,748 ****
   $ECHO "\n\nThe on-line manual directory is where the man pages in"
   $ECHO "in the xmcd package will be installed."
   
@@ -105,7 +105,7 @@
   then
   	MANDIR=$ANS
   fi
---- 752,761 ----
+--- 761,770 ----
   $ECHO "\n\nThe on-line manual directory is where the man pages in"
   $ECHO "in the xmcd package will be installed."
   
@@ -117,7 +117,7 @@
   	MANDIR=$ANS
   fi
 ***************
-*** 758,764 ****
+*** 767,773 ****
   		MANSUFFIX=1
   	fi
   
@@ -125,7 +125,7 @@
   	then
   		MANSUFFIX=$ANS
   	fi
---- 780,789 ----
+--- 789,798 ----
   		MANSUFFIX=1
   	fi
   
@@ -136,3 +136,22 @@
   	then
   		MANSUFFIX=$ANS
   	fi
+***************
+*** 939,954 ****
+  fi
+  
+  # Run device-dependent config script
+- if [ -r $XMCDLIB/config/config.sh ]
+- then
+- 	$SHELL $XMCDLIB/config/config.sh
+- 	if [ $? != 0 ]
+- 	then
+- 		logerr -n "$XMCDLIB/config/config.sh failed."
+- 	fi
+- else
+- 	logerr -p "Cannot execute $XMCDLIB/config/config.sh"
+- fi
+  
+  # Demo cddb file
+  if [ -d $XMCDLIB/cddb/misc ]
+--- 964,969 ----
diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index a6c0da226723..31499c8c10ba 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -111,7 +111,6 @@ lib/X11/xmcd/help/WwCancel.btn
 lib/X11/xmcd/help/WwGo.btn
 lib/X11/xmcd/help/WwSearch.opt
 lib/X11/xmcd/help/WwSelect.rbx
-lib/X11/xmcd/cddb/misc/4102560a
 lib/X11/xmcd/pixmaps/xmcd.icon
 lib/X11/xmcd/pixmaps/xmcd_a.px
 lib/X11/xmcd/pixmaps/xmcd_b.px
@@ -157,23 +156,21 @@ lib/X11/xmcd/config/.tbl/Yamaha
 lib/X11/xmcd/config/config.sh
 man/man1/xmcd.1.gz
 man/man1/cda.1.gz
-man/man1/cddbcmd.1.gz
-man/man1/wm2xmcd.1.gz
 @dirrm lib/X11/xmcd/docs
 @dirrm lib/X11/xmcd/pixmaps
 @dirrm lib/X11/xmcd/help
 @dirrm lib/X11/xmcd/config/.tbl
 @dirrm lib/X11/xmcd/config
-@dirrm lib/X11/xmcd/cddb/soundtrack
-@dirrm lib/X11/xmcd/cddb/rock
-@dirrm lib/X11/xmcd/cddb/reggae
-@dirrm lib/X11/xmcd/cddb/newage
-@dirrm lib/X11/xmcd/cddb/misc
-@dirrm lib/X11/xmcd/cddb/jazz
-@dirrm lib/X11/xmcd/cddb/folk
-@dirrm lib/X11/xmcd/cddb/data
-@dirrm lib/X11/xmcd/cddb/country
-@dirrm lib/X11/xmcd/cddb/classical
-@dirrm lib/X11/xmcd/cddb/blues
-@dirrm lib/X11/xmcd/cddb
-@dirrm lib/X11/xmcd
+@unexec rmdir lib/X11/xmcd/cddb/soundtrack 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/rock 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/reggae 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/newage 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/misc 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/jazz 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/folk 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/data 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/country 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/classical 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb/blues 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd/cddb 2>/dev/null || true
+@unexec rmdir lib/X11/xmcd 2>/dev/null || true