4 files changed, 18 insertions, 69 deletions

diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 06907d3a8043..c232097de0ab 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wbar
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.3
 #PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	http://www.tecapli.com.ar/rodolfo/ \
diff --git a/x11/wbar/distinfo b/x11/wbar/distinfo
index d25d318c3253..7d5fb87b87e6 100644
--- a/x11/wbar/distinfo
+++ b/x11/wbar/distinfo
@@ -1,3 +1,3 @@
-MD5 (wbar-1.3.1.tbz2) = 78b2c6d0b320fead09dd15013e57ce94
-SHA256 (wbar-1.3.1.tbz2) = 1c6fcd96e8b5f15a5e38f95a58a5193ad0a2c06d104a36d598c0fe623d42f0d9
-SIZE (wbar-1.3.1.tbz2) = 945160
+MD5 (wbar-1.3.3.tbz2) = 542335a273188de0d6a93102501351a4
+SHA256 (wbar-1.3.3.tbz2) = 431c5f7a8b6b065e2fe32a6482476a5ecefdf838aee550cae381ba64cb79eb4b
+SIZE (wbar-1.3.3.tbz2) = 429098
diff --git a/x11/wbar/files/patch-Makefile b/x11/wbar/files/patch-Makefile
index 75619953fcc6..831dafa29860 100644
--- a/x11/wbar/files/patch-Makefile
+++ b/x11/wbar/files/patch-Makefile
@@ -1,46 +1,42 @@
---- Makefile	2007-08-04 03:38:23.000000000 +0200
-+++ Makefile.port	2007-08-18 18:22:32.000000000 +0200
-@@ -1,7 +1,8 @@
+--- 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
++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 +15,7 @@
+@@ -14,7 +14,7 @@
  $(objects): $(headers) Makefile
  
  $(TARGET): $(objects) 
 -	g++ $(LDFLAGS) -o $(@) $(objects)
-+	${CXX} $(LDFLAGS) -o $(@) $(objects)
++	$(CXX) $(LDFLAGS) -o $(@) $(objects)
  	#strip $(@)
  
  install: $(TARGET)
-@@ -26,13 +27,13 @@
+@@ -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)
- 
--	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
++	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 +42,7 @@
+@@ -41,7 +41,7 @@
  	fi
  
  	rm -rf $(PREFIX)
diff --git a/x11/wbar/pkg-plist b/x11/wbar/pkg-plist
index 5f211af5170d..61c4eb8b4513 100644
--- a/x11/wbar/pkg-plist
+++ b/x11/wbar/pkg-plist
@@ -2,51 +2,6 @@
 bin/wbar
 %%DATADIR%%/dot.wbar
 %%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
@@ -70,8 +25,6 @@ bin/wbar
 %%DATADIR%%/iconpack/wbar.osx/vmware.png
 %%DATADIR%%/iconpack/wbar.osx/xmms.png
 %%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%DATADIR%%/iconpack/wbar.ice
-@dirrm %%DATADIR%%/iconpack/wbar.nuvoux
 @dirrm %%DATADIR%%/iconpack/wbar.osx
 @dirrm %%DATADIR%%/iconpack
 @dirrm %%DATADIR%%