Bug 169894 - [UPDATE] sysutils/xfce4-netload-plugin to 1.2.0
Summary: [UPDATE] sysutils/xfce4-netload-plugin to 1.2.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Dmitry Sivachenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-07-15 22:40 UTC by Olivier Duchateau
Modified: 2012-08-09 21:15 UTC (History)
0 users

See Also:


Attachments
file.diff (3.15 KB, patch)
2012-07-15 22:40 UTC, Olivier Duchateau
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Olivier Duchateau 2012-07-15 22:40:04 UTC
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

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2012-07-15 22:40:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->demon

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer 2012-08-09 18:43:42 UTC
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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Olivier Duchateau freebsd_committer 2012-08-09 21:15:34 UTC
State Changed
From-To: open->closed

Committed. Thanks!