diff options
Diffstat (limited to 'x11/wbar/files/patch-Makefile')
| -rw-r--r-- | x11/wbar/files/patch-Makefile | 68 |
1 files changed, 30 insertions, 38 deletions
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 |