From 935c4739b111c4bbc2c351de6542ddd51ea416db Mon Sep 17 00:00:00 2001 From: kwm Date: Tue, 11 Mar 2014 19:19:02 +0000 Subject: [PATCH] Disable nautilus support, it is incompatible with nautilus 3.x. Replace manual pkgconfig sed with USES=pathfix. Stagify. --- deskutils/conduit/Makefile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile index 3eca33de4857f..3dc1268e13425 100644 --- a/deskutils/conduit/Makefile +++ b/deskutils/conduit/Makefile @@ -4,7 +4,7 @@ PORTNAME= conduit PORTVERSION= 0.3.17 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils MASTER_SITES= GNOME @@ -26,26 +26,20 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goo USE_PYTHON= yes GNU_CONFIGURE= yes -USES= gettext gmake pkgconfig +USES= gettext gmake pathfix pkgconfig INSTALLS_OMF= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= pygnome2 gnomeprefix +CONFIGURE_ARGS= --disable-nautilus-extension -OPTIONS_DEFINE= NAUTILUS EOG -OPTIONS_DEFAULT=NAUTILUS EOG -NAUTILUS_DESC= Build Nautilus Plugin +OPTIONS_DEFINE= EOG +OPTIONS_DEFAULT=EOG EOG_DESC= Build Eye-Of-Gnome Plugin -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MNAUTILUS} -USE_GNOME+= nautilus2 -CONFIGURE_ARGS+= --enable-nautilus-extension -.endif - .if ${PORT_OPTIONS:MEOG} BUILD_DEPENDS+= eog:${PORTSDIR}/graphics/eog RUN_DEPENDS+= eog:${PORTSDIR}/graphics/eog @@ -53,8 +47,6 @@ CONFIGURE_ARGS+= --enable-eog-plugin .endif post-patch: - @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/data/Makefile.in @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \ -e 's|/usr/bin/python|${LOCALBASE}/bin/python|' \ -e 's|/usr/lib/firefox*|${LOCALBASE}/lib/firefox|'