De-interactive. Drop motf from PLIST, add a MESSAGE to tell the user

to create it instead. Bump revision.

6 files changed, 68 insertions, 13 deletions

diff --git a/audio/cddbd/MESSAGE b/audio/cddbd/MESSAGE
new file mode 100644
index 00000000000..09476a2502d
--- /dev/null
+++ b/audio/cddbd/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/08/30 14:12:38 joerg Exp $
+
+Don't forget to provide a message of the day in
+${PREFIX}/share/xmcd/cddbd/motd!
+
+===========================================================================
diff --git a/audio/cddbd/Makefile b/audio/cddbd/Makefile
index 1a4083ef305..0f170aa2616 100644
--- a/audio/cddbd/Makefile
+++ b/audio/cddbd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 20:46:06 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/08/30 14:12:38 joerg Exp $
 #
 
 DISTNAME=	cddbd-1.3.1
 PKGNAME=	cddbd-1.3.1p1
+PKGREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 
@@ -13,8 +14,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freedb.org/en/download__server_software.4.html
 COMMENT=	Internet CD Database Server
 
-INTERACTIVE_STAGE=	configure install
-NO_PACKAGE=	too interactive
 MAKE_FILE=	makefile
 
 do-configure:
diff --git a/audio/cddbd/PLIST b/audio/cddbd/PLIST
index dcfb1b50be0..f83cb3afbbd 100644
--- a/audio/cddbd/PLIST
+++ b/audio/cddbd/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/08/30 14:12:38 joerg Exp $
 bin/cddbd
 share/xmcd/cddbd/access
-share/xmcd/cddbd/motd
 share/xmcd/cddbd/sites
 @dirrm share/xmcd/cddbd
 @dirrm share/xmcd
diff --git a/audio/cddbd/distinfo b/audio/cddbd/distinfo
index 1c4c21a2c19..cb29ea0217f 100644
--- a/audio/cddbd/distinfo
+++ b/audio/cddbd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/05/23 08:42:39 rillig Exp $
+$NetBSD: distinfo,v 1.5 2007/08/30 14:12:38 joerg Exp $
 
 SHA1 (cddbd-1.3.1.tar.gz) = 2e8ab932750e54e6058edbcc6107835c9be7840c
 RMD160 (cddbd-1.3.1.tar.gz) = a2b666407db9d6415f430a9df8ef4a96fa24572c
@@ -6,6 +6,7 @@ Size (cddbd-1.3.1.tar.gz) = 93959 bytes
 SHA1 (cddbd-1.3.1.patch1.gz) = 08a96dac6c95cf6c289922215be6e6c99cd9f49e
 RMD160 (cddbd-1.3.1.patch1.gz) = 6e0343ded77336cec190682581ad8b9ee78f46d8
 Size (cddbd-1.3.1.patch1.gz) = 416 bytes
-SHA1 (patch-aa) = 67b421ce9ee431dcfdd9152dad281626c64685de
+SHA1 (patch-aa) = d7bd76f66e0a4d2cf08ced19b2c4ed684efa7064
 SHA1 (patch-ab) = 6a84d5d1c9c811dc6d5faf8e806b065bc79e0959
 SHA1 (patch-ac) = 3701b82b47444eb8196069580e46f31d1d800160
+SHA1 (patch-ad) = afca1d372bf7e7bf4fc47b9100a914d6f16e431b
diff --git a/audio/cddbd/patches/patch-aa b/audio/cddbd/patches/patch-aa
index ccee8747291..df7d1f35be1 100644
--- a/audio/cddbd/patches/patch-aa
+++ b/audio/cddbd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:55 agc Exp $
+$NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
 
---- install.sh.orig	Sat Dec 21 21:49:54 1996
-+++ install.sh	Fri Apr 18 15:12:25 1997
-@@ -37,11 +37,25 @@
+--- install.sh.orig	1996-12-22 03:49:54.000000000 +0000
++++ install.sh
+@@ -37,11 +37,25 @@ id=`id`
  # Set up access defaults.
  DIRPERM=755
  FILEPERM=644
@@ -30,7 +30,25 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:55 agc Exp $
  
  USERS=100
  LINES=1024
-@@ -202,28 +216,12 @@
+@@ -94,7 +108,7 @@ logerr()
+ getstr()
+ {
+ 	$ECHO "$* \c"
+-	read ANS
++	ANS=
+ 	if [ -n "$ANS" ]
+ 	then
+ 		return 0
+@@ -113,7 +127,7 @@ getyn()
+ 	while :
+ 	do
+ 		$ECHO "$*? [${YNDEF}] \c"
+-		read ANS
++		ANS=
+ 		if [ -n "$ANS" ]
+ 		then
+ 			case $ANS in
+@@ -202,28 +216,12 @@ instfile()
  			rm -f $2
  		fi
  
@@ -60,7 +78,16 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:55 agc Exp $
  		return 0
  	else
  		$ECHO "\t$2 NOT installed"
-@@ -624,7 +622,7 @@
+@@ -588,7 +586,7 @@ fi
+ 
+ $ECHO "permissions:  default connect nopost noupdate noget" >> access
+ 
+-YNDEF=y
++YNDEF=n
+ if getyn "Do you want to create the motd file now"
+ then
+ 	if [ "$EDITOR" = "" ]
+@@ -624,7 +622,7 @@ makedir $WORKDIR $DPERM $OWNID $GRPID
  $ECHO "\nInstalling cddbd files..."
  
  # Binaries
@@ -69,3 +96,12 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:55 agc Exp $
  
  # Configuration files
  instfile access `cat .accessfile`/access $FPERM $OWNID $GRPID
+@@ -635,7 +633,7 @@ then
+ 	instfile motd $MOTD $FPERM $OWNID $GRPID
+ fi
+ 
+-YNDEF=y
++YNDEF=n
+ if getyn "\nDo you want to create the fuzzy matching hash file now"
+ then
+ 	$ECHO "\nPlease wait while the hash file is created."
diff --git a/audio/cddbd/patches/patch-ad b/audio/cddbd/patches/patch-ad
new file mode 100644
index 00000000000..a3ff82c99bb
--- /dev/null
+++ b/audio/cddbd/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/08/30 14:12:38 joerg Exp $
+
+--- config.sh.orig	2007-08-30 13:38:11.000000000 +0000
++++ config.sh
+@@ -69,7 +69,7 @@ logerr()
+ getstr()
+ {
+ 	$ECHO "$* \c"
+-	read ANS
++	ANS=
+ 	if [ -n "$ANS" ]
+ 	then
+ 		return 0