From 4fc5b604def8cac4455d5a57f7889b61f50d5a09 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 30 Sep 2008 15:50:24 +0000
Subject: [PATCH] Fix installation with newer GNUstep.

---
 audio/cdplayer/Makefile | 5 +++--
 audio/cdplayer/PLIST    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
index 63b9fdcd1a49..62a9905999b1 100644
--- a/audio/cdplayer/Makefile
+++ b/audio/cdplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2008/09/08 06:01:57 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2008/09/30 15:50:24 joerg Exp $
 #
 
 DISTNAME=	cdplayer-0.4.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 
@@ -15,6 +15,7 @@ USE_LANGUAGES=	objc
 USE_TOOLS+=	gmake
 MAKE_FILE=	GNUmakefile
 MAKE_ENV+=	ADDITIONAL_CPPFLAGS="-Wno-import"
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${PREFIX}/share/GNUstep/Local/
 
 do-configure:
 	${LN} -s ${BUILDLINK_DIR}/${GNUSTEP_SUBDIR}/Local/Library/Frameworks/PrefsModule.framework/Versions/0/Headers ${WRKSRC}/AudioCD/AudioCDPrefs/PrefsModule
diff --git a/audio/cdplayer/PLIST b/audio/cdplayer/PLIST
index 50b47e0a0eca..46ac21eb714c 100644
--- a/audio/cdplayer/PLIST
+++ b/audio/cdplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/09/18 16:46:44 hira Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/09/30 15:50:24 joerg Exp $
 include/CDPlayer/AudioCDProtocol.h
 share/GNUstep/Local/Applications/CDPlayer.app/CDPlayer
 share/GNUstep/Local/Applications/CDPlayer.app/Resources/CDPlayer.desktop
@@ -57,7 +57,6 @@ share/GNUstep/Local/Applications/CDPlayer.app/Resources/play.tiff
 share/GNUstep/Local/Applications/CDPlayer.app/Resources/prev.tiff
 share/GNUstep/Local/Applications/CDPlayer.app/Resources/rwd.tiff
 share/GNUstep/Local/Applications/CDPlayer.app/Resources/stop.tiff
-share/GNUstep/Local/Applications/CDPlayer.app/library_paths.openapp
 share/GNUstep/Local/Applications/CDPlayer.app/stamp.make
 share/GNUstep/Local/Library/Bundles/AudioCD.bundle/AudioCD
 share/GNUstep/Local/Library/Bundles/AudioCD.bundle/Resources/Info-gnustep.plist
@@ -75,6 +74,7 @@ share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/Aud
 share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/Localizable.strings
 share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/Info-gnustep.plist
 share/GNUstep/Local/Library/Preferences/AudioCD.prefs/stamp.make
+share/GNUstep/Local/Tools/CDPlayer
 @dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj/AudioCD.gorm
 @dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/German.lproj
 @dirrm share/GNUstep/Local/Library/Preferences/AudioCD.prefs/Resources/French.lproj/AudioCD.gorm