4 files changed, 108 insertions, 59 deletions

diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 9c4716520f85..06907d3a8043 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	wbar
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	1.3.1
+#PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	http://www.tecapli.com.ar/rodolfo/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/x11/wbar/distinfo b/x11/wbar/distinfo
index e5e06d49faaa..d25d318c3253 100644
--- a/x11/wbar/distinfo
+++ b/x11/wbar/distinfo
@@ -1,3 +1,3 @@
-MD5 (wbar-1.3.tbz2) = 6d086e13d8fdc09e288d22dbb4b11562
-SHA256 (wbar-1.3.tbz2) = e140553dc740b16d370134277a9597d0a0f5cc33c8ff75e9f57f55ec4936a05e
-SIZE (wbar-1.3.tbz2) = 176599
+MD5 (wbar-1.3.1.tbz2) = 78b2c6d0b320fead09dd15013e57ce94
+SHA256 (wbar-1.3.1.tbz2) = 1c6fcd96e8b5f15a5e38f95a58a5193ad0a2c06d104a36d598c0fe623d42f0d9
+SIZE (wbar-1.3.1.tbz2) = 945160
diff --git a/x11/wbar/files/patch-Makefile b/x11/wbar/files/patch-Makefile
index 1bc176ee7a76..75619953fcc6 100644
--- a/x11/wbar/files/patch-Makefile
+++ b/x11/wbar/files/patch-Makefile
@@ -1,58 +1,50 @@
---- Makefile	Sun Jan 14 18:31:11 2007
-+++ Makefile.port	Sun Feb  4 22:55:12 2007
-@@ -1,7 +1,7 @@
+--- Makefile	2007-08-04 03:38:23.000000000 +0200
++++ Makefile.port	2007-08-18 18:22:32.000000000 +0200
+@@ -1,7 +1,8 @@
  TARGET=wbar
--CXXFLAGS=`imlib2-config --cflags` -Wall -O2 -DCOOLMACHINE_N_SHITCODE -DAVGFILTER #-DDOCKWIN 
+-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 -DCOOLMACHINE_N_SHITCODE -DAVGFILTER #-DDOCKWIN 
-+LDFLAGS+=`imlib2-config --libs`  -Wl
-+DATADIR=%%DATADIR%%
++CXXFLAGS=`imlib2-config --cflags` -Wall #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER
++LDFLAGS=`imlib2-config --libs`  -Wl
++PREFIX=%%DATADIR%%
++ICONPACKDIR=$(PREFIX)/iconpack
  
  	
  sources= XWin.cc Icon.cc Bar.cc IconLoader.cc \
-@@ -14,7 +14,7 @@
+@@ -14,7 +15,7 @@
  $(objects): $(headers) Makefile
  
  $(TARGET): $(objects) 
 -	g++ $(LDFLAGS) -o $(@) $(objects)
 +	${CXX} $(LDFLAGS) -o $(@) $(objects)
- 	strip $(@)
- 
- patch-anim1:
-@@ -29,11 +29,11 @@
- 		exit 1; \
- 	fi
- 
--	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 ./wbar.icons $(PREFIX)/wbar.icons
+ 	#strip $(@)
+ 
+ install: $(TARGET)
+@@ -26,13 +27,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)
+ 
+-	ln -s -t $(PREFIX)/iconpack/wbar.nuvoux ../comic.ttf font.ttf
+-	ln -s -t $(PREFIX)/iconpack/wbar.ice ../comic.ttf font.ttf
+-	ln -s -t $(PREFIX)/iconpack/wbar.osx ../comic.ttf font.ttf
++	ln -s $(ICONPACKDIR)/comic.ttf $(ICONPACKDIR)/wbar.nuvoux/font.ttf 
++	ln -s $(ICONPACKDIR)/comic.ttf $(ICONPACKDIR)/wbar.ice/font.ttf
++	ln -s $(ICONPACKDIR)/comic.ttf $(ICONPACKDIR)/wbar.osx/font.ttf
+ 	
 -	install ./wbar /usr/bin
-+	install -d %%DATADIR%%
-+	awk '{if($$1 ~ /i:/ || ($$1 ~ /t:/ && NR<4)) print $$1" %%DATADIR%%/"$$2; else print $$0;}' \
-+		./dot.wbar > %%DATADIR%%/dot.wbar
-+	cp -pLR ./wbar.icons %%DATADIR%%/wbar.icons
 +	install ./wbar %%PREFIX%%/bin
  
- config:
- 	if [ -f "$(HOME)/.wbar" -o -d "$(HOME)/.wbar.icons" ]; then \
-@@ -42,7 +42,7 @@
- 		if [ "$$recfg" = "y" -o "$$recfg" = "Y" ]; then \
- 			awk '{if($$1 ~ /i:/ || ($$1 ~ /t:/ && NR<4)) print $$1" $(HOME)/"$$2; else print $$0;}' \
- 			    ./dot.wbar > $(HOME)/dot.wbar; \
--			cp -a ./wbar.icons $(HOME)/.wbar.icons; \
-+			cp -pLR ./wbar.icons $(HOME)/.wbar.icons; \
- 		fi \
- 	fi
- 
-@@ -52,8 +52,8 @@
- 		exit 1; \
+ uninstall:
+ 	if [ "`whoami`" != "root" ]; then \
+@@ -41,7 +42,7 @@
  	fi
  
--	rm -rf $(PREFIX)
+ 	rm -rf $(PREFIX)
 -	rm -f /usr/bin/wbar
-+	rm -rf %%DATADIR%%
 +	rm -f %%PREFIX%%/bin/wbar
  
  
diff --git a/x11/wbar/pkg-plist b/x11/wbar/pkg-plist
index a08ec5be2a56..5f211af5170d 100644
--- a/x11/wbar/pkg-plist
+++ b/x11/wbar/pkg-plist
@@ -1,21 +1,78 @@
 @comment $FreeBSD$
 bin/wbar
 %%DATADIR%%/dot.wbar
-%%DATADIR%%/wbar.icons/VeraBd.ttf
-%%DATADIR%%/wbar.icons/acroread.png
-%%DATADIR%%/wbar.icons/firefox.png
-%%DATADIR%%/wbar.icons/gimp.png
-%%DATADIR%%/wbar.icons/gnutella.png
-%%DATADIR%%/wbar.icons/gulls.png
-%%DATADIR%%/wbar.icons/license
-%%DATADIR%%/wbar.icons/osxbarback.png
-%%DATADIR%%/wbar.icons/osxbarback.xcf
-%%DATADIR%%/wbar.icons/power.png
-%%DATADIR%%/wbar.icons/psi.png
-%%DATADIR%%/wbar.icons/term.png
-%%DATADIR%%/wbar.icons/xcalc.png
-%%DATADIR%%/wbar.icons/xmms.png
+%%DATADIR%%/iconpack/comic.ttf
+%%DATADIR%%/iconpack/wbar.ice/acroread.png
+%%DATADIR%%/iconpack/wbar.ice/beagle.png
+%%DATADIR%%/iconpack/wbar.ice/blank.png
+%%DATADIR%%/iconpack/wbar.ice/blender.png
+%%DATADIR%%/iconpack/wbar.ice/cedega.png
+%%DATADIR%%/iconpack/wbar.ice/firefox.png
+%%DATADIR%%/iconpack/wbar.ice/font.ttf
+%%DATADIR%%/iconpack/wbar.ice/gearth.png
+%%DATADIR%%/iconpack/wbar.ice/gimp.png
+%%DATADIR%%/iconpack/wbar.ice/gmplayer.png
+%%DATADIR%%/iconpack/wbar.ice/gnucash.png
+%%DATADIR%%/iconpack/wbar.ice/gqview.png
+%%DATADIR%%/iconpack/wbar.ice/inkscape.png
+%%DATADIR%%/iconpack/wbar.ice/mlgui.png
+%%DATADIR%%/iconpack/wbar.ice/nautilus.png
+%%DATADIR%%/iconpack/wbar.ice/ooffice.png
+%%DATADIR%%/iconpack/wbar.ice/osxbarback.png
+%%DATADIR%%/iconpack/wbar.ice/picasa.png
+%%DATADIR%%/iconpack/wbar.ice/psi.png
+%%DATADIR%%/iconpack/wbar.ice/skype.png
+%%DATADIR%%/iconpack/wbar.ice/thunderbird.png
+%%DATADIR%%/iconpack/wbar.ice/vmware.png
+%%DATADIR%%/iconpack/wbar.ice/xmms.png
+%%DATADIR%%/iconpack/wbar.nuvoux/acroread.png
+%%DATADIR%%/iconpack/wbar.nuvoux/beagle.png
+%%DATADIR%%/iconpack/wbar.nuvoux/blender.png
+%%DATADIR%%/iconpack/wbar.nuvoux/cedega.png
+%%DATADIR%%/iconpack/wbar.nuvoux/firefox.png
+%%DATADIR%%/iconpack/wbar.nuvoux/font.ttf
+%%DATADIR%%/iconpack/wbar.nuvoux/gearth.png
+%%DATADIR%%/iconpack/wbar.nuvoux/gimp.png
+%%DATADIR%%/iconpack/wbar.nuvoux/gmplayer.png
+%%DATADIR%%/iconpack/wbar.nuvoux/gnucash.png
+%%DATADIR%%/iconpack/wbar.nuvoux/gqview.png
+%%DATADIR%%/iconpack/wbar.nuvoux/inkscape.png
+%%DATADIR%%/iconpack/wbar.nuvoux/mlgui.png
+%%DATADIR%%/iconpack/wbar.nuvoux/nautilus.png
+%%DATADIR%%/iconpack/wbar.nuvoux/ooffice.png
+%%DATADIR%%/iconpack/wbar.nuvoux/osxbarback.png
+%%DATADIR%%/iconpack/wbar.nuvoux/picasa.png
+%%DATADIR%%/iconpack/wbar.nuvoux/psi.png
+%%DATADIR%%/iconpack/wbar.nuvoux/skype.png
+%%DATADIR%%/iconpack/wbar.nuvoux/thunderbird.png
+%%DATADIR%%/iconpack/wbar.nuvoux/vmware.png
+%%DATADIR%%/iconpack/wbar.nuvoux/xmms.png
+%%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%%/wbar.icons
-@dirrm %%DATADIR%%/
+@dirrm %%DATADIR%%/iconpack/wbar.ice
+@dirrm %%DATADIR%%/iconpack/wbar.nuvoux
+@dirrm %%DATADIR%%/iconpack/wbar.osx
+@dirrm %%DATADIR%%/iconpack
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%