Fix DESTDIR leaks into the final package. Bump revision.

4 files changed, 41 insertions, 20 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 9199d179b56..721059a45e2 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2011/12/09 14:36:33 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2012/05/04 16:01:53 joerg Exp $
 
 DISTNAME=	xmcd-3.0.2
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
 
@@ -21,6 +21,11 @@ USE_IMAKE=		yes
 MAKE_ENV+=		BATCH_BINDIR=${DESTDIR}${PREFIX}/bin
 MAKE_ENV+=		BATCH_LIBDIR=${DESTDIR}${PREFIX}/lib/X11
 MAKE_ENV+=		BATCH_MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+MAKE_ENV+=		REAL_BINDIR=${PREFIX}/bin
+MAKE_ENV+=		REAL_LIBDIR=${PREFIX}/lib/X11
+MAKE_ENV+=		REAL_MANDIR=${PREFIX}/${PKGMANDIR}/man1
+MAKE_ENV+=		REAL_XMCDLIB=${PREFIX}/lib/X11/xmcd
+MAKE_ENV+=		REAL_DISCOGDIR=${PREFIX}/lib/X11/xmcd/discog
 MAKE_ENV+=		BATCH_MANSUFFIX=1
 MAKE_ENV+=		SHELL=${SH:Q}
 
diff --git a/audio/xmcd/PLIST b/audio/xmcd/PLIST
index 052c2e03d15..f72b66509b7 100644
--- a/audio/xmcd/PLIST
+++ b/audio/xmcd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:10:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/05/04 16:01:53 joerg Exp $
 bin/cda
 bin/xmcd
 bin/xmcd_start
@@ -52,21 +52,9 @@ lib/X11/xmcd/config/common.cfg.dist
 lib/X11/xmcd/config/config.sh
 lib/X11/xmcd/config/device.cfg.dist
 lib/X11/xmcd/config/wwwwarp.cfg.dist
-lib/X11/xmcd/discog/Blues/General_Blues/index.html
-lib/X11/xmcd/discog/Classical/General_Classical/index.html
-lib/X11/xmcd/discog/Country/General_Country/index.html
-lib/X11/xmcd/discog/Data/General_Data/index.html
-lib/X11/xmcd/discog/Folk/General_Folk/index.html
-lib/X11/xmcd/discog/Jazz/General_Jazz/index.html
-lib/X11/xmcd/discog/Newage/General_Newage/index.html
-lib/X11/xmcd/discog/Rock/General_Rock/index.html
-lib/X11/xmcd/discog/Soundtrack/General_Soundtrack/index.html
-lib/X11/xmcd/discog/Unclassifiable/General_Unclassifiable/index.html
-lib/X11/xmcd/discog/World/Reggae/index.html
 lib/X11/xmcd/discog/bkgnd.gif
 lib/X11/xmcd/discog/cda.html
 lib/X11/xmcd/discog/discog.html
-lib/X11/xmcd/discog/index.html
 lib/X11/xmcd/discog/xmcd.html
 lib/X11/xmcd/discog/xmcdlogo.gif
 lib/X11/xmcd/docs/ACKS
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index 720c9af0b65..0048d5b2c75 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2006/03/01 17:39:17 tron Exp $
+$NetBSD: distinfo,v 1.16 2012/05/04 16:01:53 joerg Exp $
 
 SHA1 (xmcd-3.0.2.tar.gz) = 10258f299f917c94780d3e6d9feb57535d4603b5
 RMD160 (xmcd-3.0.2.tar.gz) = 9fbee32681e8df4623a06b49ee64ac328478623b
@@ -9,7 +9,7 @@ Size (xmcd-3.0.2-proxyauth-patch) = 2922 bytes
 SHA1 (patch-aa) = 0a446d2943dd9ac9d66938674daa16d1d629e470
 SHA1 (patch-ab) = 2721877c17a7e810a4039be7056d015b87d94273
 SHA1 (patch-ac) = 19440a72fda657bf73811c20aabab5c955369516
-SHA1 (patch-ad) = 0a65563d8b50a07a4ae1f5ca6c722f91d6cefc93
+SHA1 (patch-ad) = afddba8e5a6070a54131ce2530479d4add9e19a4
 SHA1 (patch-ae) = 3de0e9fd004fcb6012f033739ff1b66bd059d655
 SHA1 (patch-af) = e8bc1a3b791f6df15f12f074712a55423fa3fadf
 SHA1 (patch-ag) = cdca79fa131a6b2e74c7cea377167f8d0290c162
diff --git a/audio/xmcd/patches/patch-ad b/audio/xmcd/patches/patch-ad
index f10f6227300..5f0b54cc108 100644
--- a/audio/xmcd/patches/patch-ad
+++ b/audio/xmcd/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.9 2006/02/22 00:06:21 rillig Exp $
+$NetBSD: patch-ad,v 1.10 2012/05/04 16:01:53 joerg Exp $
 
---- install.sh.orig	2001-08-08 02:14:54.000000000 +0200
-+++ install.sh	2006-02-22 00:59:18.000000000 +0100
+--- install.sh.orig	2001-08-08 00:14:54.000000000 +0000
++++ install.sh
 @@ -57,7 +57,7 @@ XBINOWNER=root
  XBINGROUP=bin
  ERRFILE=/tmp/xmcd.err
@@ -29,6 +29,21 @@ $NetBSD: patch-ad,v 1.9 2006/02/22 00:06:21 rillig Exp $
  	then
  		$ECHO "\nWARNING: Without super-user privilege, some files may"
  		$ECHO "not be properly installed, or they may be installed"
+@@ -1159,10 +1159,10 @@ fi
+ # Install files
+ 
+ SHELL_S=`echo $SHELL | sed 's/\//\\\\\//g'`
+-BINDIR_S=`echo $BINDIR | sed 's/\//\\\\\//g'`
+-LIBDIR_S=`echo $LIBDIR | sed 's/\//\\\\\//g'`
+-XMCDLIB_S=`echo $XMCDLIB | sed 's/\//\\\\\//g'`
+-DISCOGDIR_S=`echo $DISCOGDIR | sed 's/\//\\\\\//g'`
++BINDIR_S=`echo $REAL_BINDIR | sed 's/\//\\\\\//g'`
++LIBDIR_S=`echo $REAL_LIBDIR | sed 's/\//\\\\\//g'`
++XMCDLIB_S=`echo $REAL_XMCDLIB | sed 's/\//\\\\\//g'`
++DISCOGDIR_S=`echo $REAL_DISCOGDIR | sed 's/\//\\\\\//g'`
+ XMCDURL_S=`echo $XMCD_URL | sed 's/\//\\\\\//g'`
+ 
+ $ECHO "\nInstalling xmcd files..."
 @@ -1226,20 +1226,11 @@ do
  done
  
@@ -53,3 +68,16 @@ $NetBSD: patch-ad,v 1.9 2006/02/22 00:06:21 rillig Exp $
  	$FILEPERM $OWNER $GROUP
  
  rm -f $XMCDLIB/config/.tbl/*
+@@ -1595,12 +1586,6 @@ then
+ 	done
+ fi
+ 
+-# Generate local discography index files
+-if [ -x $XMCDLIB/scripts/genidx ]
+-then
+-	$XMCDLIB/scripts/genidx
+-fi
+-
+ if [ -z "$BATCH" ]
+ then
+ 	# Run device-dependent config script