- Update to 2.3.0 [1], [2]

- Remove files/patch-src__config__Run.cc
- Remove http://nivi.interfree.it/* from MASTER_SITES
- Add LICENSE (GPLv3)  [2]
- Convert to the new options framework  [2]
- Add WBARCONFIG option (default on)
- Enable the NLS option  [2]
- Set USE_GNOME to desktopfileutils, intltool
- Fix the installation path of wbar.desktop  [2]
- Fix a typo in pkg-descr

PR:		ports/168167  [1], ports/168778  [2]
Submitted by:	lbartoletti <coder at tuxfamily.org>  [1], Olivier Cochard-Labbe <olivier at cochard.me>  [2]

6 files changed, 74 insertions, 42 deletions

diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 70bf9a9ab8b2..75ff18e77785 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -6,32 +6,63 @@
 #
 
 PORTNAME=	wbar
-PORTVERSION=	2.2.2
-PORTREVISION=	2
+PORTVERSION=	2.3.0
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		http://nivi.interfree.it/distfiles/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A quick launch bar for fluxbox, WindowMaker, Xfce, etc
 
+LICENSE=	GPLv3
+
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 
 GNU_CONFIGURE=	yes
 
-MAN1=	${PORTNAME}.1 ${PORTNAME}-config.1
+MAN1=	${PORTNAME}.1
+MANLANG=	"" es
 
-USE_EFL=	imlib2
-# Disabled: the configure script has a couple of bugs...
-#.if !defined(WITHOUT_NLS)
+OPTIONS_DEFINE=	NLS WBARCONFIG
+OPTIONS_DEFAULT=	NLS WBARCONFIG
+
+WBARCONFIG_DESC=	Build the GTK+ configuration interface
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ENV=	LIBS=-lintl
-USE_GETTEXT=	yes
 PLIST_SUB=	NLS=""
-#.else
-#CONFIGURE_ARGS+=	--disable-nls
-#PLIST_SUB=	NLS="@comment"
-#.endif
-USE_GMAKE=	yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB=	NLS="@comment "
+# The configure script has a couple of bugs...
+post-patch:
+	${REINPLACE_CMD} -e "s,install-data-@USE_NLS@,install-data-no,g" ${WRKSRC}/po/Makefile.in.in
+.endif
+
+.if ${PORT_OPTIONS:MWBARCONFIG}
+CONFIGURE_ARGS+=	--enable-wbar-config
+PLIST_SUB+=	WBARCONFIG=""
+MAN1+=	${PORTNAME}-config.1
 USE_GNOME=	libglade2
+.else
+CONFIGURE_ARGS+=	--disable-wbar-config
+PLIST_SUB+=	WBARCONFIG="@comment "
+.endif
+
+USE_EFL=	imlib2
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME+=	desktopfileutils intltool
+
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+PLIST_SUB+=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
+
+post-install:
+	${MV} ${PREFIX}/etc/wbar.d/wbar.desktop ${DESKTOPDIR}/wbar.desktop
 
 .include <bsd.port.mk>
diff --git a/x11/wbar/distinfo b/x11/wbar/distinfo
index 323bc1ccebee..4d5f7b2e0740 100644
--- a/x11/wbar/distinfo
+++ b/x11/wbar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wbar-2.2.2.tar.gz) = 0d7ae78d02d52cdb046a47286341ad6ff42dd9aff667f7d389b4f352046d4db0
-SIZE (wbar-2.2.2.tar.gz) = 369592
+SHA256 (wbar_2.3.0.orig.tar.gz) = 1a192f150eae92d1c92b86050e4f8046de960a2452c48190187dd6b7a89df63b
+SIZE (wbar_2.3.0.orig.tar.gz) = 375206
diff --git a/x11/wbar/files/patch-configure b/x11/wbar/files/patch-configure
index 2ce969ed1f20..0f97ed6e9ae0 100644
--- a/x11/wbar/files/patch-configure
+++ b/x11/wbar/files/patch-configure
@@ -1,11 +1,24 @@
---- ./configure.orig	2011-06-30 10:09:16.000000000 +0200
-+++ ./configure	2011-06-30 10:09:46.000000000 +0200
-@@ -7766,7 +7766,7 @@
-    make update-po | perl -ne 'print if /:$/'
+--- ./configure.orig	2012-03-03 21:40:43.000000000 +0100
++++ ./configure	2012-07-10 15:12:44.000000000 +0200
+@@ -6259,7 +6259,7 @@
+ fi
+ 
+ 
+-PIDOF_BIN="pidof "
++PIDOF_BIN="/bin/pgrep "
+ 
+ # Extract the first word of "pidof", so it can be a program name with args.
+ set dummy pidof; ac_word=$2
+@@ -7813,10 +7813,10 @@
+    echo "Execute make update-po"
+    echo ""
+    cd po
+-   make update-po | perl -ne 'print if /:$/'
++   $MAKE update-po | perl -ne 'print if /:$/'
     echo ""
     for file in $(ls *.po); do \
 -       sed -i '/^\"POT-Creation-Date:.*\\n.*$/d' $file
-+       sed -i.bak -e '/^\"POT-Creation-Date:.*\\n.*$/d' $file
++       sed -i.bak '/^\"POT-Creation-Date:.*\\n.*$/d' $file
     done
     cd ..
     echo "======================================="
diff --git a/x11/wbar/files/patch-src__config__Run.cc b/x11/wbar/files/patch-src__config__Run.cc
deleted file mode 100644
index edbce9486b96..000000000000
--- a/x11/wbar/files/patch-src__config__Run.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/config/Run.cc.orig	2011-05-20 18:25:35.000000000 +0200
-+++ ./src/config/Run.cc	2011-07-06 17:21:57.000000000 +0200
-@@ -28,7 +28,7 @@
-     int pid = -1;
-     FILE * process;
- 
--    process = popen("pidof "PACKAGE_NAME, "r");
-+    process = popen("pgrep "PACKAGE_NAME, "r");
- 
-     if (process)
-     {
diff --git a/x11/wbar/pkg-descr b/x11/wbar/pkg-descr
index 28cba49b0a60..de683aba4f95 100644
--- a/x11/wbar/pkg-descr
+++ b/x11/wbar/pkg-descr
@@ -1,6 +1,6 @@
-wbar is a quick launch bar. Its fast, light and cool eye-candy.
+wbar is a quick launch bar. It is fast, light and cool eye-candy.
 
-Initially developed for Fluxbox, then tested on WindowMaker, Xfce, 
+Initially developed for Fluxbox, then tested on WindowMaker, Xfce,
 Gnome, etc.
 
 It can run on top of desktops such as xfdesktop or nautilus with
diff --git a/x11/wbar/pkg-plist b/x11/wbar/pkg-plist
index fe35fa13583e..448fc3885309 100644
--- a/x11/wbar/pkg-plist
+++ b/x11/wbar/pkg-plist
@@ -1,8 +1,9 @@
 @comment $FreeBSD$
 bin/wbar
-bin/wbar-config
-etc/default/wbar/wbar.cfg
-etc/xdg/autostart/wbar.desktop
+%%WBARCONFIG%%bin/wbar-config
+etc/wbar.d/wbar.cfg
+@comment etc/wbar.d/wbar.desktop
+%%DESKTOPDIR%%/wbar.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/wbar.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wbar.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/wbar.mo
@@ -11,16 +12,14 @@ share/pixmaps/wbar/anjuta.png
 share/pixmaps/wbar/bluefish.png
 share/pixmaps/wbar/gimp.png
 share/pixmaps/wbar/ooffice.png
+share/pixmaps/wbar/questionmark.png
 share/pixmaps/wbar/osxbarback.png
 share/pixmaps/wbar/pidgin.png
 share/pixmaps/wbar/synaptic.png
 share/pixmaps/wbar/terminal.png
 share/pixmaps/wbar/wbar.png
-@dirrm share/pixmaps/wbar
 %%DATADIR%%/glade/wbar.glade
+@dirrm share/pixmaps/wbar
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
-@dirrm etc/default/wbar
-@dirrm etc/default
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
+@dirrm etc/wbar.d