diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile index 646dda80959..442f009934a 100644 --- a/astro/wmmoonclock/Makefile +++ b/astro/wmmoonclock/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.18 2007/09/15 10:37:22 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2007/12/18 10:39:47 ajacoutot Exp $ COMMENT= wm-dockapp; shows the moon phase DISTNAME= wmMoonClock-1.27 -PKGNAME= ${DISTNAME:L}p0 +PKGNAME= ${DISTNAME:L}p1 CATEGORIES= astro x11 x11/windowmaker -HOMEPAGE= http://dockapps.org/file.php/id/14 - MAINTAINER= Peter Stromberg # GPL @@ -15,6 +13,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= X11 Xext Xpm c m MASTER_SITES= http://humppa.nl/distfiles/ diff --git a/astro/wmmoonclock/patches/patch-Makefile b/astro/wmmoonclock/patches/patch-Makefile index 1d5d1f68bb8..536667fc574 100644 --- a/astro/wmmoonclock/patches/patch-Makefile +++ b/astro/wmmoonclock/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/03 14:07:48 naddy Exp $ +$OpenBSD: patch-Makefile,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $ --- Src/Makefile.orig Tue Mar 23 03:20:32 1999 -+++ Src/Makefile Thu Dec 21 09:16:58 2000 ++++ Src/Makefile Tue Dec 18 10:16:26 2007 @@ -1,8 +1,5 @@ -CC = gcc -CFLAGS = -O2 @@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/03 14:07:48 naddy Exp $ # for Linux LIBS = -lXpm -lX11 -lXext -@@ -13,16 +10,11 @@ +@@ -13,16 +10,11 @@ LIBS = -lXpm -lX11 -lXext OBJS = wmMoonClock.o CalcEphem.o Moon.o MoonRise.o \ xutils.o @@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/03 14:07:48 naddy Exp $ clean: for i in $(OBJS) ; do \ -@@ -31,6 +23,6 @@ +@@ -31,6 +23,6 @@ clean: rm -f wmMoonClock install:: wmMoonClock diff --git a/astro/wmmoonclock/patches/patch-wmMoonClock_c b/astro/wmmoonclock/patches/patch-wmMoonClock_c index 894ba0d371d..a603fdfc611 100644 --- a/astro/wmmoonclock/patches/patch-wmMoonClock_c +++ b/astro/wmmoonclock/patches/patch-wmMoonClock_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-wmMoonClock_c,v 1.1.1.1 2001/01/03 14:07:48 naddy Exp $ +$OpenBSD: patch-wmMoonClock_c,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $ --- Src/wmMoonClock.c.orig Mon Jun 7 16:27:18 1999 -+++ Src/wmMoonClock.c Thu Dec 21 09:41:32 2000 -@@ -162,7 +162,7 @@ ++++ Src/wmMoonClock.c Tue Dec 18 10:16:26 2007 +@@ -162,7 +162,7 @@ int main(int argc, char *argv[]) { int i, n, k, j, ImageNumber; int Year, Month, DayOfWeek, DayOfMonth; int Hours, Mins, Secs, OldSecs, digit, xoff, xsize; @@ -10,7 +10,7 @@ $OpenBSD: patch-wmMoonClock_c,v 1.1.1.1 2001/01/03 14:07:48 naddy Exp $ double UT, val, RA, DEC, UTRise, UTSet, LocalHour, hour24(); int D, H, M, S, sgn, A, B, q; char str[10]; -@@ -771,7 +771,7 @@ +@@ -771,7 +771,7 @@ void ParseCMDLine(int argc, char *argv[]) { print_usage(); exit(-1); } @@ -19,7 +19,7 @@ $OpenBSD: patch-wmMoonClock_c,v 1.1.1.1 2001/01/03 14:07:48 naddy Exp $ } else if (!strcmp(argv[i], "-lc")){ -@@ -780,7 +780,7 @@ +@@ -780,7 +780,7 @@ void ParseCMDLine(int argc, char *argv[]) { print_usage(); exit(-1); } @@ -28,7 +28,7 @@ $OpenBSD: patch-wmMoonClock_c,v 1.1.1.1 2001/01/03 14:07:48 naddy Exp $ } else if (!strcmp(argv[i], "-dc")){ -@@ -789,7 +789,7 @@ +@@ -789,7 +789,7 @@ void ParseCMDLine(int argc, char *argv[]) { print_usage(); exit(-1); } diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile index 89247e20426..049c727ee1a 100644 --- a/astro/wmspaceweather/Makefile +++ b/astro/wmspaceweather/Makefile @@ -1,19 +1,19 @@ -# $OpenBSD: Makefile,v 1.18 2007/09/15 10:37:22 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2007/12/18 10:39:47 ajacoutot Exp $ COMMENT= wm-dockapp; space weather monitor DISTNAME= wmSpaceWeather-1.04 -PKGNAME= ${DISTNAME:L}p0 +PKGNAME= ${DISTNAME:L}p1 CATEGORIES= astro x11 x11/windowmaker -HOMEPAGE= http://dockapps.org/file.php/id/15 - MAINTAINER= Peter Stromberg +# GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= X11 Xext Xpm c MASTER_SITES= http://humppa.nl/distfiles/ diff --git a/astro/wmspaceweather/patches/patch-GetKp b/astro/wmspaceweather/patches/patch-GetKp index 82da4a8cc2c..01f073e6aa5 100644 --- a/astro/wmspaceweather/patches/patch-GetKp +++ b/astro/wmspaceweather/patches/patch-GetKp @@ -1,6 +1,6 @@ -$OpenBSD: patch-GetKp,v 1.1.1.1 2001/01/10 16:54:49 naddy Exp $ +$OpenBSD: patch-GetKp,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $ --- wmSpaceWeather/GetKp.orig Fri Feb 12 06:42:01 1999 -+++ wmSpaceWeather/GetKp Wed Jan 10 14:37:37 2001 ++++ wmSpaceWeather/GetKp Tue Dec 18 10:22:00 2007 @@ -7,19 +7,31 @@ require "ctime.pl"; @@ -32,11 +32,11 @@ $OpenBSD: patch-GetKp,v 1.1.1.1 2001/01/10 16:54:49 naddy Exp $ - if (-e "/tmp/curind.txt"){ - unlink("/tmp/curind.txt"); - } -+ + + ($Year, $Month, $Day) = &year_month_day(); - - $grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt"; ++ + $grabcmd = "wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt"; system "$grabcmd"; diff --git a/astro/wmspaceweather/patches/patch-wmSpaceWeather_c b/astro/wmspaceweather/patches/patch-wmSpaceWeather_c index 22cad689a2b..11d860ebe28 100644 --- a/astro/wmspaceweather/patches/patch-wmSpaceWeather_c +++ b/astro/wmspaceweather/patches/patch-wmSpaceWeather_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-wmSpaceWeather_c,v 1.2 2003/06/18 14:07:14 avsm Exp $ ---- wmSpaceWeather/wmSpaceWeather.c.orig Thu Feb 18 17:57:45 1999 -+++ wmSpaceWeather/wmSpaceWeather.c Wed Jun 18 03:08:57 2003 +$OpenBSD: patch-wmSpaceWeather_c,v 1.3 2007/12/18 10:39:47 ajacoutot Exp $ +--- wmSpaceWeather/wmSpaceWeather.c.orig Thu Feb 18 18:57:45 1999 ++++ wmSpaceWeather/wmSpaceWeather.c Tue Dec 18 10:22:00 2007 @@ -115,7 +115,7 @@ XEvent event; int i, n, s, k, m, dt1, dt2; int Year, Month, Day, DayOfMonth, OldDayOfMonth; @@ -10,7 +10,7 @@ $OpenBSD: patch-wmSpaceWeather_c,v 1.2 2003/06/18 14:07:14 avsm Exp $ int height, UpToDate, LEDOn; double UT, TU, TU2, TU3, T0, gmst, hour24(); -@@ -126,6 +126,7 @@ int Kp[8] = { -1, -1, -1, -1, -1, -1, +@@ -126,6 +126,7 @@ int Kp[8] = { -1, -1, -1, -1, -1, -1, -1, -1 }; double E1, E2, P1, P2, P3; char Xray[10], digit[2]; FILE *fp; @@ -68,7 +68,7 @@ $OpenBSD: patch-wmSpaceWeather_c,v 1.2 2003/06/18 14:07:14 avsm Exp $ if (!UpToDate){ -@@ -560,7 +561,7 @@ void ParseCMDLine(int argc, char *argv[] +@@ -560,7 +561,7 @@ void ParseCMDLine(int argc, char *argv[]) { } else if ((!strcmp(argv[i], "-url"))||(!strcmp(argv[i], "-u"))){ diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile index 6451b856ed9..04d46ccc092 100644 --- a/astro/wmsun/Makefile +++ b/astro/wmsun/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2007/09/15 10:37:22 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.18 2007/12/18 10:39:47 ajacoutot Exp $ COMMENT= wm-dockapp; shows sunrise/sunset times DISTNAME= wmSun-1.03 -PKGNAME= ${DISTNAME:L}p0 +PKGNAME= ${DISTNAME:L}p1 CATEGORIES= astro x11 x11/windowmaker -HOMEPAGE= http://dockapps.org/file.php/id/16 - MAINTAINER= Peter Stromberg # GPL @@ -15,6 +13,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= X11 Xext Xpm c m MASTER_SITES= http://humppa.nl/distfiles/ diff --git a/astro/wmsun/patches/patch-Makefile b/astro/wmsun/patches/patch-Makefile index 04a9b8425f8..9dc2a45b04c 100644 --- a/astro/wmsun/patches/patch-Makefile +++ b/astro/wmsun/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.2 2001/04/23 14:43:11 wilfried Exp $ +$OpenBSD: patch-Makefile,v 1.3 2007/12/18 10:39:47 ajacoutot Exp $ --- wmSun/Makefile.orig Wed Jan 6 03:28:39 1999 -+++ wmSun/Makefile Tue Jan 9 17:53:48 2001 ++++ wmSun/Makefile Tue Dec 18 10:23:20 2007 @@ -1,8 +1,5 @@ -CC = gcc -CFLAGS = -O2 -Wall @@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile,v 1.2 2001/04/23 14:43:11 wilfried Exp $ -@@ -22,14 +19,14 @@ OBJS = wmSun.o SunRise.o ../wmgeneral/ +@@ -22,14 +19,14 @@ OBJS = wmSun.o SunRise.o ../wmgeneral/wmgeneral.o .c.o: