From 761f5a61c7ac843ea6d8c432eaf6624ea054e5e7 Mon Sep 17 00:00:00 2001 From: Jean-Yves Lefort Date: Fri, 13 May 2005 11:35:54 +0000 Subject: - Remove the DBUS option, since Jamboree requires an obsolete version of the D-BUS API [1] - Use GCONF_SCHEMAS and fix schemas installation PR: ports/80527 [1] Reported by: Adam Gregoire [1] --- audio/jamboree/Makefile | 15 ++++++--------- audio/jamboree/pkg-plist | 3 --- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'audio/jamboree') diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile index 1a0af780b0b0..8815ed670ca8 100644 --- a/audio/jamboree/Makefile +++ b/audio/jamboree/Makefile @@ -25,14 +25,11 @@ USE_LIBTOOL_VER=15 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +GCONF_SCHEMAS= jamboree.schemas +USE_REINPLACE= yes -OPTIONS= DBUS "D-BUS support" off +post-patch: + @${REINPLACE_CMD} -e 's|^\(@GCONF_SCHEMAS_INSTALL_TRUE@\) |\1 |' \ + ${WRKSRC}/Makefile.in -.include - -.if defined(WITH_DBUS) -LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus -CONFIGURE_ARGS+= --enable-dbus -.endif - -.include +.include diff --git a/audio/jamboree/pkg-plist b/audio/jamboree/pkg-plist index 02bc93407fa7..3c3f01bcf2c6 100644 --- a/audio/jamboree/pkg-plist +++ b/audio/jamboree/pkg-plist @@ -1,7 +1,4 @@ bin/jamboree -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/jamboree.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/jamboree.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/jamboree.schemas > /dev/null || /usr/bin/true share/gnome/applications/jamboree.desktop share/gnome/jamboree/jamboree-next.png share/gnome/jamboree/jamboree-note.png -- cgit v1.2.3