Update to 0.1.3, and change that horrible COMMENT= string. FWIW, that

string was taken from the author's description.

Prompted by:	fenner's portsurvey (the old version didn't fetch)

5 files changed, 36 insertions, 40 deletions

diff --git a/misc/wmtunlo/Makefile b/misc/wmtunlo/Makefile
index 203fbb5dea16..eb65d1cd7e96 100644
--- a/misc/wmtunlo/Makefile
+++ b/misc/wmtunlo/Makefile
@@ -6,29 +6,20 @@
 #
 
 PORTNAME=	wmtunlo
-PORTVERSION=	0.1.1
+PORTVERSION=	0.1.3
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	http://clay.ll.pl/download/
 
 MAINTAINER=	adamw@FreeBSD.org
-COMMENT=	A bo(O)oooring 2d tunnel in wmaker dock
+COMMENT=	A falling-down-a-tunnel dockapp
 
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_XPM=	yes
-
-post-patch:
-.for i in 1 2 3 4 5
-	@${REINPLACE_CMD} -e 's|./wmtunlo|${PREFIX}/bin/wmtunlo|g' \
-		${WRKSRC}/example${i}
-.endfor
+ALL_TARGET=	wmtunlo
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/wmtunlo ${PREFIX}/bin
 	@${MKDIR} ${EXAMPLESDIR}
-.for i in 1 2 3 4 5
-	@${INSTALL_SCRIPT} ${WRKSRC}/example${i} \
-		${EXAMPLESDIR}/wmtunlo.example${i}
-.endfor
+	@${INSTALL_SCRIPT} ${WRKSRC}/examples/* \
+		${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/wmtunlo/distinfo b/misc/wmtunlo/distinfo
index 2f3fc4d72ff9..f4ff9339a502 100644
--- a/misc/wmtunlo/distinfo
+++ b/misc/wmtunlo/distinfo
@@ -1 +1 @@
-MD5 (wmtunlo-0.1.1.tar.gz) = b42e51207da0d483dec02e2b7a7ba117
+MD5 (wmtunlo-0.1.3.tar.gz) = 007a4b009cc68f55c9a483bfa87efd4e
diff --git a/misc/wmtunlo/files/patch-Makefile b/misc/wmtunlo/files/patch-Makefile
index 97161b5eca84..d24a245cb863 100644
--- a/misc/wmtunlo/files/patch-Makefile
+++ b/misc/wmtunlo/files/patch-Makefile
@@ -1,22 +1,23 @@
---- Makefile.orig	Sat Jul 20 04:32:12 2002
-+++ Makefile	Sat Jul 27 02:18:29 2002
-@@ -1,14 +1,15 @@
+--- Makefile.orig	Fri Nov  7 16:00:13 2003
++++ Makefile	Fri Nov  7 16:01:42 2003
+@@ -1,15 +1,15 @@
  
- wmTunlo: wmtunlo.o wmgeneral.o
--	gcc wmgeneral.o wmtunlo.o -o wmtunlo -L/usr/X11R6/lib -lXpm -lX11 -lXext -lm
-+	${CC} wmgeneral.o wmtunlo.o -o wmtunlo \
-+		-L${X11BASE}/lib -lXpm -lX11 -lXext -lm
+-CFLAGS			= -Wall -Os
+-INCS			= -I/usr/X11R6/include/X11
+-LIBS			= -L/usr/X11R6/lib -lXpm -lX11 -lXext -lm
++CFLAGS			+= -Wall
++INCS			= -I${X11BASE}/include -I${X11BASE}/include/X11
++LIBS			= -L${X11BASE}/lib -lXpm -lX11 -lXext -lm
+ INSTALL_PREFIX	= /usr/local
  
- wmtunlo.o: wmtunlo.c wmgeneral.c wmgeneral.h dock-master.xpm dock-mask.xbm
--	gcc -O3 -Wall -c wmtunlo.c
-+	${CC} $(CFLAGS) -c wmtunlo.c -I${X11BASE}/include
  
- wmgeneral.o: wmgeneral.c wmgeneral.h
--	gcc -O3 -Wall -c wmgeneral.c -I/usr/X11R6/include/X11
-+	${CC} $(CFLAGS) -c wmgeneral.c -I${X11BASE}/include
+ wmtunlo: docklib.o wmtunlo.c mask.h master.h
+-	gcc $(CFLAGS) $(INCS) docklib.o wmtunlo.c -o wmtunlo $(LIBS)
++	${CC} $(CFLAGS) $(INCS) docklib.o wmtunlo.c -o wmtunlo $(LIBS)
  
- clean:
- 	rm -f *~ *.o wmtunlo
+ docklib.o: docklib.c docklib.h
+-	gcc $(CFLAGS) $(INCS) -c docklib.c
++	${CC} $(CFLAGS) $(INCS) -c docklib.c
  
--
-+all: wmTunlo
+ install:
+ 	cp ./wmtunlo $(INSTALL_PREFIX)/bin
diff --git a/misc/wmtunlo/pkg-descr b/misc/wmtunlo/pkg-descr
index d2d2468a0f83..b1bf4040d7a6 100644
--- a/misc/wmtunlo/pkg-descr
+++ b/misc/wmtunlo/pkg-descr
@@ -1,6 +1,6 @@
 This is a WindowMaker dockapp that displays a zooming 2-D tunnel.
-The visualization is highly customizable, using 14 arguments. 5
-example customizations are provided as shell scripts, named
-wmtunlo.example1 through wmtunlo.example5.
+The visualization is highly customizable, and a number of example
+configuration files are included. Very hypnotic, and will greatly
+assist you in not getting any work done.
 
 - Adam Weinberger <adamw@FreeBSD.org>
diff --git a/misc/wmtunlo/pkg-plist b/misc/wmtunlo/pkg-plist
index 85e1ed75fd1d..5a9f424eda7e 100644
--- a/misc/wmtunlo/pkg-plist
+++ b/misc/wmtunlo/pkg-plist
@@ -1,7 +1,11 @@
 bin/wmtunlo
-share/examples/wmtunlo/wmtunlo.example1
-share/examples/wmtunlo/wmtunlo.example2
-share/examples/wmtunlo/wmtunlo.example3
-share/examples/wmtunlo/wmtunlo.example4
-share/examples/wmtunlo/wmtunlo.example5
+share/examples/wmtunlo/wmtunlorc.example1
+share/examples/wmtunlo/wmtunlorc.example2
+share/examples/wmtunlo/wmtunlorc.example3
+share/examples/wmtunlo/wmtunlorc.example4
+share/examples/wmtunlo/wmtunlorc.example5
+share/examples/wmtunlo/wmtunlorc.example6
+share/examples/wmtunlo/wmtunlorc.example7
+share/examples/wmtunlo/wmtunlorc.example8
+share/examples/wmtunlo/wmtunlorc.original
 @dirrm share/examples/wmtunlo