From 2ede1ea38be46fd12e2035f15fada00746fb7e5d Mon Sep 17 00:00:00 2001
From: adamw <adamw@FreeBSD.org>
Date: Mon, 7 Mar 2005 17:15:06 +0000
Subject: Fix pkg-plist. Added the gnomeprefix USE_GNOME component so that
 $PREFIX/share/gnome/help isn't an error, and patched the sources to recognize
 $PREFIX/share/doc instead of $PREFIX/doc.

Removed the BROKEN line relating to pkg-plist bidness as well.
---
 audio/cantus_3/Makefile             |  4 +---
 audio/cantus_3/files/patch-build.sh | 10 ++++++----
 audio/cantus_3/pkg-plist            |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'audio/cantus_3')

diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index 801bb4df5e9..eaffe45521f 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -21,10 +21,8 @@ LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2 \
 		ogg.5:${PORTSDIR}/audio/libogg \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
-BROKEN=		Incomplete pkg-plist
-
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libglade2
+USE_GNOME=	gnomehack gnomeprefix libglade2
 USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/cantus_3/files/patch-build.sh b/audio/cantus_3/files/patch-build.sh
index dbdee9110bd..a4422fd98d5 100644
--- a/audio/cantus_3/files/patch-build.sh
+++ b/audio/cantus_3/files/patch-build.sh
@@ -1,14 +1,16 @@
---- build.sh.orig	Thu Apr 22 04:26:52 2004
-+++ build.sh	Tue May 18 14:57:02 2004
-@@ -165,11 +165,7 @@
+--- build.sh.orig	Wed Apr 21 20:26:52 2004
++++ build.sh	Mon Mar  7 12:11:44 2005
+@@ -164,12 +164,8 @@
+ INST_LIBDIR="$INST_PREFIX/lib/$EXECUTABLE"
  INST_LOCALEDIR="$INST_PREFIX/share/locale"
  INST_PIXMAPDIR="$INST_PREFIX/lib/$EXECUTABLE"
- INST_DOCDIR="$INST_PREFIX/doc/$EXECUTABLE"
+-INST_DOCDIR="$INST_PREFIX/doc/$EXECUTABLE"
 -if [ -d "/usr/share/gnome/help/" ]; then
 -  INST_GNOMEDOCDIR="/usr/share/gnome/help/$EXECUTABLE/C"
 -else
 -  INST_GNOMEDOCDIR="/usr/local/share/gnome/help/$EXECUTABLE/C"
 -fi
++INST_DOCDIR="$INST_PREFIX/share/doc/$EXECUTABLE"
 +INST_GNOMEDOCDIR="$INST_PREFIX/share/gnome/help/$EXECUTABLE/C"
  
  # Preprocessor macros:
diff --git a/audio/cantus_3/pkg-plist b/audio/cantus_3/pkg-plist
index 8e5d5a09125..4e47af908f5 100644
--- a/audio/cantus_3/pkg-plist
+++ b/audio/cantus_3/pkg-plist
@@ -16,7 +16,8 @@ share/locale/de/LC_MESSAGES/cantus_3.mo
 share/locale/es/LC_MESSAGES/cantus_3.mo
 share/locale/fr/LC_MESSAGES/cantus_3.mo
 share/locale/pl/LC_MESSAGES/cantus_3.mo
-@dirrm lib/cantus_3/
 @dirrm share/gnome/help/cantus_3/C/figures
 @dirrm share/gnome/help/cantus_3/C
 @dirrm share/gnome/help/cantus_3/
+@dirrm share/doc/cantus_3
+@dirrm lib/cantus_3/
-- 
cgit