ports/169894: [UPDATE] sysutils/xfce4-netload-plugin to 1.2.0

[Olivier Duchateau]

>Number:         169894
>Category:       ports
>Synopsis:       [UPDATE] sysutils/xfce4-netload-plugin to 1.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 15 21:40:04 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        FreeBSD 8.3-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
ChangeLog: http://mail.xfce.org/pipermail/xfce/2012-July/030972.html

- Convert to Options NG framework
- Clean Makefile
- Add workaround, when Native Language Support is disabled
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/xfce4-netload-plugin/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile	1 Jun 2012 05:24:30 -0000	1.42
+++ Makefile	15 Jul 2012 21:17:00 -0000
@@ -6,15 +6,14 @@
 #
 
 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 at FreeBSD.org
-COMMENT=	Network Load plugin for XFce4
+COMMENT=	Network load plugin for Xfce
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -23,11 +22,12 @@
 USE_XFCE=	configenv libmenu panel
 INSTALLS_ICONS=	yes
 
-OPTIONS=	NLS "Enable Native Language Support" on
+OPTIONS_DEFINE=	NLS
+OPTIONS_DEFAULT=	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 @@
 .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>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/xfce4-netload-plugin/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo	16 Jan 2012 12:45:52 -0000	1.10
+++ distinfo	15 Jul 2012 21:17:00 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/xfce4-netload-plugin/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	16 Jan 2012 12:45:52 -0000	1.6
+++ pkg-plist	15 Jul 2012 21:17:00 -0000
@@ -2,6 +2,7 @@
 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 @@
 %%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


>Release-Note:
>Audit-Trail:
>Unformatted: