Attachment #202937 for bug #235526




# $FreeBSD$

PORTNAME=	wmsun
PORTVERSION=	1.05
PORTEPOCH=	1
CATEGORIES=	astro windowmaker
MASTER_SITES=	https://www.dockapps.net/download/
DISTNAME=	wmSun-${PORTVERSION}

MAINTAINER=	mbeis@xs4all.nl
COMMENT=	Dockapp that displays the rise and set times of the Sun

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libdockapp.so:x11-wm/libdockapp

USE_XORG=	xext xpm x11

MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
		INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib"
MAKE_JOBS_UNSAFE=	yes

PLIST_FILES=	bin/wmsun man/man1/wmsun.1.gz
WRKSRC=		${WRKDIR}/dockapps-a1e67bd

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/wmsun ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/wmsun.1 ${STAGEDIR}${MAN1PREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)astro/wmsun/distinfo (-2 / +3 lines)
1	SHA256 (wmSun-1.12.tar.gz) = d05fb019dd835fc33b2c7c3fb7cf1b6a8cd7fe59b62c8d3fa00ddd0f776da15d	1	TIMESTAMP = 1549747586
2	SIZE (wmSun-1.12.tar.gz) = 147170	2	SHA256 (wmsun-1.05.tar.gz) = 29c7d2da4c0731a20955af9ba01bde3901dc269bfa1020ff707927c62d5b83a0
		3	SIZE (wmsun-1.05.tar.gz) = 20640




--- Makefile.orig	2015-08-28 11:57:39 UTC
+++ Makefile
@@ -19,14 +19,14 @@ LIBS   = -lXpm -lX11 -lXext -lm -ldockapp
 OBJS   = wmsun.o SunRise.o
 
 .c.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ $(INCDIR)
 
 all:	wmsun.o wmsun
 
 wmsun.o: wmSun_master.xpm wmSun_mask.xbm
-	$(CC) $(COPTS) $(SYSTEM) -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
+	$(CC) $(CFLAGS) $(SYSTEM) -o wmSun $(OBJS) $(LIBDIR) $(LIBS)
 
 wmsun:	$(OBJS)
-	$(CC) $(LDFLAGS) -o wmsun $^ $(LIBS)
+	$(CC) $(LDFLAGS) -o wmsun $(OBJS) $(LIBDIR) $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \




--- wmSun.c.orig	2015-04-01 21:07:58 UTC
+++ wmSun.c
@@ -76,7 +76,8 @@ int main(int argc, char *argv[]) {
     int			LocalDayOfMonth, DayOfMonth;
     int			Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
     int			OldMins;
-    long		CurrentLocalTime, CurrentGMTTime, date;
+    time_t		CurrentLocalTime, CurrentGMTTime;
+    long		date;
     double		UT, val, RA, DEC, LTRise, LTSet, LocalHour, hour24();
     int			D, H, M, S, sgn, A, B, q;
     char		str[10];




--- wmsun.c.orig	2015-08-28 11:57:39 UTC
+++ wmsun.c
@@ -43,7 +43,6 @@
 /*
  *   Includes
  */
-#define _POSIX_C_SOURCE 1
 #include <X11/X.h>                     /* for ButtonPress, ButtonRelease, etc */
 #include <X11/Xlib.h>                  /* for XEvent, ConnectionNumber, etc */
 #include <math.h>                      /* for cos, sin */
@@ -106,7 +105,8 @@ int main(int argc, char *argv[]) {
     int			n;
     int 		Year, Month;
     int			DayOfMonth;
-    long		CurrentLocalTime, CurrentGMTTime, date;
+    time_t		CurrentLocalTime, CurrentGMTTime;
+    long		date;
     double		UT, val, LTRise, LTSet, LocalHour, hour24();
     int			H, M;
     struct timeval	timeout;

Lines 1-3 Link Here

(-)astro/wmsun/pkg-descr (-1 / +1 lines)
1	A dockapp that displays the rise and set time of the sun.	1	A dockapp that displays the rise and set time of the sun.
2		2
3	WWW: http://linux-bsd-unix.strefa.pl/	3	WWW: https://www.dockapps.net/wmsun/

Return to bug 235526

Lines 2-26 Link Here

(-)astro/wmsun/Makefile (-7 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= wmsun	4	PORTNAME= wmsun
5	PORTVERSION= 1.12	5	PORTVERSION= 1.05
		6	PORTEPOCH= 1
6	CATEGORIES= astro windowmaker	7	CATEGORIES= astro windowmaker
7	MASTER_SITES= http://linux-bsd-unix.strefa.pl/	8	MASTER_SITES= https://www.dockapps.net/download/
8	DISTNAME= wmSun-${PORTVERSION}
9		9
10	MAINTAINER= mbeis@xs4all.nl	10	MAINTAINER= mbeis@xs4all.nl
11	COMMENT= Dockapp that displays the rise and set times of the Sun	11	COMMENT= Dockapp that displays the rise and set times of the Sun
12		12
13	WRKSRC_SUBDIR= wmSun	13	LICENSE= GPLv2+
		14	LICENSE_FILE= ${WRKSRC}/COPYING
14		15
		16	LIB_DEPENDS= libdockapp.so:x11-wm/libdockapp
		17
15	USE_XORG= xext xpm x11	18	USE_XORG= xext xpm x11
		19
16	MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \	20	MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \
17	INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib"	21	INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib"
18	MAKE_JOBS_UNSAFE= yes	22	MAKE_JOBS_UNSAFE= yes
19		23
20	PLIST_FILES= bin/wmSun man/man1/wmSun.1.gz	24	PLIST_FILES= bin/wmsun man/man1/wmsun.1.gz
		25	WRKSRC= ${WRKDIR}/dockapps-a1e67bd
21		26
22	do-install:	27	do-install:
23	${INSTALL_PROGRAM} ${WRKSRC}/wmSun ${STAGEDIR}${PREFIX}/bin	28	${INSTALL_PROGRAM} ${WRKSRC}/wmsun ${STAGEDIR}${PREFIX}/bin
24	${INSTALL_MAN} ${WRKSRC}/wmSun.1 ${STAGEDIR}${MAN1PREFIX}/man/man1	29	${INSTALL_MAN} ${WRKSRC}/wmsun.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
25		30
26	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Lines 1-17 Link Here

(-)astro/wmsun/files/patch-Makefile (-10 / +12 lines)
1	--- Makefile.orig 2015-04-01 21:05:45 UTC	1	--- Makefile.orig 2015-08-28 11:57:39 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -18,12 +18,12 @@ LIBS = -lXpm -lX11 -lXext -lm	3	@@ -19,14 +19,14 @@ LIBS = -lXpm -lX11 -lXext -lm -ldockapp
4	OBJS = wmSun.o SunRise.o ../wmgeneral/wmgeneral.o	4	OBJS = wmsun.o SunRise.o
5		5
6	.c.o:	6	.c.o:
7	- $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)	7	- $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
8	+ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)	8	+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ $(INCDIR)
9		9
10	all: wmSun.o wmSun	10	all: wmsun.o wmsun
11		11
12	wmSun: $(OBJS)	12	wmsun.o: wmSun_master.xpm wmSun_mask.xbm
13	- $(CC) $(COPTS) $(SYSTEM) -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
14	+ $(CC) $(CFLAGS) $(SYSTEM) -o wmSun $(OBJS) $(LIBDIR) $(LIBS)
15		13
		14	wmsun: $(OBJS)
		15	- $(CC) $(LDFLAGS) -o wmsun $^ $(LIBS)
		16	+ $(CC) $(LDFLAGS) -o wmsun $(OBJS) $(LIBDIR) $(LIBS)
		17
16	clean:	18	clean:
17	for i in $(OBJS) ; do rm -f $$i; done	19	for i in $(OBJS) ; do \

Lines 1-12 Link Here

(-)astro/wmsun/files/patch-wmSun.c (-12 lines)
1	--- wmSun.c.orig 2015-04-01 21:07:58 UTC
2	+++ wmSun.c
3	@@ -76,7 +76,8 @@ int main(int argc, char *argv[]) {
4	int LocalDayOfMonth, DayOfMonth;
5	int Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
6	int OldMins;
7	- long CurrentLocalTime, CurrentGMTTime, date;
8	+ time_t CurrentLocalTime, CurrentGMTTime;
9	+ long date;
10	double UT, val, RA, DEC, LTRise, LTSet, LocalHour, hour24();
11	int D, H, M, S, sgn, A, B, q;
12	char str[10];

Line 0 Link Here

(-)astro/wmsun/files/patch-wmsun.c (+20 lines)
	1	--- wmsun.c.orig 2015-08-28 11:57:39 UTC
	2	+++ wmsun.c
	3	@@ -43,7 +43,6 @@
	4	/*
	5	* Includes
	6	*/
	7	-#define _POSIX_C_SOURCE 1
	8	#include <X11/X.h> /* for ButtonPress, ButtonRelease, etc */
	9	#include <X11/Xlib.h> /* for XEvent, ConnectionNumber, etc */
	10	#include <math.h> /* for cos, sin */
	11	@@ -106,7 +105,8 @@ int main(int argc, char *argv[]) {
	12	int n;
	13	int Year, Month;
	14	int DayOfMonth;
	15	- long CurrentLocalTime, CurrentGMTTime, date;
	16	+ time_t CurrentLocalTime, CurrentGMTTime;
	17	+ long date;
	18	double UT, val, LTRise, LTSet, LocalHour, hour24();
	19	int H, M;
	20	struct timeval timeout;