diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile index 5b282b4b1222..1add6eeb66cf 100644 --- a/x11/wmcliphist/Makefile +++ b/x11/wmcliphist/Makefile @@ -6,7 +6,7 @@ # PORTNAME= wmcliphist -PORTVERSION= 0.4 +PORTVERSION= 0.5 CATEGORIES= x11 windowmaker MASTER_SITES= http://linux.nawebu.cz/wmcliphist/ @@ -17,9 +17,6 @@ USE_X_PREFIX= yes USE_XPM= yes USE_GNOME= gtk12 -pre-patch: - @${RM} ${WRKSRC}/foodock/foodock.o - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin @${MKDIR} ${EXAMPLESDIR} diff --git a/x11/wmcliphist/distinfo b/x11/wmcliphist/distinfo index 6d264bea50dd..71e8985972fe 100644 --- a/x11/wmcliphist/distinfo +++ b/x11/wmcliphist/distinfo @@ -1 +1 @@ -MD5 (wmcliphist-0.4.tar.gz) = 83c8f35fe9e8b719ed6acd08d0e154b1 +MD5 (wmcliphist-0.5.tar.gz) = 7de2d6d1bd948bb76e9e43f87d01b0c2 diff --git a/x11/wmcliphist/files/patch-Makefile b/x11/wmcliphist/files/patch-Makefile index 29d97e0cc896..8120c751554c 100644 --- a/x11/wmcliphist/files/patch-Makefile +++ b/x11/wmcliphist/files/patch-Makefile @@ -1,23 +1,20 @@ ---- Makefile.orig Sat Nov 16 05:57:01 2002 -+++ Makefile Thu Jul 3 00:46:29 2003 -@@ -1,6 +1,4 @@ +--- Makefile.orig Mon Jun 23 18:30:16 2003 ++++ Makefile Sat Aug 9 16:09:52 2003 +@@ -1,11 +1,7 @@ -CC = gcc - -INCLUDES = `gtk-config --cflags` -I. -Ifoodock -g +- +-DESTDIR = "/usr/local/bin" +INCLUDES = `${GTK_CONFIG} --cflags` -I. -Ifoodock - # choose icon - # for light background -@@ -11,7 +9,7 @@ - #ICON_TYPE = 2 - # for normal use --CFLAGS = -Wall -O2 -ansi -pedantic $(INCLUDES) -DICON_TYPE=$(ICON_TYPE) -+CFLAGS += $(INCLUDES) -DICON_TYPE=$(ICON_TYPE) +-CFLAGS = -Wall -O2 -ansi -pedantic $(INCLUDES) ++CFLAGS += $(INCLUDES) DEBUG = # for debuggind purposes -@@ -21,7 +19,7 @@ +@@ -15,7 +11,7 @@ #DEBUG = debug.o @@ -26,12 +23,12 @@ OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o $(DEBUG) -@@ -33,7 +31,7 @@ +@@ -27,7 +23,7 @@ lclint $(INCLUDES) +posixlib *.c >lclint.log wmcliphist: $(OBJECTS) foodock/foodock.o - $(CC) $(LFLAGS) -o $@ $(OBJECTS) foodock/foodock.o + $(CC) $(LFLAGS) -o $@ $(OBJECTS) foodock.o - wmcliphist.o: wmcliphist.c wmcliphist.h icon/wmcliphist_ico_mask.xbm \ - icon/wmcliphist_ico_dark.xpm icon/wmcliphist_ico_mid.xpm \ + wmcliphist.o: wmcliphist.c wmcliphist.h \ + icon/ico_60x60_black.xpm icon/ico_60x60_gray.xpm \ diff --git a/x11/wmcliphist/pkg-message b/x11/wmcliphist/pkg-message index a53f6e89a937..f232b35138b8 100644 --- a/x11/wmcliphist/pkg-message +++ b/x11/wmcliphist/pkg-message @@ -1,4 +1,3 @@ - --------------------------------------------------------------------- Before using this program, edit @@ -6,4 +5,3 @@ Before using this program, edit and copy to your home directory. --------------------------------------------------------------------- -