diff options
| -rw-r--r-- | time/wmfishtime/Makefile | 7 | ||||
| -rw-r--r-- | time/wmfishtime/PLIST | 3 | ||||
| -rw-r--r-- | time/wmfishtime/distinfo | 10 | ||||
| -rw-r--r-- | time/wmfishtime/patches/patch-aa | 32 | ||||
| -rw-r--r-- | time/wmfishtime/patches/patch-ba | 59 | ||||
| -rw-r--r-- | time/wmfishtime/patches/patch-bb | 23 |
6 files changed, 109 insertions, 25 deletions
diff --git a/time/wmfishtime/Makefile b/time/wmfishtime/Makefile index 4a2d5d154b0..f9cf0fc49ad 100644 --- a/time/wmfishtime/Makefile +++ b/time/wmfishtime/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2001/04/14 20:35:09 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.3 2002/01/19 04:58:49 mjl Exp $ # -DISTNAME= wmfishtime-1.1 +DISTNAME= wmfishtime-1.23 CATEGORIES= time x11 MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/ @@ -13,7 +13,6 @@ DEPENDS+= gtk+>=1.2.9:../../x11/gtk USE_X11BASE= # defined -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmfishtime ${PREFIX}/bin +MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_MAN="${INSTALL_MAN}" .include "../../mk/bsd.pkg.mk" diff --git a/time/wmfishtime/PLIST b/time/wmfishtime/PLIST index 5e009f17957..9170b28a73c 100644 --- a/time/wmfishtime/PLIST +++ b/time/wmfishtime/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:19:20 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/01/19 04:58:49 mjl Exp $ bin/wmfishtime +man/man1/wmfishtime.1 diff --git a/time/wmfishtime/distinfo b/time/wmfishtime/distinfo index 72383548ce8..a7af97a5558 100644 --- a/time/wmfishtime/distinfo +++ b/time/wmfishtime/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 14:47:17 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/01/19 04:58:49 mjl Exp $ -SHA1 (wmfishtime-1.1.tar.gz) = 68eb77ddb615bba9d81ce007d1aa178f0e6a6e1b -Size (wmfishtime-1.1.tar.gz) = 18024 bytes -SHA1 (patch-aa) = 9d1fce473272ecc617ef15272441b59ca735a4d6 +SHA1 (wmfishtime-1.23.tar.gz) = d5ce95b0937014a17573c604e626a88d8f449b58 +Size (wmfishtime-1.23.tar.gz) = 21730 bytes +SHA1 (patch-aa) = 9d2ed962ecea8b5093994764a2f09eb771490479 +SHA1 (patch-ba) = cd739472544fe79dcc12b22fa0b1dbc0281ac7bd +SHA1 (patch-bb) = d35e6a640d89db0ea2ae60101cffb1957e836f58 diff --git a/time/wmfishtime/patches/patch-aa b/time/wmfishtime/patches/patch-aa index 280f1d35891..655f21e0c15 100644 --- a/time/wmfishtime/patches/patch-aa +++ b/time/wmfishtime/patches/patch-aa @@ -1,21 +1,19 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/04/09 06:46:12 kei Exp $ - ---- Makefile.orig Mon Apr 2 23:41:25 2001 -+++ Makefile Mon Apr 2 23:44:11 2001 -@@ -8,10 +8,10 @@ - # from that window, either. Again, complain to the developers. This is out - # of my control. - # --# EXTRA = -DI_HAVE_A_BROKEN_WM -+EXTRA = -DI_HAVE_A_BROKEN_WM +--- Makefile.orig Sat May 26 22:49:41 2001 ++++ Makefile Sat Jan 19 05:48:48 2002 +@@ -2,22 +2,22 @@ + DESTDIR = # where to install this program --PREFIX = /usr/local -+# PREFIX = /usr/local +-PREFIX = $(DESTDIR)/usr/X11R6 ++# PREFIX = $(DESTDIR)/usr/X11R6 # no user serviceable parts below this line # optimization cflags -@@ -22,11 +22,11 @@ +-CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA} ++CFLAGS += -O3 -Wall `gtk-config --cflags` ${EXTRA} + # profiling cflags + # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO + # test coverage cflags # CFLAGS=-fprofile-arcs -ftest-coverage -Wall -ansi -pedantic -g `gtk-config --cflags` ${EXTRA} -DPRO @@ -30,9 +28,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/09 06:46:12 kei Exp $ all: wmfishtime -@@ -37,4 +37,4 @@ - rm -rf wmfishtime *.o *.bb* *.gcov gmon.* *.da *~ .xvpics +@@ -29,5 +29,5 @@ + # You're going to have to be root to do this! install: - install $(INSTALL) wmfishtime $(PREFIX)/bin -+ $(INSTALL) wmfishtime $(PREFIX)/bin +- install $(INSTALL) wmfishtime.1 $(PREFIX)/man/man1 ++ $(INSTALL_PROGRAM) wmfishtime $(PREFIX)/bin ++ $(INSTALL_MAN) wmfishtime.1 $(PREFIX)/man/man1 diff --git a/time/wmfishtime/patches/patch-ba b/time/wmfishtime/patches/patch-ba new file mode 100644 index 00000000000..ec5db7c43d0 --- /dev/null +++ b/time/wmfishtime/patches/patch-ba @@ -0,0 +1,59 @@ +--- fishmon.c.orig Sat Jan 19 05:37:10 2002 ++++ fishmon.c Sat Jan 19 05:42:15 2002 +@@ -1017,6 +1017,8 @@ + static void parse_options(int argc, char **argv) + { + static int ch = 0; ++ ++#if 0 + static struct option long_opts[] = { + { "h", no_argument, NULL, 1 }, + { "help", no_argument, NULL, 1 }, +@@ -1041,15 +1043,43 @@ + break; + } + } ++#else ++ extern char *optarg; ++ extern int optind; ++ extern int optopt; ++ extern int opterr; ++ extern int optreset; ++ ++ while((ch = getopt(argc, argv, "bchv")) != -1) ++ { ++ switch(ch) ++ { ++ case 'b': ++ broken_wm = 1; ++ break; ++ case 'c': ++ enable_check_mail = 1; ++ break; ++ case 'v': ++ do_version(); ++ exit(0); ++ case 'h': ++ default: ++ do_help(); ++ exit(1); ++ } ++ } ++ ++#endif + } + + static void do_help(void) + { + printf("Usage: wmfishtime [options]\n\n" +- " -h\t--help\t\tshow this message and exit\n" +- " -v\t--version\tshow version and exit\n" +- " -c\t--check-mail\tenables check for new mail\n" +- " -b\t--broken\tactivates broken window manager fix\n\n" ++ " -h\tshow this message and exit\n" ++ " -v\tshow version and exit\n" ++ " -c\tenables check for new mail\n" ++ " -b\tactivates broken window manager fix\n\n" + "Yet Another Waste of CPU Cycles! Dock app clock with\n" + "shy fish, bubbles and mail check functionality (disabled by default).\n" + "Try out the man page wmfishtime (1x).\n"); diff --git a/time/wmfishtime/patches/patch-bb b/time/wmfishtime/patches/patch-bb new file mode 100644 index 00000000000..a60b4e7b13a --- /dev/null +++ b/time/wmfishtime/patches/patch-bb @@ -0,0 +1,23 @@ +--- wmfishtime.1.orig Sat Jan 19 05:55:30 2002 ++++ wmfishtime.1 Sat Jan 19 05:55:48 2002 +@@ -54,16 +54,16 @@ + + .SH OPTIONS + .TP +-.B \-h, ,\-help, \-\-help ++.B \-h + Show summary of options. + .TP +-.B \-v, ,\-version, \-\-version ++.B \-v + Show version of program. + .TP +-.B \-c, \-check\-mail, \-\-check\-mail ++.B \-c + Enables mail checking. + .TP +-.B \-b, \-broken, \-\-broken ++.B \-b + Activate fix for broken window managers. + .SH SEE ALSO + http://www.ne.jp/asahi/linux/timecop/ |