7 files changed, 57 insertions, 105 deletions

diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index afe3f5db7b9f..d249f273da73 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -6,31 +6,34 @@
 #
 
 PORTNAME=	wbar
-PORTVERSION=	1.3.3
-PORTREVISION=	4
+PORTVERSION=	2.2.2
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://www.tecapli.com.ar/rodolfo/ \
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
-EXTRACT_SUFX=	.tbz2
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A quick launch bar for fluxbox, WindowMaker, Xfce, etc
 
-BUILD_DEPENDS=	imlib2-config:${PORTSDIR}/graphics/imlib2
+RUN_DEPENDS=	pidof:${PORTSDIR}/sysutils/pidof
 
-SUB_FILES=	pkg-message
+CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_XORG=	x11
+GNU_CONFIGURE=	yes
 
-post-patch:
-	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Makefile
+MAN1=	${PORTNAME}.1 ${PORTNAME}-config.1
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} && ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-	${CAT} ${PKGMESSAGE}
+USE_EFL=	imlib2
+# Disabled: the configure script has a couple of bugs...
+#.if !defined(WITHOUT_NLS)
+CONFIGURE_ENV=	LIBS=-lintl
+USE_GETTEXT=	yes
+PLIST_SUB=	NLS=""
+#.else
+#CONFIGURE_ARGS+=	--disable-nls
+#PLIST_SUB=	NLS="@comment"
+#.endif
+USE_GMAKE=	yes
+USE_GNOME=	libglade2
 
 .include <bsd.port.mk>
diff --git a/x11/wbar/distinfo b/x11/wbar/distinfo
index e2398a695cfc..323bc1ccebee 100644
--- a/x11/wbar/distinfo
+++ b/x11/wbar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wbar-1.3.3.tbz2) = 431c5f7a8b6b065e2fe32a6482476a5ecefdf838aee550cae381ba64cb79eb4b
-SIZE (wbar-1.3.3.tbz2) = 429098
+SHA256 (wbar-2.2.2.tar.gz) = 0d7ae78d02d52cdb046a47286341ad6ff42dd9aff667f7d389b4f352046d4db0
+SIZE (wbar-2.2.2.tar.gz) = 369592
diff --git a/x11/wbar/files/patch-Makefile b/x11/wbar/files/patch-Makefile
deleted file mode 100644
index 831dafa29860..000000000000
--- a/x11/wbar/files/patch-Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
---- Makefile	2007-09-26 18:24:10.000000000 +0200
-+++ Makefile.port	2007-09-28 10:45:10.000000000 +0200
-@@ -1,7 +1,7 @@
- TARGET=wbar
--CXXFLAGS=`imlib2-config --cflags` -Wall -O2 #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER
--LDFLAGS=`imlib2-config --libs`  -Wl,-O2
--PREFIX=/usr/share/wbar
-+CXXFLAGS+=`imlib2-config --cflags` -Wall #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER
-+LDFLAGS+=`imlib2-config --libs`  -Wl
-+PREFIX=%%DATADIR%%
- 
- 	
- sources= XWin.cc Icon.cc Bar.cc IconLoader.cc \
-@@ -14,7 +14,7 @@
- $(objects): $(headers) Makefile
- 
- $(TARGET): $(objects) 
--	g++ $(LDFLAGS) -o $(@) $(objects)
-+	$(CXX) $(LDFLAGS) -o $(@) $(objects)
- 	#strip $(@)
- 
- install: $(TARGET)
-@@ -26,13 +26,13 @@
- 	install -d $(PREFIX)
- 	awk '{if($$1 ~ /i:/ || ($$1 ~ /t:/ && NR<4)) print $$1" $(PREFIX)/"$$2; else print $$0;}' \
- 		./dot.wbar > $(PREFIX)/dot.wbar
--	cp -a ./iconpack $(PREFIX)/iconpack
-+	cp -pLR ./iconpack $(PREFIX)/iconpack
- 
- 	#ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.nuvoux/font.ttf
- 	#ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.ice/font.ttf
- 	ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.osx/font.ttf
- 	
--	install ./wbar /usr/bin
-+	install ./wbar %%PREFIX%%/bin
- 
- uninstall:
- 	if [ "`whoami`" != "root" ]; then \
-@@ -41,7 +41,7 @@
- 	fi
- 
- 	rm -rf $(PREFIX)
--	rm -f /usr/bin/wbar
-+	rm -f %%PREFIX%%/bin/wbar
- 
- 
- clean:
diff --git a/x11/wbar/files/patch-configure b/x11/wbar/files/patch-configure
new file mode 100644
index 000000000000..2ce969ed1f20
--- /dev/null
+++ b/x11/wbar/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./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 /:$/'
+    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
+    done
+    cd ..
+    echo "======================================="
diff --git a/x11/wbar/files/pkg-message.in b/x11/wbar/files/pkg-message.in
deleted file mode 100644
index 1dafbed7aec5..000000000000
--- a/x11/wbar/files/pkg-message.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-*************************************************
-
-    Copy
-    
-        %%DATADIR%%/dot.wbar to ${HOME}/.wbar
-
-    or run the program with
-
-        wbar -config %%DATADIR%%/dot.wbar
-
-*************************************************
diff --git a/x11/wbar/pkg-descr b/x11/wbar/pkg-descr
index 1ea218402cf5..8feeb6e1cba6 100644
--- a/x11/wbar/pkg-descr
+++ b/x11/wbar/pkg-descr
@@ -5,3 +5,5 @@ Gnome, etc.
 
 It can run on top of desktops such as xfdesktop or nautilus with
 the -above-desk switch.
+
+WWW: http://wbar.googlecode.com/
diff --git a/x11/wbar/pkg-plist b/x11/wbar/pkg-plist
index 61c4eb8b4513..fe35fa13583e 100644
--- a/x11/wbar/pkg-plist
+++ b/x11/wbar/pkg-plist
@@ -1,31 +1,26 @@
 @comment $FreeBSD$
 bin/wbar
-%%DATADIR%%/dot.wbar
-%%DATADIR%%/iconpack/comic.ttf
-%%DATADIR%%/iconpack/wbar.osx/acroread.png
-%%DATADIR%%/iconpack/wbar.osx/beagle.png
-%%DATADIR%%/iconpack/wbar.osx/blender.png
-%%DATADIR%%/iconpack/wbar.osx/cedega.png
-%%DATADIR%%/iconpack/wbar.osx/firefox.png
-%%DATADIR%%/iconpack/wbar.osx/font.ttf
-%%DATADIR%%/iconpack/wbar.osx/gearth.png
-%%DATADIR%%/iconpack/wbar.osx/gimp.png
-%%DATADIR%%/iconpack/wbar.osx/gmplayer.png
-%%DATADIR%%/iconpack/wbar.osx/gnucash.png
-%%DATADIR%%/iconpack/wbar.osx/gqview.png
-%%DATADIR%%/iconpack/wbar.osx/inkscape.png
-%%DATADIR%%/iconpack/wbar.osx/mlgui.png
-%%DATADIR%%/iconpack/wbar.osx/nautilus.png
-%%DATADIR%%/iconpack/wbar.osx/ooffice.png
-%%DATADIR%%/iconpack/wbar.osx/osxbarback.png
-%%DATADIR%%/iconpack/wbar.osx/picasa.png
-%%DATADIR%%/iconpack/wbar.osx/psi.png
-%%DATADIR%%/iconpack/wbar.osx/skype.png
-%%DATADIR%%/iconpack/wbar.osx/thunderbird.png
-%%DATADIR%%/iconpack/wbar.osx/vmware.png
-%%DATADIR%%/iconpack/wbar.osx/xmms.png
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%DATADIR%%/iconpack/wbar.osx
-@dirrm %%DATADIR%%/iconpack
+bin/wbar-config
+etc/default/wbar/wbar.cfg
+etc/xdg/autostart/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
+share/pixmaps/wbar.png
+share/pixmaps/wbar/anjuta.png
+share/pixmaps/wbar/bluefish.png
+share/pixmaps/wbar/gimp.png
+share/pixmaps/wbar/ooffice.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 %%DATADIR%%/glade
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/default/wbar
+@dirrm etc/default
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg