diff options
| author | will <will@FreeBSD.org> | 2000-05-20 05:42:16 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2000-05-20 05:42:16 +0000 |
| commit | a3e03ead0b17c9a1790a074ff7b60e0fc592788d (patch) | |
| tree | 4fe9b479deb1e46555e6a2b5d19c7d723b9aefcd /misc/wmstock/files | |
| parent | eba90c647212eebc42c08fc78c9229f8c7054098 (diff) | |
| download | FreeBSD-ports-a3e03ead0b17c9a1790a074ff7b60e0fc592788d.zip FreeBSD-ports-a3e03ead0b17c9a1790a074ff7b60e0fc592788d.tar.gz | |
Update to 0.11.
Diffstat (limited to 'misc/wmstock/files')
| -rw-r--r-- | misc/wmstock/files/patch-aa | 30 | ||||
| -rw-r--r-- | misc/wmstock/files/patch-ab | 39 |
2 files changed, 22 insertions, 47 deletions
diff --git a/misc/wmstock/files/patch-aa b/misc/wmstock/files/patch-aa index faf869c..2cd644f 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 b4707ad..bde526c 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 |
