From 93486c39fb73405399381f755f5651293e54f4e0 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 3 Feb 2010 14:43:57 +0000
Subject: Do not bail out if not installing as root.

---
 audio/cddbd/distinfo         |  4 ++--
 audio/cddbd/patches/patch-aa | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

(limited to 'audio')

diff --git a/audio/cddbd/distinfo b/audio/cddbd/distinfo
index 1fb72947cd0..e924c09aa4e 100644
--- a/audio/cddbd/distinfo
+++ b/audio/cddbd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2010/02/01 01:38:42 joerg Exp $
+$NetBSD: distinfo,v 1.7 2010/02/03 14:43:57 joerg Exp $
 
 SHA1 (cddbd-1.3.1.tar.gz) = 2e8ab932750e54e6058edbcc6107835c9be7840c
 RMD160 (cddbd-1.3.1.tar.gz) = a2b666407db9d6415f430a9df8ef4a96fa24572c
@@ -6,7 +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) = 9ae4099537d81c792c6183837d25a7015edf5873
+SHA1 (patch-aa) = 0bff9d9ab0e2dae540be423325840ec382e520a3
 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 4fa94d894dc..d75364dfd8b 100644
--- a/audio/cddbd/patches/patch-aa
+++ b/audio/cddbd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2010/02/01 01:38:42 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2010/02/03 14:43:57 joerg Exp $
 
 --- install.sh.orig	1996-12-22 03:49:54.000000000 +0000
 +++ install.sh
@@ -78,7 +78,31 @@ $NetBSD: patch-aa,v 1.4 2010/02/01 01:38:42 joerg Exp $
  		return 0
  	else
  		$ECHO "\t$2 NOT installed"
-@@ -330,7 +328,7 @@ done
+@@ -271,23 +269,6 @@ then
+ 	doexit 1
+ fi
+ 
+-# Check privilege
+-if [ "$OWNER" != "root" ]
+-then
+-	$ECHO "You are not the super-user. You should be sure to specify"
+-	$ECHO "install directories that you have the proper write permissions"
+-	$ECHO "for.\n"
+-
+-	YNDEF=n
+-	getyn "Proceed anyway"
+-	if [ $? -ne 0 ]
+-	then
+-		logerr -p "Not super user: installation aborted by user"
+-		doexit 1
+-	fi
+-fi
+-
+-
+ $ECHO "\nInstalling \"cddbd\" CDDB Protocol Server $CDDBD_VER by Steve Scherf"
+ 
+ 
+@@ -330,7 +311,7 @@ done
  
  # Find other directories
  
@@ -87,7 +111,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/01 01:38:42 joerg Exp $
  WORKDIR=${BASEDIR}
  CDDBDIR=`dirname ${BASEDIR}`
  
-@@ -588,7 +586,7 @@ fi
+@@ -588,7 +569,7 @@ fi
  
  $ECHO "permissions:  default connect nopost noupdate noget" >> access
  
@@ -96,7 +120,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/01 01:38:42 joerg Exp $
  if getyn "Do you want to create the motd file now"
  then
  	if [ "$EDITOR" = "" ]
-@@ -624,10 +622,10 @@ makedir $WORKDIR $DPERM $OWNID $GRPID
+@@ -624,10 +605,10 @@ makedir $WORKDIR $DPERM $OWNID $GRPID
  $ECHO "\nInstalling cddbd files..."
  
  # Binaries
@@ -109,7 +133,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/01 01:38:42 joerg Exp $
  instfile sites $SITE $FPERM $OWNID $GRPID
  
  if [ -f motd ]
-@@ -635,7 +633,7 @@ then
+@@ -635,7 +616,7 @@ then
  	instfile motd $MOTD $FPERM $OWNID $GRPID
  fi
  
-- 
cgit v1.2.3