Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Aug 2012 19:37:59 +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: r302353 - head/x11-wm/xfce4-panel
Message-ID:  <201208091937.q79JbxJa045133@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olivierd
Date: Thu Aug  9 19:37:58 2012
New Revision: 302353
URL: http://svn.freebsd.org/changeset/ports/302353

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

Modified:
  head/x11-wm/xfce4-panel/Makefile
  head/x11-wm/xfce4-panel/pkg-plist

Modified: head/x11-wm/xfce4-panel/Makefile
==============================================================================
--- head/x11-wm/xfce4-panel/Makefile	Thu Aug  9 19:29:22 2012	(r302352)
+++ head/x11-wm/xfce4-panel/Makefile	Thu Aug  9 19:37:58 2012	(r302353)
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -21,15 +21,14 @@ LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-t
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack pkgconfig \
-		desktopfileutils
+USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack desktopfileutils
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
 USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	x11 sm
+USE_PKGCONFIG=	build
 
 CONFIGURE_ARGS+=--enable-gio-unix \
 		--disable-gtk-doc-html
@@ -55,6 +54,11 @@ CONFIGURE_ARGS+=--without-html-dir
 PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
+.if empty(PORT_OPTIONS:MNLS)
+	@${REINPLACE_CMD} -e 's|	icons \\|	icons| ; \
+		s|	po||' ${WRKSRC}/Makefile.in
+.endif
+
 post-install:
 	@-update-desktop-database
 

Modified: head/x11-wm/xfce4-panel/pkg-plist
==============================================================================
--- head/x11-wm/xfce4-panel/pkg-plist	Thu Aug  9 19:29:22 2012	(r302352)
+++ head/x11-wm/xfce4-panel/pkg-plist	Thu Aug  9 19:37:58 2012	(r302353)
@@ -15,42 +15,30 @@ include/xfce4/libxfce4panel-1.0/libxfce4
 include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros.h
 include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h
 include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h
-lib/libxfce4panel-1.0.a
 lib/libxfce4panel-1.0.la
 lib/libxfce4panel-1.0.so
 lib/libxfce4panel-1.0.so.4
 lib/xfce4/panel/migrate
-lib/xfce4/panel/plugins/libactions.a
 lib/xfce4/panel/plugins/libactions.la
 lib/xfce4/panel/plugins/libactions.so
-lib/xfce4/panel/plugins/libapplicationsmenu.a
 lib/xfce4/panel/plugins/libapplicationsmenu.la
 lib/xfce4/panel/plugins/libapplicationsmenu.so
-lib/xfce4/panel/plugins/libclock.a
 lib/xfce4/panel/plugins/libclock.la
 lib/xfce4/panel/plugins/libclock.so
-lib/xfce4/panel/plugins/libdirectorymenu.a
 lib/xfce4/panel/plugins/libdirectorymenu.la
 lib/xfce4/panel/plugins/libdirectorymenu.so
-lib/xfce4/panel/plugins/liblauncher.a
 lib/xfce4/panel/plugins/liblauncher.la
 lib/xfce4/panel/plugins/liblauncher.so
-lib/xfce4/panel/plugins/libpager.a
 lib/xfce4/panel/plugins/libpager.la
 lib/xfce4/panel/plugins/libpager.so
-lib/xfce4/panel/plugins/libseparator.a
 lib/xfce4/panel/plugins/libseparator.la
 lib/xfce4/panel/plugins/libseparator.so
-lib/xfce4/panel/plugins/libshowdesktop.a
 lib/xfce4/panel/plugins/libshowdesktop.la
 lib/xfce4/panel/plugins/libshowdesktop.so
-lib/xfce4/panel/plugins/libsystray.a
 lib/xfce4/panel/plugins/libsystray.la
 lib/xfce4/panel/plugins/libsystray.so
-lib/xfce4/panel/plugins/libtasklist.a
 lib/xfce4/panel/plugins/libtasklist.la
 lib/xfce4/panel/plugins/libtasklist.so
-lib/xfce4/panel/plugins/libwindowmenu.a
 lib/xfce4/panel/plugins/libwindowmenu.la
 lib/xfce4/panel/plugins/libwindowmenu.so
 lib/xfce4/panel/wrapper



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