Attachment #213406 for bug #245539




# Created by: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
# $FreeBSD$

PORTNAME=	wmmoonclock
PORTVERSION=	1.29
PORTREVISION=	3
CATEGORIES=	astro windowmaker
MASTER_SITES=	https://www.dockapps.net/download/

MAINTAINER=	mbeis@xs4all.nl
COMMENT=	Displays the phase of the moon, plus orbital data


LICENSE=	GPLv2

GNU_CONFIGURE=	yes
USES=		autoreconf:build pkgconfig xorg
USE_XORG+=	x11 xext xpm

USES=		gmake xorg
USE_XORG=	xpm

PLIST_FILES=	bin/wmmoonclock man/man1/wmmoonclock.1.gz

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/wmmoonclock ${STAGEDIR}${PREFIX}/bin/wmmoonclock
	${INSTALL_MAN} ${WRKSRC}/src/wmMoonClock.1 ${STAGEDIR}${PREFIX}/man/man1/wmmoonclock.1

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)astro/wmmoonclock/distinfo (-2 / +3 lines)
1	SHA256 (wmMoonClock-1.27.tar.gz) = 439d330a30ee1cb084e0512e894f5e1a2e9869745a2274fbd9a56832c1527c77	1	TIMESTAMP = 1586605073
2	SIZE (wmMoonClock-1.27.tar.gz) = 155197	2	SHA256 (wmmoonclock-1.29.tar.gz) = beb9e108d90027df4bf2252b3669c153c858976c1099be3462d536073435203a
		3	SIZE (wmmoonclock-1.29.tar.gz) = 234991




--- Makefile.orig	1999-03-23 02:20:32 UTC
+++ Makefile
@@ -1,8 +1,8 @@
-CC     = gcc
-CFLAGS = -O2
-INCDIR = -I/usr/X11R6/include/X11
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
+CC     ?= gcc
+CFLAGS ?= -O2
+INCDIR = -I${LOCALBASE}/include
+DESTDIR= ${PREFIX}
+LIBDIR = -L${LOCALBASE}/lib
 
 # for Linux
 LIBS   = -lXpm -lX11 -lXext




--- src/wmMoonClock.c.orig	2017-08-14 22:31:05 UTC
+++ src/wmMoonClock.c
@@ -157,7 +157,8 @@ int main(int argc, char *argv[]) {
     struct tm		*GMTTime, *LocalTime;
     XEvent		event;
     int			i, n, j, ImageNumber, Year, Month, DayOfMonth, digit;
-    long		CurrentLocalTime, CurrentGMTTime, date;
+    time_t		CurrentLocalTime, CurrentGMTTime;
+    long		date;
     double		UT, val, RA, DEC, UTRise, UTSet, LocalHour, hour24();
     int			D, H, M, S, sgn, A, B, q;
     CTrans           	c;




--- wmMoonClock.c.orig	1999-06-07 14:27:18 UTC
+++ wmMoonClock.c
@@ -162,7 +162,8 @@ 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;
-    long		CurrentLocalTime, CurrentGMTTime, date;
+    time_t		CurrentLocalTime, CurrentGMTTime;
+    long		date;
     double		UT, val, RA, DEC, UTRise, UTSet, LocalHour, hour24();
     int			D, H, M, S, sgn, A, B, q;
     char		str[10];

Lines 5-8 Link Here

(-)astro/wmmoonclock/pkg-descr (-1 / +1 lines)
5		5
6	Probably most of the data is not that useful, but what the heck :)	6	Probably most of the data is not that useful, but what the heck :)
7		7
8	WWW: http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmmoonclock	8	WWW: https://www.dockapps.net/wmmoonclock

Return to bug 245539

Lines 1-11 Link Here

(-)astro/wmmoonclock/Makefile (-10 / +8 lines)
1	# Created by: Kris Kennaway <kkennawa@physics.adelaide.edu.au>	1	# Created by: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= wmMoonClock	4	PORTNAME= wmmoonclock
5	PORTVERSION= 1.27	5	PORTVERSION= 1.29
6	PORTREVISION= 3
7	CATEGORIES= astro windowmaker	6	CATEGORIES= astro windowmaker
8	MASTER_SITES= http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/	7	MASTER_SITES= https://www.dockapps.net/download/
9		8
10	MAINTAINER= mbeis@xs4all.nl	9	MAINTAINER= mbeis@xs4all.nl
11	COMMENT= Displays the phase of the moon, plus orbital data	10	COMMENT= Displays the phase of the moon, plus orbital data
Lines 12-26 Link Here
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14		13
15	WRKSRC= ${WRKDIR}/${DISTNAME}/Src	14	GNU_CONFIGURE= yes
		15	USES= autoreconf:build pkgconfig xorg
		16	USE_XORG+= x11 xext xpm
16		17
17	USES= gmake xorg
18	USE_XORG= xpm
19
20	PLIST_FILES= bin/wmmoonclock man/man1/wmmoonclock.1.gz	18	PLIST_FILES= bin/wmmoonclock man/man1/wmmoonclock.1.gz
21		19
22	do-install:	20	do-install:
23	${INSTALL_PROGRAM} ${WRKSRC}/wmMoonClock ${STAGEDIR}${PREFIX}/bin/wmmoonclock	21	${INSTALL_PROGRAM} ${WRKSRC}/wmmoonclock ${STAGEDIR}${PREFIX}/bin/wmmoonclock
24	${INSTALL_MAN} ${WRKSRC}/wmMoonClock.1 ${STAGEDIR}${PREFIX}/man/man1/wmmoonclock.1	22	${INSTALL_MAN} ${WRKSRC}/src/wmMoonClock.1 ${STAGEDIR}${PREFIX}/man/man1/wmmoonclock.1
25		23
26	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)astro/wmmoonclock/files/patch-Makefile (-16 lines)
1	--- Makefile.orig 1999-03-23 02:20:32 UTC
2	+++ Makefile
3	@@ -1,8 +1,8 @@
4	-CC = gcc
5	-CFLAGS = -O2
6	-INCDIR = -I/usr/X11R6/include/X11
7	-DESTDIR= /usr/X11R6
8	-LIBDIR = -L/usr/X11R6/lib
9	+CC ?= gcc
10	+CFLAGS ?= -O2
11	+INCDIR = -I${LOCALBASE}/include
12	+DESTDIR= ${PREFIX}
13	+LIBDIR = -L${LOCALBASE}/lib
14
15	# for Linux
16	LIBS = -lXpm -lX11 -lXext

Line 0 Link Here

(-)astro/wmmoonclock/files/patch-src_wmMoonClock.c (+12 lines)
	1	--- src/wmMoonClock.c.orig 2017-08-14 22:31:05 UTC
	2	+++ src/wmMoonClock.c
	3	@@ -157,7 +157,8 @@ int main(int argc, char *argv[]) {
	4	struct tm GMTTime, LocalTime;
	5	XEvent event;
	6	int i, n, j, ImageNumber, Year, Month, DayOfMonth, digit;
	7	- long CurrentLocalTime, CurrentGMTTime, date;
	8	+ time_t CurrentLocalTime, CurrentGMTTime;
	9	+ long date;
	10	double UT, val, RA, DEC, UTRise, UTSet, LocalHour, hour24();
	11	int D, H, M, S, sgn, A, B, q;
	12	CTrans c;

Lines 1-12 Link Here

(-)astro/wmmoonclock/files/patch-wmMoonClock.c (-12 lines)
1	--- wmMoonClock.c.orig 1999-06-07 14:27:18 UTC
2	+++ wmMoonClock.c
3	@@ -162,7 +162,8 @@ int main(int argc, char *argv[]) {
4	int i, n, k, j, ImageNumber;
5	int Year, Month, DayOfWeek, DayOfMonth;
6	int Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
7	- long CurrentLocalTime, CurrentGMTTime, date;
8	+ time_t CurrentLocalTime, CurrentGMTTime;
9	+ long date;
10	double UT, val, RA, DEC, UTRise, UTSet, LocalHour, hour24();
11	int D, H, M, S, sgn, A, B, q;
12	char str[10];