Attachment #128056 for bug #171956




# Created by: torstenb
# New ports collection makefile for:	sunclock
# Date created:		15 September 1996
# Whom:			torstenb
#
# $FreeBSD: ports/astro/sunclock/Makefile,v 1.36 2012/06/01 05:15:51 dinoex Exp $
#

PORTNAME=	sunclock
PORTVERSION=	3.57
PORTREVISION=	5
CATEGORIES=	astro x11-clocks
MASTER_SITES=	http://www.arvernes.com/files/jpd/
		http://mbsd.msk.ru/dist/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Shows which portion of the Earth's surface is illuminated by the Sun

LICENSE=	GPLv2

LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
		png15:${PORTSDIR}/graphics/png

USE_BZIP2=	yes
USE_XORG=	xpm
MAKE_JOBS_SAFE=	yes

CPPFLAGS+=	$$(libpng-config --I_opts) \
		-I${LOCALBASE}/include \
		-DEMXBINDIR=\\\"${PREFIX}/bin\\\" \
		-DDOCDIR=\\\"${PREFIX}/lib/X11/doc\\\"
LDFLAGS+=	$$(libpng-config --L_opts) \
		-L${LOCALBASE}/lib

MAN1=		sunclock.1

post-patch:
	@cd ${WRKSRC} && ${SED} -e \
		'/^DESTDIR/s|=.*|=${PREFIX}| ; \
		 s|/X11R6/man|$$(DESTDIR)/man| ; \
		 s|bin/X11|bin| ; \
		 s|^CC=|CC?=| ; \
		 s|^CFLAGS=|CFLAGS+=| ; \
		 s|-I/usr/include/X11 -O|$${CPPFLAGS}| ; \
		 s|-L/usr/X11R6/lib|$${LDFLAGS}| ; \
		 s| make | $$(MAKE) | ; \
		 s|$$(SHAREDIR)/bin|$$(DESTDIR)/bin| ; \
		 s|$$(SHAREDIR)/editkit|$$(DESTDIR)/share/sunclock/editkit|' \
			< Makefile.noimake > Makefile
	@${LN} -sf sunclock.man ${WRKSRC}/sunclock.1
	@${REINPLACE_CMD} -e \
		's|= -O2|+= $${CPPFLAGS}| ; \
		 s|-L/usr/X11R6/lib|$${LDFLAGS}| ; \
		 s|gcc |$$(CC) |' ${WRKSRC}/editkit/Makefile.kit
	@${LN} -sf rc.example ${WRKSRC}/editkit/emxrc

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/sunclock ${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/sunclock.1 ${MANPREFIX}/man/man1
	@${MKDIR} ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/Sunclockrc ${DATADIR}
	@${MKDIR} ${DATADIR}/earthmaps/vmf
	${INSTALL_DATA} ${WRKSRC}/vmf/*.vmf ${DATADIR}/earthmaps/vmf
	${GZIP_CMD} ${DATADIR}/earthmaps/vmf/*.vmf
	@${MKDIR} ${DATADIR}/i18n
	${INSTALL_DATA} ${WRKSRC}/i18n/Sunclock.?? ${DATADIR}/i18n
	${INSTALL_PROGRAM} ${WRKSRC}/editkit/emx ${PREFIX}/bin
	@${MKDIR} ${DATADIR}/editkit
	${INSTALL_DATA} ${WRKSRC}/editkit/MANUAL.emacs ${DATADIR}/editkit
	${INSTALL_DATA} ${WRKSRC}/editkit/README ${DATADIR}/editkit
	${INSTALL_DATA} ${WRKSRC}/editkit/emxrc ${DATADIR}/editkit

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)astro/sunclock/distinfo (-2 / +2 lines)
1	SHA256 (sunclock-3.56.tar.bz2) = 27871a3f0d908e887dcbf128cc3722b9a62daa8748d21e241f7882b29c62a22f	1	SHA256 (sunclock-3.57.tar.bz2) = 4328200ceaa31160e901fb855d664033566d72b26a90605acc5d0ed9365402be
2	SIZE (sunclock-3.56.tar.bz2) = 1313390	2	SIZE (sunclock-3.57.tar.bz2) = 1325138




--- Imakefile.orig	Sun Jun 18 23:58:50 2006
+++ Imakefile	Fri Aug  4 19:11:06 2006
@@ -1,18 +1,18 @@
 XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
+DESTDIR=${PREFIX}
 
 XCOMM Name of man subdirectory of DESTDIR:
-MANDIR=/X11R6/man/man1
+MANDIR=/man/man1
 
 XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
-BINDIR=/X11R6/bin
+BINDIR=/bin
 
 XCOMM Name of share subdirectory of DESTDIR:
 SHAREDIR=/share/sunclock
 
 XCOMM Name of DOCDIR's subdirectories of DESTDIR:
 DOCDIR=/X11R6/lib/X11/doc 
-DOCHTMLDIR=/X11R6/lib/X11/doc/html
+DOCHTMLDIR=/lib/X11/doc/html
 
 XCOMM
 XCOMM Compile options:
@@ -42,13 +42,12 @@
 #CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
 
 # Solaris, Linux
-#XPMLIBDIR=-L/usr/X11R6/lib
-#XPMINC=-I/usr/X11R6/include/X11
-#JLIBDIR=-L/usr/lib
-#ZLIBDIR=-L/usr/lib
-#JINC=-I/usr/include
-
-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+XPMLIBDIR=-L${LOCALBASE}/lib
+XPMINC=-I${LOCALBASE}/include/X11
+JLIBDIR=-L${LOCALBASE}/lib
+ZLIBDIR=-L${LOCALBASE}/lib
+JINC=-I${LOCALBASE}/include
+CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -L${LOCALBASE}/lib
 #endif
 
 SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
@@ -64,7 +63,7 @@
 all::
 	cd editkit ; xmkmf ; make emx \
           DESTDIR=$(DESTDIR) \
-	  BINDIR=$(SHAREDIR)/bin \
+	  BINDIR=/bin \
 	  MANDIR=$(SHAREDIR)/editkit \
 	  SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
 
@@ -74,14 +73,13 @@
 
 install:: install.man
 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/i18n
-	cp -f Sunclockrc $(DESTDIR)$(SHAREDIR)
-	cd i18n ; rm -f *~ ; cp -f Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n
+	${BSD_INSTALL_DATA} Sunclockrc $(DESTDIR)$(SHAREDIR)
+	cd i18n ; rm -f *~ ; ${BSD_INSTALL_DATA} Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n
 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
-	cd vmf ; rm -f *~ ; cp -f * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
-	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin
-	install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin
+	cd vmf ; rm -f *~ ; ${BSD_INSTALL_DATA} * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
+	${BSD_INSTALL_PROGRAM} editkit/emx $(DESTDIR)/bin
 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit
-	cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \
+	cd editkit ; ${BSD_INSTALL_DATA} rc.example README MANUAL.emacs \
 		$(DESTDIR)$(SHAREDIR)/editkit
 	cd $(DESTDIR)$(SHAREDIR)/editkit ; mv -f rc.example emxrc
 	cat MESSAGE




--- editkit/Imakefile.orig	Sat Mar 11 00:11:23 2006
+++ editkit/Imakefile	Fri Aug  4 19:13:21 2006
@@ -33,7 +33,9 @@
 XCOMM Compile options:
 XCOMM
 
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
+COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -L${LOCALBASE}/lib
+
+CCOPTIONS=${COPTS}
 
 LOCAL_LIBRARIES=$(XLIB)
 DEPLIBS=		# I don't know what I'm doing, and I hate imake!
@@ -45,7 +47,7 @@
 
 x11.o:
 	ln -sf MANUAL.emacs emx.man
-	$(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
+	$(CC) $(COPTS) ${CFLAGS} -DEMACS -o x11.o -c x11.c
 
 install.man::
 	if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
@@ -55,9 +57,9 @@
 
 install::
 	mkdir -p $(SHAREDIR)
-	cp -f rc.example $(SHAREDIR)/rc.common
-	cd $(SHAREDIR); ln -sf rc.common emxrc
-	cp -f README $(SHAREDIR)
+	${BSD_INSTALL_DATA} rc.example $(SHAREDIR)/rc.common
+	${BSD_INSTALL_DATA} $(SHAREDIR); ln -sf rc.common emxrc
+	${BSD_INSTALL_DATA} README $(SHAREDIR)
 
 clean::
 	rm -f core *~ emx.man




         Context->projtime = -1L;
         Context->roottime = -1L;
         Context->animtime = -1L;
@@ -3142,8 +3131,8 @@
 {
    int ilon, ilat, width, dw = 0;
    struct TextLabel * label;
-   if(!Context->wintype) return;
    char *text, *text0, *ptr;
+   if(!Context->wintype) return;
 
    label = Context->label;
    while (label) if (label->text && *label->text) {
@@ -3918,7 +3907,7 @@
 
         if (button_pressed) return;

Line 0 Link Here

(-)astro/sunclock/files/patch-widgets.c (+9 lines)
	1	--- widgets.c.orig 2011-07-09 18:51:18.000000000 +0900
	2	+++ widgets.c 2012-08-14 04:13:36.000000000 +0900
	3	@@ -1,6 +1,5 @@
	4	#include <unistd.h>
	5	#include <sys/types.h>
	6	-#include <sys/timeb.h>
	7	#include <sys/stat.h>
	8	#include <string.h>
	9

Lines 1-9 Link Here

(-)astro/sunclock/pkg-descr (-3 / +3 lines)
1	This program is a clock that shows which portion of the Earth's surface is	1	This program is a clock that shows which portion of the Earth's surface is
2	illuminated by the sun. It is designed to be usually iconic, but can be	2	illuminated by the sun. It is designed to be usually iconic, but can be
3	opened for a larger display with the time updated every second and both the	3	opened for a larger display with the time updated every second and both the
4	local time zone and UTC displayed. The Suntools version had a menu that	4	local time zone and UTC displayed. The Suntools version had a menu that
5	allowed you to speed up time, show different dates, etc., but I have	5	allowed you to speed up time, show different dates, etc., but I have
6	never implemented any of that in the X version; there is some support	6	never implemented any of that in the X version; there is some support
7	for it in the code, however.	7	for it in the code, however.
8		8
9	WWW: http://frmas.free.fr/li_1.htm	9	WWW: http://www.arvernes.com/wiki/index.php/Sunclock




bin/emx
bin/sunclock
bin/emx
%%DATADIR%%/Sunclockrc
%%DATADIR%%/earthmaps/vmf/countries.vmf.gz
%%DATADIR%%/earthmaps/vmf/landwater.vmf.gz
%%DATADIR%%/earthmaps/vmf/timezones.vmf.gz
%%DATADIR%%/editkit/MANUAL.emacs
%%DATADIR%%/editkit/README
%%DATADIR%%/editkit/emxrc

%%DATADIR%%/i18n/Sunclock.nl
%%DATADIR%%/i18n/Sunclock.no
%%DATADIR%%/i18n/Sunclock.pl
%%DATADIR%%/i18n/Sunclock.sv
@dirrm %%DATADIR%%/i18n
@dirrm %%DATADIR%%/editkit
@dirrm %%DATADIR%%/earthmaps/vmf
@dirrm %%DATADIR%%/earthmaps
@dirrm %%DATADIR%%

Return to bug 171956

Lines 1-30 Link Here

(-)astro/sunclock/Makefile (-14 / +50 lines)
1	# ex:ts=8	1	# Created by: torstenb
2	# New ports collection makefile for: sunclock
3	# Date created: 15 September 1996
4	# Whom: torstenb
5	#
6	# $FreeBSD: ports/astro/sunclock/Makefile,v 1.36 2012/06/01 05:15:51 dinoex Exp $	2	# $FreeBSD: ports/astro/sunclock/Makefile,v 1.36 2012/06/01 05:15:51 dinoex Exp $
7	#
8		3
9	PORTNAME= sunclock	4	PORTNAME= sunclock
10	PORTVERSION= 3.56	5	PORTVERSION= 3.57
11	PORTREVISION= 5
12	CATEGORIES= astro x11-clocks	6	CATEGORIES= astro x11-clocks
13	MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \	7	MASTER_SITES= http://www.arvernes.com/files/jpd/
14	http://mbsd.msk.ru/dist/
15		8
16	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
17	COMMENT= Shows which portion of the Earth's surface is illuminated by the Sun	10	COMMENT= Shows which portion of the Earth's surface is illuminated by the Sun
18		11
19	LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \	12	LICENSE= GPLv2
		13
		14	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
20	png15:${PORTSDIR}/graphics/png	15	png15:${PORTSDIR}/graphics/png
21		16
22	USE_BZIP2= yes	17	USE_BZIP2= yes
23	USE_XORG= xpm	18	USE_XORG= xpm
24	USE_IMAKE= yes	19	MAKE_JOBS_SAFE= yes
25	CFLAGS+= -I${LOCALBASE}/include	20
26	CPPFLAGS+= -I${LOCALBASE}/include	21	CPPFLAGS+= $$(libpng-config --I_opts) \
		22	-I${LOCALBASE}/include \
		23	-DEMXBINDIR=\\\"${PREFIX}/bin\\\" \
		24	-DDOCDIR=\\\"${PREFIX}/lib/X11/doc\\\"
		25	LDFLAGS+= $$(libpng-config --L_opts) \
		26	-L${LOCALBASE}/lib
27		27
28	MAN1= sunclock.1	28	MAN1= sunclock.1
29		29
		30	post-patch:
		31	@cd ${WRKSRC} && ${SED} -e \
		32	'/^DESTDIR/s\|=.*\|=${PREFIX}\| ; \
		33	s\|/X11R6/man\|$$(DESTDIR)/man\| ; \
		34	s\|bin/X11\|bin\| ; \
		35	s\|^CC=\|CC?=\| ; \
		36	s\|^CFLAGS=\|CFLAGS+=\| ; \
		37	s\|-I/usr/include/X11 -O\|$${CPPFLAGS}\| ; \
		38	s\|-L/usr/X11R6/lib\|$${LDFLAGS}\| ; \
		39	s\| make \| $$(MAKE) \| ; \
		40	s\|$$(SHAREDIR)/bin\|$$(DESTDIR)/bin\| ; \
		41	s\|$$(SHAREDIR)/editkit\|$$(DESTDIR)/share/sunclock/editkit\|' \
		42	< Makefile.noimake > Makefile
		43	@${LN} -sf sunclock.man ${WRKSRC}/sunclock.1
		44	@${REINPLACE_CMD} -e \
		45	's\|= -O2\|+= $${CPPFLAGS}\| ; \
		46	s\|-L/usr/X11R6/lib\|$${LDFLAGS}\| ; \
		47	s\|gcc \|$$(CC) \|' ${WRKSRC}/editkit/Makefile.kit
		48	@${LN} -sf rc.example ${WRKSRC}/editkit/emxrc
		49
		50	do-install:
		51	${INSTALL_PROGRAM} ${WRKSRC}/sunclock ${PREFIX}/bin
		52	${INSTALL_MAN} ${WRKSRC}/sunclock.1 ${MANPREFIX}/man/man1
		53	@${MKDIR} ${DATADIR}
		54	${INSTALL_DATA} ${WRKSRC}/Sunclockrc ${DATADIR}
		55	@${MKDIR} ${DATADIR}/earthmaps/vmf
		56	${INSTALL_DATA} ${WRKSRC}/vmf/*.vmf ${DATADIR}/earthmaps/vmf
		57	${GZIP_CMD} ${DATADIR}/earthmaps/vmf/*.vmf
		58	@${MKDIR} ${DATADIR}/i18n
		59	${INSTALL_DATA} ${WRKSRC}/i18n/Sunclock.?? ${DATADIR}/i18n
		60	${INSTALL_PROGRAM} ${WRKSRC}/editkit/emx ${PREFIX}/bin
		61	@${MKDIR} ${DATADIR}/editkit
		62	${INSTALL_DATA} ${WRKSRC}/editkit/MANUAL.emacs ${DATADIR}/editkit
		63	${INSTALL_DATA} ${WRKSRC}/editkit/README ${DATADIR}/editkit
		64	${INSTALL_DATA} ${WRKSRC}/editkit/emxrc ${DATADIR}/editkit
		65
30	.include <bsd.port.mk>	66	.include <bsd.port.mk>

Lines 1-74 Link Here

(-)astro/sunclock/files/patch-Imakefile (-74 lines)
1	--- Imakefile.orig Sun Jun 18 23:58:50 2006
2	+++ Imakefile Fri Aug 4 19:11:06 2006
3	@@ -1,18 +1,18 @@
4	XCOMM Should install to /usr or /usr/local ??
5	-DESTDIR=/usr
6	+DESTDIR=${PREFIX}
7
8	XCOMM Name of man subdirectory of DESTDIR:
9	-MANDIR=/X11R6/man/man1
10	+MANDIR=/man/man1
11
12	XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin
13	-BINDIR=/X11R6/bin
14	+BINDIR=/bin
15
16	XCOMM Name of share subdirectory of DESTDIR:
17	SHAREDIR=/share/sunclock
18
19	XCOMM Name of DOCDIR's subdirectories of DESTDIR:
20	DOCDIR=/X11R6/lib/X11/doc
21	-DOCHTMLDIR=/X11R6/lib/X11/doc/html
22	+DOCHTMLDIR=/lib/X11/doc/html
23
24	XCOMM
25	XCOMM Compile options:
26	@@ -42,13 +42,12 @@
27	#CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
28
29	# Solaris, Linux
30	-#XPMLIBDIR=-L/usr/X11R6/lib
31	-#XPMINC=-I/usr/X11R6/include/X11
32	-#JLIBDIR=-L/usr/lib
33	-#ZLIBDIR=-L/usr/lib
34	-#JINC=-I/usr/include
35	-
36	-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
37	+XPMLIBDIR=-L${LOCALBASE}/lib
38	+XPMINC=-I${LOCALBASE}/include/X11
39	+JLIBDIR=-L${LOCALBASE}/lib
40	+ZLIBDIR=-L${LOCALBASE}/lib
41	+JINC=-I${LOCALBASE}/include
42	+CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -L${LOCALBASE}/lib
43	#endif
44
45	SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
46	@@ -64,7 +63,7 @@
47	all::
48	cd editkit ; xmkmf ; make emx \
49	DESTDIR=$(DESTDIR) \
50	- BINDIR=$(SHAREDIR)/bin \
51	+ BINDIR=/bin \
52	MANDIR=$(SHAREDIR)/editkit \
53	SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
54
55	@@ -74,14 +73,13 @@
56
57	install:: install.man
58	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/i18n
59	- cp -f Sunclockrc $(DESTDIR)$(SHAREDIR)
60	- cd i18n ; rm -f ~ ; cp -f Sunclock. $(DESTDIR)$(SHAREDIR)/i18n
61	+ ${BSD_INSTALL_DATA} Sunclockrc $(DESTDIR)$(SHAREDIR)
62	+ cd i18n ; rm -f ~ ; ${BSD_INSTALL_DATA} Sunclock. $(DESTDIR)$(SHAREDIR)/i18n
63	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
64	- cd vmf ; rm -f ~ ; cp -f $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
65	- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin
66	- install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin
67	+ cd vmf ; rm -f ~ ; ${BSD_INSTALL_DATA} $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
68	+ ${BSD_INSTALL_PROGRAM} editkit/emx $(DESTDIR)/bin
69	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit
70	- cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \
71	+ cd editkit ; ${BSD_INSTALL_DATA} rc.example README MANUAL.emacs \
72	$(DESTDIR)$(SHAREDIR)/editkit
73	cd $(DESTDIR)$(SHAREDIR)/editkit ; mv -f rc.example emxrc
74	cat MESSAGE

Lines 1-35 Link Here

(-)astro/sunclock/files/patch-editkit_Imakefile (-35 lines)
1	--- editkit/Imakefile.orig Sat Mar 11 00:11:23 2006
2	+++ editkit/Imakefile Fri Aug 4 19:13:21 2006
3	@@ -33,7 +33,9 @@
4	XCOMM Compile options:
5	XCOMM
6
7	-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
8	+COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -L${LOCALBASE}/lib
9	+
10	+CCOPTIONS=${COPTS}
11
12	LOCAL_LIBRARIES=$(XLIB)
13	DEPLIBS= # I don't know what I'm doing, and I hate imake!
14	@@ -45,7 +47,7 @@
15
16	x11.o:
17	ln -sf MANUAL.emacs emx.man
18	- $(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
19	+ $(CC) $(COPTS) ${CFLAGS} -DEMACS -o x11.o -c x11.c
20
21	install.man::
22	if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
23	@@ -55,9 +57,9 @@
24
25	install::
26	mkdir -p $(SHAREDIR)
27	- cp -f rc.example $(SHAREDIR)/rc.common
28	- cd $(SHAREDIR); ln -sf rc.common emxrc
29	- cp -f README $(SHAREDIR)
30	+ ${BSD_INSTALL_DATA} rc.example $(SHAREDIR)/rc.common
31	+ ${BSD_INSTALL_DATA} $(SHAREDIR); ln -sf rc.common emxrc
32	+ ${BSD_INSTALL_DATA} README $(SHAREDIR)
33
34	clean::
35	rm -f core *~ emx.man

Lines 59-74 Link Here

(-)astro/sunclock/files/patch-sunclock.c (-10 lines)
59	Context->projtime = -1L;	59	Context->projtime = -1L;
60	Context->roottime = -1L;	60	Context->roottime = -1L;
61	Context->animtime = -1L;	61	Context->animtime = -1L;
62	@@ -3142,8 +3131,8 @@
63	{
64	int ilon, ilat, width, dw = 0;
65	struct TextLabel * label;
66	- if(!Context->wintype) return;
67	char text, text0, *ptr;
68	+ if(!Context->wintype) return;
69
70	label = Context->label;
71	while (label) if (label->text && *label->text) {
72	@@ -3918,7 +3907,7 @@	62	@@ -3918,7 +3907,7 @@
73		63
74	if (button_pressed) return;	64	if (button_pressed) return;

Lines 1-9 Link Here

(-)astro/sunclock/pkg-plist (-10 / +10 lines)
1	bin/emx
2	bin/sunclock	1	bin/sunclock
		2	bin/emx
3	%%DATADIR%%/Sunclockrc	3	%%DATADIR%%/Sunclockrc
4	%%DATADIR%%/earthmaps/vmf/countries.vmf	4	%%DATADIR%%/earthmaps/vmf/countries.vmf.gz
5	%%DATADIR%%/earthmaps/vmf/landwater.vmf	5	%%DATADIR%%/earthmaps/vmf/landwater.vmf.gz
6	%%DATADIR%%/earthmaps/vmf/timezones.vmf	6	%%DATADIR%%/earthmaps/vmf/timezones.vmf.gz
7	%%DATADIR%%/editkit/MANUAL.emacs	7	%%DATADIR%%/editkit/MANUAL.emacs
8	%%DATADIR%%/editkit/README	8	%%DATADIR%%/editkit/README
9	%%DATADIR%%/editkit/emxrc	9	%%DATADIR%%/editkit/emxrc
Lines 15-23 Link Here
15	%%DATADIR%%/i18n/Sunclock.nl	15	%%DATADIR%%/i18n/Sunclock.nl
16	%%DATADIR%%/i18n/Sunclock.no	16	%%DATADIR%%/i18n/Sunclock.no
17	%%DATADIR%%/i18n/Sunclock.pl	17	%%DATADIR%%/i18n/Sunclock.pl
18	%%DATADIR%%/i18n/Sunclock.se	18	%%DATADIR%%/i18n/Sunclock.sv
19	@dirrmtry %%DATADIR%%/i18n	19	@dirrm %%DATADIR%%/i18n
20	@dirrmtry %%DATADIR%%/editkit	20	@dirrm %%DATADIR%%/editkit
21	@dirrmtry %%DATADIR%%/earthmaps/vmf	21	@dirrm %%DATADIR%%/earthmaps/vmf
22	@dirrmtry %%DATADIR%%/earthmaps	22	@dirrm %%DATADIR%%/earthmaps
23	@dirrmtry %%DATADIR%%	23	@dirrm %%DATADIR%%