From owner-svn-ports-head@FreeBSD.ORG  Tue Mar 11 19:19:03 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 56CA2803;
 Tue, 11 Mar 2014 19:19:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4342722E;
 Tue, 11 Mar 2014 19:19:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BJJ313041378;
 Tue, 11 Mar 2014 19:19:03 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BJJ38A041377;
 Tue, 11 Mar 2014 19:19:03 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201403111919.s2BJJ38A041377@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Tue, 11 Mar 2014 19:19:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347906 - head/deskutils/conduit
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Mar 2014 19:19:03 -0000

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|'