Update to 0.3

5 files changed, 50 insertions, 18 deletions

diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 04dd81a94f02..9b9792337a7d 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmcliphist
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://linux.nawebu.cz/wmcliphist/
 
@@ -18,10 +18,14 @@ USE_GTK=	yes
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/.wmcliphistrc ${EXAMPLESDIR}
 .ifndef(NOPORTDOCS)
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif #NOPORTDOCS
 
+post-install:
+	@${SED} 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/x11/wmcliphist/distinfo b/x11/wmcliphist/distinfo
index f1429a2d2cf5..65a40a72f251 100644
--- a/x11/wmcliphist/distinfo
+++ b/x11/wmcliphist/distinfo
@@ -1 +1 @@
-MD5 (wmcliphist-0.2.tar.gz) = d8d7d6ec26e958c95651c7dd9c7b5d07
+MD5 (wmcliphist-0.3.tar.gz) = e3f4cf211a25c0b2ed31a588f81b8d6c
diff --git a/x11/wmcliphist/files/patch-Makefile b/x11/wmcliphist/files/patch-Makefile
index e028e588cc59..c1eb47fe4879 100644
--- a/x11/wmcliphist/files/patch-Makefile
+++ b/x11/wmcliphist/files/patch-Makefile
@@ -1,20 +1,37 @@
---- Makefile.orig	Tue Mar 20 20:27:15 2001
-+++ Makefile	Fri Jul 27 16:59:05 2001
-@@ -1,13 +1,14 @@
- CC = gcc
--CFLAGS = -Wall -g -ansi `gtk-config --cflags` -I. -Ifoodock
+--- Makefile.orig	Thu Dec 20 11:31:46 2001
++++ Makefile	Sat Feb 16 22:24:52 2002
+@@ -1,6 +1,4 @@
+-CC = gcc
+-
+-INCLUDES = `gtk-config --cflags` -I. -Ifoodock
++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)
+ DEBUG = 
+ 
+ # for debuggind purposes
+@@ -21,7 +19,7 @@
+ #DEBUG = debug.o
+ 
+ 
 -LFLAGS = `gtk-config --libs`
-+CFLAGS += -Wall `${GTK_CONFIG} --cflags` $(INCDIR)
 +LFLAGS = `${GTK_CONFIG} --libs`
-+INCDIR = -I. -Ifoodock -I${X11BASE}/include
- OBJECTS = wmcliphist.o
- TARGET = wmcliphist
  
- all: $(TARGET)
+ 
+ OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o $(DEBUG)
+@@ -33,7 +31,7 @@
+ 	lclint $(INCLUDES) +posixlib *.c >lclint.log
  
  wmcliphist: $(OBJECTS) foodock/foodock.o
 -	$(CC) $(LFLAGS) -o $@ $(OBJECTS) foodock/foodock.o
-+	$(CC) $(CFLAGS) $(LFLAGS) -o $@ $(OBJECTS) foodock.o
- 
- wmcliphist.o: wmcliphist.c icon.xpm foodock/foodock.h
++	$(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 \
diff --git a/x11/wmcliphist/pkg-message b/x11/wmcliphist/pkg-message
new file mode 100644
index 000000000000..a53f6e89a937
--- /dev/null
+++ b/x11/wmcliphist/pkg-message
@@ -0,0 +1,9 @@
+
+---------------------------------------------------------------------
+Before using this program, edit
+
+%%EXAMPLESDIR%%/.wmcliphistrc
+
+and copy to your home directory.
+---------------------------------------------------------------------
+
diff --git a/x11/wmcliphist/pkg-plist b/x11/wmcliphist/pkg-plist
index 2a08594cfcfa..5c06747674ec 100644
--- a/x11/wmcliphist/pkg-plist
+++ b/x11/wmcliphist/pkg-plist
@@ -1,3 +1,5 @@
 bin/wmcliphist
+share/examples/wmcliphist/.wmcliphistrc
 %%PORTDOCS%%share/doc/wmcliphist/README
+@dirrm share/examples/wmcliphist
 %%PORTDOCS%%@dirrm share/doc/wmcliphist