From owner-svn-ports-head@FreeBSD.ORG  Thu Aug  9 17:43:27 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 BE8B2106566C;
	Thu,  9 Aug 2012 17:43:27 +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 A90E18FC14;
	Thu,  9 Aug 2012 17:43:27 +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 q79HhRPX035164;
	Thu, 9 Aug 2012 17:43:27 GMT (envelope-from olivierd@svn.freebsd.org)
Received: (from olivierd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q79HhRDF035160;
	Thu, 9 Aug 2012 17:43:27 GMT (envelope-from olivierd@svn.freebsd.org)
Message-Id: <201208091743.q79HhRDF035160@svn.freebsd.org>
From: Olivier Duchateau <olivierd@FreeBSD.org>
Date: Thu, 9 Aug 2012 17:43:27 +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: r302346 - head/sysutils/xfce4-netload-plugin
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 17:43:27 -0000

Author: olivierd
Date: Thu Aug  9 17:43:27 2012
New Revision: 302346
URL: http://svn.freebsd.org/changeset/ports/302346

Log:
  - Update to 1.2.0
  - Convert to new framework OptionsNG
  - Use USE_PKGCONFIG
  - Add patch when NLS is disabled
  
  PR:	169894
  Submitted by:	by myself
  Approved by:	miwi, rene (mentors), maintainer (timeout > 2 weeks)

Modified:
  head/sysutils/xfce4-netload-plugin/Makefile
  head/sysutils/xfce4-netload-plugin/distinfo
  head/sysutils/xfce4-netload-plugin/pkg-plist

Modified: head/sysutils/xfce4-netload-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-netload-plugin/Makefile	Thu Aug  9 16:47:32 2012	(r302345)
+++ head/sysutils/xfce4-netload-plugin/Makefile	Thu Aug  9 17:43:27 2012	(r302346)
@@ -6,28 +6,28 @@
 #
 
 PORTNAME=	xfce4-netload-plugin
-PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	demon@FreeBSD.org
-COMMENT=	Network Load plugin for XFce4
+COMMENT=	Network Load plugin for Xfce4
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool intlhack pkgconfig
+USE_GNOME=	gnomehack intltool intlhack
 USE_XFCE=	configenv libmenu panel
 INSTALLS_ICONS=	yes
+USE_PKGCONFIG=	build
 
-OPTIONS=	NLS "Enable Native Language Support" on
+OPTIONS_DEFINE=	NLS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=  yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+= NLS=""
@@ -37,11 +37,13 @@ PLIST_SUB+= NLS="@comment "
 .endif
 
 do-patch:
-	@${REINPLACE_CMD} -e 's|#  include <net/if_ppp.h>||' \
-		${WRKSRC}/panel-plugin/os.h
 	@${REINPLACE_CMD} -e 's, || __FreeBSD_kernel__,,' \
 		${WRKSRC}/panel-plugin/net.c \
 		${WRKSRC}/panel-plugin/net.h \
 		${WRKSRC}/panel-plugin/os.h
 
-.include <bsd.port.post.mk>
+.if empty(PORT_OPTIONS:MNLS)
+	@${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
+.endif
+
+.include <bsd.port.mk>

Modified: head/sysutils/xfce4-netload-plugin/distinfo
==============================================================================
--- head/sysutils/xfce4-netload-plugin/distinfo	Thu Aug  9 16:47:32 2012	(r302345)
+++ head/sysutils/xfce4-netload-plugin/distinfo	Thu Aug  9 17:43:27 2012	(r302346)
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-netload-plugin-1.1.0.tar.bz2) = 8a33dfed24a7bbd8eaf333524f94eb24e7d3a14ffccb181e5cab1d1b05ae3bf7
-SIZE (xfce4/xfce4-netload-plugin-1.1.0.tar.bz2) = 160212
+SHA256 (xfce4/xfce4-netload-plugin-1.2.0.tar.bz2) = c824f09e2d3860011b44d8272d661c458237786828027f3d9ad6a1d4f0096845
+SIZE (xfce4/xfce4-netload-plugin-1.2.0.tar.bz2) = 169721

Modified: head/sysutils/xfce4-netload-plugin/pkg-plist
==============================================================================
--- head/sysutils/xfce4-netload-plugin/pkg-plist	Thu Aug  9 16:47:32 2012	(r302345)
+++ head/sysutils/xfce4-netload-plugin/pkg-plist	Thu Aug  9 17:43:27 2012	(r302346)
@@ -2,6 +2,7 @@ libexec/xfce4/panel-plugins/xfce4-netloa
 share/icons/hicolor/24x24/apps/xfce4-netload-plugin.png
 share/icons/hicolor/48x48/apps/xfce4-netload-plugin.png
 share/icons/hicolor/scalable/apps/xfce4-netload-plugin.svg
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-netload-plugin.mo
@@ -41,6 +42,7 @@ share/icons/hicolor/scalable/apps/xfce4-
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-netload-plugin.mo
 share/xfce4/panel-plugins/netload.desktop
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4