From owner-svn-ports-head@FreeBSD.ORG  Thu Aug  9 19:06:57 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DA030106566C;
	Thu,  9 Aug 2012 19:06:57 +0000 (UTC)
	(envelope-from olivierd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AB8EA8FC0A;
	Thu,  9 Aug 2012 19:06:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q79J6vWx042170;
	Thu, 9 Aug 2012 19:06:57 GMT (envelope-from olivierd@svn.freebsd.org)
Received: (from olivierd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q79J6vnY042167;
	Thu, 9 Aug 2012 19:06:57 GMT (envelope-from olivierd@svn.freebsd.org)
Message-Id: <201208091906.q79J6vnY042167@svn.freebsd.org>
From: Olivier Duchateau <olivierd@FreeBSD.org>
Date: Thu, 9 Aug 2012 19:06:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302348 - head/x11/xfce4-conf
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 09 Aug 2012 19:06:57 -0000

Author: olivierd
Date: Thu Aug  9 19:06:56 2012
New Revision: 302348
URL: http://svn.freebsd.org/changeset/ports/302348

Log:
  - Use USE_PKGCONFIG
  - Add patch when NLS is disabled
  - Remove USE_AUTOTOOLS (libtool) macro
  
  Submitted by:	myself
  Approved by:	miwi, rene (mentors)

Modified:
  head/x11/xfce4-conf/Makefile
  head/x11/xfce4-conf/pkg-plist

Modified: head/x11/xfce4-conf/Makefile
==============================================================================
--- head/x11/xfce4-conf/Makefile	Thu Aug  9 19:00:29 2012	(r302347)
+++ head/x11/xfce4-conf/Makefile	Thu Aug  9 19:06:56 2012	(r302348)
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-conf
 PORTVERSION=	4.10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfconf-${PORTVERSION}
@@ -19,15 +19,15 @@ COMMENT=	D-Bus-based configuration stora
 BUILD_DEPENDS=	p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gnomehack gtk20 intltool intlhack pkgconfig
+USE_GNOME=	glib20 gnomehack gtk20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=	yes
 USE_XFCE=	configenv libutil
 USE_XORG=	x11
+USE_PKGCONFIG=	build
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
@@ -67,4 +67,9 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if empty(PORT_OPTIONS:MNLS)
+post-patch:
+	@${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
+.endif
+
 .include <bsd.port.mk>

Modified: head/x11/xfce4-conf/pkg-plist
==============================================================================
--- head/x11/xfce4-conf/pkg-plist	Thu Aug  9 19:00:29 2012	(r302347)
+++ head/x11/xfce4-conf/pkg-plist	Thu Aug  9 19:06:56 2012	(r302348)
@@ -4,7 +4,6 @@ include/xfce4/xfconf-0/xfconf/xfconf-cha
 include/xfce4/xfconf-0/xfconf/xfconf-errors.h
 include/xfce4/xfconf-0/xfconf/xfconf-types.h
 include/xfce4/xfconf-0/xfconf/xfconf.h
-lib/libxfconf-0.a
 lib/libxfconf-0.la
 lib/libxfconf-0.so
 lib/libxfconf-0.so.2