diff -urN /usr/ports/astro/sunclock/Makefile astro/sunclock/Makefile --- /usr/ports/astro/sunclock/Makefile 2012-06-01 14:15:51.000000000 +0900 +++ astro/sunclock/Makefile 2012-09-25 03:15:40.000000000 +0900 @@ -1,30 +1,66 @@ -# ex:ts=8 -# New ports collection makefile for: sunclock -# Date created: 15 September 1996 -# Whom: torstenb -# +# Created by: torstenb # $FreeBSD: ports/astro/sunclock/Makefile,v 1.36 2012/06/01 05:15:51 dinoex Exp $ -# PORTNAME= sunclock -PORTVERSION= 3.56 -PORTREVISION= 5 +PORTVERSION= 3.57 CATEGORIES= astro x11-clocks -MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \ - http://mbsd.msk.ru/dist/ +MASTER_SITES= http://www.arvernes.com/files/jpd/ MAINTAINER= ports@FreeBSD.org COMMENT= Shows which portion of the Earth's surface is illuminated by the Sun -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ +LICENSE= GPLv2 + +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_XORG= xpm -USE_IMAKE= yes -CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include +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 diff -urN /usr/ports/astro/sunclock/distinfo astro/sunclock/distinfo --- /usr/ports/astro/sunclock/distinfo 2011-03-19 21:27:40.000000000 +0900 +++ astro/sunclock/distinfo 2012-08-14 03:40:21.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (sunclock-3.56.tar.bz2) = 27871a3f0d908e887dcbf128cc3722b9a62daa8748d21e241f7882b29c62a22f -SIZE (sunclock-3.56.tar.bz2) = 1313390 +SHA256 (sunclock-3.57.tar.bz2) = 4328200ceaa31160e901fb855d664033566d72b26a90605acc5d0ed9365402be +SIZE (sunclock-3.57.tar.bz2) = 1325138 diff -urN /usr/ports/astro/sunclock/files/patch-Imakefile astro/sunclock/files/patch-Imakefile --- /usr/ports/astro/sunclock/files/patch-Imakefile 2010-03-10 05:43:58.000000000 +0900 +++ astro/sunclock/files/patch-Imakefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,74 +0,0 @@ ---- 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 diff -urN /usr/ports/astro/sunclock/files/patch-editkit_Imakefile astro/sunclock/files/patch-editkit_Imakefile --- /usr/ports/astro/sunclock/files/patch-editkit_Imakefile 2008-04-20 02:46:11.000000000 +0900 +++ astro/sunclock/files/patch-editkit_Imakefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,35 +0,0 @@ ---- 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 diff -urN /usr/ports/astro/sunclock/files/patch-sunclock.c astro/sunclock/files/patch-sunclock.c --- /usr/ports/astro/sunclock/files/patch-sunclock.c 2010-03-10 05:43:58.000000000 +0900 +++ astro/sunclock/files/patch-sunclock.c 2012-08-14 03:48:40.000000000 +0900 @@ -59,16 +59,6 @@ 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; diff -urN /usr/ports/astro/sunclock/files/patch-widgets.c astro/sunclock/files/patch-widgets.c --- /usr/ports/astro/sunclock/files/patch-widgets.c 1970-01-01 09:00:00.000000000 +0900 +++ astro/sunclock/files/patch-widgets.c 2012-08-14 04:13:57.000000000 +0900 @@ -0,0 +1,9 @@ +--- widgets.c.orig 2011-07-09 18:51:18.000000000 +0900 ++++ widgets.c 2012-08-14 04:13:36.000000000 +0900 +@@ -1,6 +1,5 @@ + #include + #include +-#include + #include + #include + diff -urN /usr/ports/astro/sunclock/pkg-descr astro/sunclock/pkg-descr --- /usr/ports/astro/sunclock/pkg-descr 2002-03-30 09:21:44.000000000 +0900 +++ astro/sunclock/pkg-descr 2012-08-14 03:34:43.000000000 +0900 @@ -1,9 +1,9 @@ This program is a clock that shows which portion of the Earth's surface is -illuminated by the sun. It is designed to be usually iconic, but can be +illuminated by the sun. It is designed to be usually iconic, but can be opened for a larger display with the time updated every second and both the -local time zone and UTC displayed. The Suntools version had a menu that +local time zone and UTC displayed. The Suntools version had a menu that allowed you to speed up time, show different dates, etc., but I have never implemented any of that in the X version; there is some support for it in the code, however. -WWW: http://frmas.free.fr/li_1.htm +WWW: http://www.arvernes.com/wiki/index.php/Sunclock diff -urN /usr/ports/astro/sunclock/pkg-plist astro/sunclock/pkg-plist --- /usr/ports/astro/sunclock/pkg-plist 2006-07-28 15:20:50.000000000 +0900 +++ astro/sunclock/pkg-plist 2012-08-14 05:27:24.000000000 +0900 @@ -1,9 +1,9 @@ -bin/emx bin/sunclock +bin/emx %%DATADIR%%/Sunclockrc -%%DATADIR%%/earthmaps/vmf/countries.vmf -%%DATADIR%%/earthmaps/vmf/landwater.vmf -%%DATADIR%%/earthmaps/vmf/timezones.vmf +%%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 @@ -15,9 +15,9 @@ %%DATADIR%%/i18n/Sunclock.nl %%DATADIR%%/i18n/Sunclock.no %%DATADIR%%/i18n/Sunclock.pl -%%DATADIR%%/i18n/Sunclock.se -@dirrmtry %%DATADIR%%/i18n -@dirrmtry %%DATADIR%%/editkit -@dirrmtry %%DATADIR%%/earthmaps/vmf -@dirrmtry %%DATADIR%%/earthmaps -@dirrmtry %%DATADIR%% +%%DATADIR%%/i18n/Sunclock.sv +@dirrm %%DATADIR%%/i18n +@dirrm %%DATADIR%%/editkit +@dirrm %%DATADIR%%/earthmaps/vmf +@dirrm %%DATADIR%%/earthmaps +@dirrm %%DATADIR%%