Date: Tue, 11 Mar 2014 19:19:03 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347906 - head/deskutils/conduit Message-ID: <201403111919.s2BJJ38A041377@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Tue Mar 11 19:19:02 2014 New Revision: 347906 URL: http://svnweb.freebsd.org/changeset/ports/347906 QAT: https://qat.redports.org/buildarchive/r347906/ Log: Disable nautilus support, it is incompatible with nautilus 3.x. Replace manual pkgconfig sed with USES=pathfix. Stagify. Modified: head/deskutils/conduit/Makefile Modified: head/deskutils/conduit/Makefile ============================================================================== --- head/deskutils/conduit/Makefile Tue Mar 11 19:18:11 2014 (r347905) +++ head/deskutils/conduit/Makefile Tue Mar 11 19:19:02 2014 (r347906) @@ -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}/goocan 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 <bsd.port.options.mk> -.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|'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403111919.s2BJJ38A041377>