2 files changed, 57 insertions, 62 deletions

diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index c4a89c9ff8f8..afd7b236f0b8 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -3,10 +3,11 @@
 # Whom:					Vincent Tantardini <vinc@freebsd-fr.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gspeakers/Makefile,v 1.6 2007/05/30 17:08:11 mezz Exp $
 
 PORTNAME=	gspeakers
 PORTVERSION=	0.11
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,18 +38,12 @@ post-extract:
 	@${FIND} ${WRKSRC} -type l -delete
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/gnome/apps/|/apps/|g' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(datadir)/pixmaps|$$(pkgdatadir)/pixmaps|g' \
 		${WRKSRC}/pixmaps/Makefile.in
 	@${REINPLACE_CMD} -e 's|-Wall -O0|@CXXFLAGS@|g' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(datadir)/xml|$$(pkgdatadir)/xml|g' \
 		${WRKSRC}/xml/Makefile.in
-	@${FIND} ${WRKSRC} \( -name "*.cc" -or -name "*.xml" \) | \
-		${XARGS} ${REINPLACE_CMD} -e \
-		's|/share/pixmaps/|/share/gnome/gspeakers/pixmaps/|g ; \
-		 s|/share/xml/|/share/gnome/gspeakers/xml/|g'
 
 pre-configure:
 	@${CP} ${AUTOMAKE_DIR}/depcomp ${WRKSRC}
diff --git a/audio/gspeakers/pkg-plist b/audio/gspeakers/pkg-plist
index 9cf972bac714..03304c9ccc74 100644
--- a/audio/gspeakers/pkg-plist
+++ b/audio/gspeakers/pkg-plist
@@ -1,57 +1,57 @@
 bin/gspeakers
 share/gnome/apps/Utilities/gspeakers.desktop
-share/gnome/gspeakers/pixmaps/append_enclosure_24.png
-share/gnome/gspeakers/pixmaps/append_plot_enclosure_24.png
-share/gnome/gspeakers/pixmaps/delete_crossover_16.png
-share/gnome/gspeakers/pixmaps/delete_crossover_24.png
-share/gnome/gspeakers/pixmaps/delete_driver_16.png
-share/gnome/gspeakers/pixmaps/delete_driver_24.png
-share/gnome/gspeakers/pixmaps/delete_enclosure_16.png
-share/gnome/gspeakers/pixmaps/delete_enclosure_24.png
-share/gnome/gspeakers/pixmaps/delete_plot_16.png
-share/gnome/gspeakers/pixmaps/delete_plot_24.png
-share/gnome/gspeakers/pixmaps/driver_small.png
-share/gnome/gspeakers/pixmaps/filter_small.png
-share/gnome/gspeakers/pixmaps/measure_small.png
-share/gnome/gspeakers/pixmaps/open_xml_16.png
-share/gnome/gspeakers/pixmaps/open_xml_24.png
-share/gnome/gspeakers/pixmaps/opt_enclosure_16.png
-share/gnome/gspeakers/pixmaps/opt_enclosure_24.png
-share/gnome/gspeakers/pixmaps/plot_16.png
-share/gnome/gspeakers/pixmaps/save_as_xml_16.png
-share/gnome/gspeakers/pixmaps/save_as_xml_24.png
-share/gnome/gspeakers/pixmaps/save_xml_16.png
-share/gnome/gspeakers/pixmaps/save_xml_24.png
-share/gnome/gspeakers/pixmaps/speaker_small.png
-share/gnome/gspeakers/pixmaps/stock_menu_about.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_16.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_copy_16.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_copy_24.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_xml_16.png
-share/gnome/gspeakers/pixmaps/stock_new_crossover_xml_24.png
-share/gnome/gspeakers/pixmaps/stock_new_driver_16.png
-share/gnome/gspeakers/pixmaps/stock_new_driver_24.png
-share/gnome/gspeakers/pixmaps/stock_new_driver_xml_16.png
-share/gnome/gspeakers/pixmaps/stock_new_driver_xml_24.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_16.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_24.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_copy_16.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_copy_24.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_xml_16.png
-share/gnome/gspeakers/pixmaps/stock_new_enclosure_xml_24.png
-share/gnome/gspeakers/pixmaps/stock_plot_crossover_16.png
-share/gnome/gspeakers/pixmaps/stock_plot_crossover_24.png
-share/gnome/gspeakers/xml/box1.xml
-share/gnome/gspeakers/xml/crossover1.xml
-share/gnome/gspeakers/xml/morelmdt32s.frf
-share/gnome/gspeakers/xml/peerles115dt-26-72sf.frf
-share/gnome/gspeakers/xml/seasl14rcyp.frf
-share/gnome/gspeakers/xml/seasl21rn4xp.frf
-share/gnome/gspeakers/xml/seast14rcyph.frf
-share/gnome/gspeakers/xml/vifa.xml
-share/gnome/gspeakers/xml/vifad27tg-05-06.frf
-share/gnome/gspeakers/xml/vifap21wo-20-08.frf
-share/gnome/pixmaps/gspeakers.png
-@dirrm share/gnome/gspeakers/xml
-@dirrm share/gnome/gspeakers/pixmaps
-@dirrm share/gnome/gspeakers
+share/gspeakers/pixmaps/append_enclosure_24.png
+share/gspeakers/pixmaps/append_plot_enclosure_24.png
+share/gspeakers/pixmaps/delete_crossover_16.png
+share/gspeakers/pixmaps/delete_crossover_24.png
+share/gspeakers/pixmaps/delete_driver_16.png
+share/gspeakers/pixmaps/delete_driver_24.png
+share/gspeakers/pixmaps/delete_enclosure_16.png
+share/gspeakers/pixmaps/delete_enclosure_24.png
+share/gspeakers/pixmaps/delete_plot_16.png
+share/gspeakers/pixmaps/delete_plot_24.png
+share/gspeakers/pixmaps/driver_small.png
+share/gspeakers/pixmaps/filter_small.png
+share/gspeakers/pixmaps/measure_small.png
+share/gspeakers/pixmaps/open_xml_16.png
+share/gspeakers/pixmaps/open_xml_24.png
+share/gspeakers/pixmaps/opt_enclosure_16.png
+share/gspeakers/pixmaps/opt_enclosure_24.png
+share/gspeakers/pixmaps/plot_16.png
+share/gspeakers/pixmaps/save_as_xml_16.png
+share/gspeakers/pixmaps/save_as_xml_24.png
+share/gspeakers/pixmaps/save_xml_16.png
+share/gspeakers/pixmaps/save_xml_24.png
+share/gspeakers/pixmaps/speaker_small.png
+share/gspeakers/pixmaps/stock_menu_about.png
+share/gspeakers/pixmaps/stock_new_crossover_16.png
+share/gspeakers/pixmaps/stock_new_crossover_copy_16.png
+share/gspeakers/pixmaps/stock_new_crossover_copy_24.png
+share/gspeakers/pixmaps/stock_new_crossover_xml_16.png
+share/gspeakers/pixmaps/stock_new_crossover_xml_24.png
+share/gspeakers/pixmaps/stock_new_driver_16.png
+share/gspeakers/pixmaps/stock_new_driver_24.png
+share/gspeakers/pixmaps/stock_new_driver_xml_16.png
+share/gspeakers/pixmaps/stock_new_driver_xml_24.png
+share/gspeakers/pixmaps/stock_new_enclosure_16.png
+share/gspeakers/pixmaps/stock_new_enclosure_24.png
+share/gspeakers/pixmaps/stock_new_enclosure_copy_16.png
+share/gspeakers/pixmaps/stock_new_enclosure_copy_24.png
+share/gspeakers/pixmaps/stock_new_enclosure_xml_16.png
+share/gspeakers/pixmaps/stock_new_enclosure_xml_24.png
+share/gspeakers/pixmaps/stock_plot_crossover_16.png
+share/gspeakers/pixmaps/stock_plot_crossover_24.png
+share/gspeakers/xml/box1.xml
+share/gspeakers/xml/crossover1.xml
+share/gspeakers/xml/morelmdt32s.frf
+share/gspeakers/xml/peerles115dt-26-72sf.frf
+share/gspeakers/xml/seasl14rcyp.frf
+share/gspeakers/xml/seasl21rn4xp.frf
+share/gspeakers/xml/seast14rcyph.frf
+share/gspeakers/xml/vifa.xml
+share/gspeakers/xml/vifad27tg-05-06.frf
+share/gspeakers/xml/vifap21wo-20-08.frf
+share/pixmaps/gspeakers.png
+@dirrm share/gspeakers/xml
+@dirrm share/gspeakers/pixmaps
+@dirrm share/gspeakers