Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Aug 2012 19:06:57 +0000 (UTC)
From:      Olivier Duchateau <olivierd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302348 - head/x11/xfce4-conf
Message-ID:  <201208091906.q79J6vnY042167@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208091906.q79J6vnY042167>