diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile index 9752c3a10edf..f823933462a6 100644 --- a/audio/gspeakers/Makefile +++ b/audio/gspeakers/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= gspeakers -PORTVERSION= 0.10.1 -PORTREVISION= 2 +PORTVERSION= 0.11 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,24 +13,44 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Gnome-based loudspeaker design program -LIB_DEPENDS= gtkmm:${PORTSDIR}/x11-toolkits/gtk--2 -RUN_DEPENDS= spice3:${PORTSDIR}/cad/spice +LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 USE_X_PREFIX= yes -USE_GMAKE= yes -USE_GNOME= gnomehack libxml2 gnomeprefix -USE_LIBTOOL_VER= 13 +USE_GCC= 3.3 +USE_GNOME= gnomeprefix gnometarget libxml2 USE_REINPLACE= yes -CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +USE_GMAKE= yes +WANT_AUTOMAKE_VER= 18 +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +CFLAGS+= -O0 + +.if defined(WITH_SPICE) +RUN_DEPENDS+= spice3:${PORTSDIR}/cad/spice +.else +RUN_DEPENDS+= gnucap:${PORTSDIR}/cad/gnucap +.endif + +post-extract: + @${FIND} ${WRKSRC} -type l -delete post-patch: - @${REINPLACE_CMD} -e \ - "s,/share/pixmaps/,/share/gnome/pixmaps/${PORTNAME}/," \ - -e "s,/share/xml/,/share/gnome/xml/${PORTNAME}/," \ - ${WRKSRC}/src/*.cc - @${REINPLACE_CMD} -e \ - "s,/usr/local/share/xml/,${PREFIX}/share/gnome/xml/${PORTNAME}/,g" \ - ${WRKSRC}/xml/*.xml + @${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} .include diff --git a/audio/gspeakers/distinfo b/audio/gspeakers/distinfo index 96601edc01c0..f0590c06298f 100644 --- a/audio/gspeakers/distinfo +++ b/audio/gspeakers/distinfo @@ -1,2 +1,2 @@ -MD5 (gspeakers-0.10.1.tar.gz) = 5a072971751a3b8c048248da0b527a25 -SIZE (gspeakers-0.10.1.tar.gz) = 280457 +MD5 (gspeakers-0.11.tar.gz) = 1a8ed81fe42000969e8b0d29f8156bae +SIZE (gspeakers-0.11.tar.gz) = 546406 diff --git a/audio/gspeakers/files/patch-pixmaps::Makefile.in b/audio/gspeakers/files/patch-pixmaps::Makefile.in deleted file mode 100644 index fa0d0acaa26f..000000000000 --- a/audio/gspeakers/files/patch-pixmaps::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- pixmaps/Makefile.in.orig Thu Dec 11 21:22:40 2003 -+++ pixmaps/Makefile.in Thu Dec 11 21:23:25 2003 -@@ -130,7 +130,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --pixmapdir = $(datadir)/pixmaps -+pixmapdir = $(datadir)/pixmaps/gspeakers - pixmap_DATA = driver_small.png filter_small.png measure_small.png \ - speaker_small.png stock_menu_about.png \ - stock_new_driver_16.png stock_new_driver_24.png \ diff --git a/audio/gspeakers/files/patch-xml::Makefile.in b/audio/gspeakers/files/patch-xml::Makefile.in deleted file mode 100644 index 86e392af84e9..000000000000 --- a/audio/gspeakers/files/patch-xml::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- xml/Makefile.in.orig Thu Dec 11 21:22:40 2003 -+++ xml/Makefile.in Thu Dec 11 21:24:11 2003 -@@ -130,7 +130,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --xmldir = $(datadir)/xml -+xmldir = $(datadir)/xml/gspeakers - xml_DATA = box1.xml crossover1.xml vifa.xml seasl21rn4xp.frf \ - seasl14rcyp.frf morelmdt32s.frf seast14rcyph.frf \ - vifap21wo-20-08.frf vifad27tg-05-06.frf \ diff --git a/audio/gspeakers/pkg-plist b/audio/gspeakers/pkg-plist index 5aa818487057..9cf972bac714 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 -share/gnome/pixmaps/gspeakers/append_enclosure_24.png -share/gnome/pixmaps/gspeakers/append_plot_enclosure_24.png -share/gnome/pixmaps/gspeakers/delete_crossover_16.png -share/gnome/pixmaps/gspeakers/delete_crossover_24.png -share/gnome/pixmaps/gspeakers/delete_driver_16.png -share/gnome/pixmaps/gspeakers/delete_driver_24.png -share/gnome/pixmaps/gspeakers/delete_enclosure_16.png -share/gnome/pixmaps/gspeakers/delete_enclosure_24.png -share/gnome/pixmaps/gspeakers/delete_plot_16.png -share/gnome/pixmaps/gspeakers/delete_plot_24.png -share/gnome/pixmaps/gspeakers/driver_small.png -share/gnome/pixmaps/gspeakers/filter_small.png -share/gnome/pixmaps/gspeakers/measure_small.png -share/gnome/pixmaps/gspeakers/open_xml_16.png -share/gnome/pixmaps/gspeakers/open_xml_24.png -share/gnome/pixmaps/gspeakers/opt_enclosure_16.png -share/gnome/pixmaps/gspeakers/opt_enclosure_24.png -share/gnome/pixmaps/gspeakers/plot_16.png -share/gnome/pixmaps/gspeakers/save_as_xml_16.png -share/gnome/pixmaps/gspeakers/save_as_xml_24.png -share/gnome/pixmaps/gspeakers/save_xml_16.png -share/gnome/pixmaps/gspeakers/save_xml_24.png -share/gnome/pixmaps/gspeakers/speaker_small.png -share/gnome/pixmaps/gspeakers/stock_menu_about.png -share/gnome/pixmaps/gspeakers/stock_new_crossover_16.png -share/gnome/pixmaps/gspeakers/stock_new_crossover_copy_16.png -share/gnome/pixmaps/gspeakers/stock_new_crossover_copy_24.png -share/gnome/pixmaps/gspeakers/stock_new_crossover_xml_16.png -share/gnome/pixmaps/gspeakers/stock_new_crossover_xml_24.png -share/gnome/pixmaps/gspeakers/stock_new_driver_16.png -share/gnome/pixmaps/gspeakers/stock_new_driver_24.png -share/gnome/pixmaps/gspeakers/stock_new_driver_xml_16.png -share/gnome/pixmaps/gspeakers/stock_new_driver_xml_24.png -share/gnome/pixmaps/gspeakers/stock_new_enclosure_16.png -share/gnome/pixmaps/gspeakers/stock_new_enclosure_24.png -share/gnome/pixmaps/gspeakers/stock_new_enclosure_copy_16.png -share/gnome/pixmaps/gspeakers/stock_new_enclosure_copy_24.png -share/gnome/pixmaps/gspeakers/stock_new_enclosure_xml_16.png -share/gnome/pixmaps/gspeakers/stock_new_enclosure_xml_24.png -share/gnome/pixmaps/gspeakers/stock_plot_crossover_16.png -share/gnome/pixmaps/gspeakers/stock_plot_crossover_24.png -share/gnome/xml/gspeakers/box1.xml -share/gnome/xml/gspeakers/crossover1.xml -share/gnome/xml/gspeakers/morelmdt32s.frf -share/gnome/xml/gspeakers/peerles115dt-26-72sf.frf -share/gnome/xml/gspeakers/seasl14rcyp.frf -share/gnome/xml/gspeakers/seasl21rn4xp.frf -share/gnome/xml/gspeakers/seast14rcyph.frf -share/gnome/xml/gspeakers/vifa.xml -share/gnome/xml/gspeakers/vifad27tg-05-06.frf -share/gnome/xml/gspeakers/vifap21wo-20-08.frf -share/locale/sv/LC_MESSAGES/gspeakers.mo -@dirrm share/gnome/pixmaps/gspeakers -@dirrm share/gnome/xml/gspeakers +@dirrm share/gnome/gspeakers/xml +@dirrm share/gnome/gspeakers/pixmaps +@dirrm share/gnome/gspeakers