Update to 0.11.

4 files changed, 28 insertions, 54 deletions

diff --git a/misc/wmstock/Makefile b/misc/wmstock/Makefile
index 3afa3a3ddafc..fb032b8a4abe 100644
--- a/misc/wmstock/Makefile
+++ b/misc/wmstock/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	wmstock
-PORTVERSION=	0.06
+PORTVERSION=	0.11
 CATEGORIES=	misc windowmaker
-MASTER_SITES=	http://mattfischer.com/wmstock/src/ \
-		http://www.psn.net/~andrews/wmstock/
+MASTER_SITES=	http://mattfischer.com/wmstock/src/
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -22,8 +21,8 @@ USE_GMAKE=	yes
 MAN1=		wmstock.1
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/wmstock ${PREFIX}/bin/wmstock
-	@${INSTALL_SCRIPT} ${WRKSRC}/testqt.pl ${PREFIX}/bin/testqt.pl
-	@${INSTALL_MAN} ${WRKSRC}/wmstock.1x ${PREFIX}/man/man1/wmstock.1
+	${INSTALL_PROGRAM} ${WRKSRC}/wmstock ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/getquote ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wmstock.1x ${PREFIX}/man/man1/wmstock.1
 
 .include <bsd.port.mk>
diff --git a/misc/wmstock/distinfo b/misc/wmstock/distinfo
index de40fe753295..1c12305b8f1d 100644
--- a/misc/wmstock/distinfo
+++ b/misc/wmstock/distinfo
@@ -1 +1 @@
-MD5 (wmstock-0.06.tar.gz) = 56687a81ad7fe74b67856d0369bcea8b
+MD5 (wmstock-0.11.tar.gz) = 9dcc25199f786298cea980d79ee83dbe
diff --git a/misc/wmstock/files/patch-aa b/misc/wmstock/files/patch-aa
index faf869cc57c2..2cd644f1a901 100644
--- a/misc/wmstock/files/patch-aa
+++ b/misc/wmstock/files/patch-aa
@@ -1,34 +1,28 @@
---- testqt.pl.orig	Sun Aug  1 19:46:56 1999
-+++ testqt.pl	Sun Aug  1 19:48:47 1999
-@@ -1,11 +1,11 @@
+--- getquote	Sun May 14 13:28:49 2000
++++ getquote.new	Sat May 20 01:37:30 2000
+@@ -1,6 +1,6 @@
  #!/usr/bin/perl
  	
--	$wget_loc = `which wget`;
-+	$wget_loc = `which fetch`;
- 	chop $wget_loc;
+-	$wget_loc = "wget";
++	$wget_loc = "fetch";
  
- 	if (!$wget_loc) 
- 	{
--		die "testqt.pl:: Could not find wget.  If it is not in your path please add it to your path.  If it is not installed please install it.\n";
-+		die "testqt.pl:: Could not find fetch.  If it is not in your path please add it to your path.  If it is not installed please install it.\n";
- 	}
+ 	# used to have some "which" here, replaced it..
  
- 	$home = (getpwuid($<))[7];
-@@ -78,7 +78,7 @@
+@@ -77,7 +77,7 @@
  	#
  
  	$tempfile = "stock.tmp.$$";
 -	$wget_args = " --cache=off --tries 0 -q -O $home/.wmstock/$tempfile \"$URL\"";
 +	$wget_args = " -p -o $home/.wmstock/$tempfile \"$URL\"";
  	$command = $wget_loc.$wget_args;
- 	system "$wget_loc$wget_args";
- 	sleep(3);
-@@ -115,7 +115,7 @@
+ 	$result = system ("$wget_loc$wget_args");
+ 	if ($result != 0) {
+@@ -118,7 +118,7 @@
          $version = $_[0];
- 	$vtempfile = ".newest";
+ 	$vtempfile = "newest";
          $vers_url="http://www.mattfischer.com/wmstock/src/$vtempfile";
 -	$wget_args = " --cache=off --tries 0 -q -O $home/.wmstock/$vtempfile \"$vers_url\"";
 +	$wget_args = " -p -o $home/.wmstock/$vtempfile \"$vers_url\"";
+ 
          $command = $wget_loc.$wget_args;
  
- 	print "Please wait while I check for a new version.\n";
diff --git a/misc/wmstock/files/patch-ab b/misc/wmstock/files/patch-ab
index b4707ad937f5..bde526c3a636 100644
--- a/misc/wmstock/files/patch-ab
+++ b/misc/wmstock/files/patch-ab
@@ -1,41 +1,22 @@
---- Makefile.orig	Wed Jul  7 12:22:08 1999
-+++ Makefile	Sun Aug  1 19:45:11 1999
-@@ -2,13 +2,13 @@
+--- Makefile	Wed Apr 19 11:17:30 2000
++++ Makefile.new	Sat May 20 01:34:48 2000
+@@ -2,14 +2,15 @@
  # <mfischer@umr.edu>
  # based on wmWeather - see ../Credits for more information
  
 -CC     = gcc
--CFLAGS = -O2 -g -Wall
 +CC     ?= gcc
-+CFLAGS += -g -Wall
- DEBUG  = -DMLF_DEBUG
+ DEBUG  = -DMLF_DEBUG -DTIME_DEBUG
  GCOV   = -fprofile-arcs -ftest-coverage
+ 
+ #standard, should work for most Linux/Solaris (may need to be changed for HP)
 -INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
 -DESTDIR= /usr/X11R6
 -LIBDIR = -L/usr/X11R6/lib
-+INCDIR = -I${PREFIX}/include/X11 -I${PREFIX}/include
++X11BASE	?= /usr/X11R6
++INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include
 +DESTDIR= ${PREFIX}
-+LIBDIR = -L${PREFIX}/lib
++LIBDIR = -L${X11BASE}/lib
+ 
  # for linux
  LIBS   = -lXpm -lX11 -lXext
- # for Solaris
-@@ -22,10 +22,6 @@
- .c.o:
- 	$(CC) $(CFLAGS) -c $< -o $*.o $(INCDIR)
- 
--#	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
--#       no longer need the -D<uname>...
--
--
- all:	wmstock.o wmstock
- 
- wmstock.o: wmstock_master.xpm wmstock_mask.xbm
-@@ -43,8 +39,3 @@
- 		rm -f $$i; \
- 	done
- 	rm -f wmstock
--
--install:: wmstock
--	install -c -s -m 0755 wmstock $(DESTDIR)/bin
--	install -c    -m 0755 testqt.pl $(DESTDIR)/bin
--	install -c    -m 0644 wmstock.1x $(DESTDIR)/man/man1