This is update for sunclock 3.57.
- remove REVISION for the first revision of 3.57.
- change MASTER_SITES to github.
- remove Xext, Xau and Xdmcp from WANTLIB-main
- remove Sunclock.se from PLIST-main since 3.57 drops it
HOMEPAGE appears to be unreachable, but I left it as is
since I couldn't find better alternative.
I saw this worked on my amd64 environment.
ok?
Index: astro/sunclock//Makefile
===================================================================
RCS file: /cvs/ports/astro/sunclock/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- astro/sunclock//Makefile 4 Jul 2021 15:14:07 -0000 1.30
+++ astro/sunclock//Makefile 6 Jul 2021 14:57:56 -0000
@@ -3,18 +3,16 @@
COMMENT-main= display the phase of the Sun on a map of the Earth
COMMENT-maps= additional maps of the Earth for sunclock
-VERSION= 3.56
+VERSION= 3.57
DISTNAME= sunclock-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-maps= sunclock-maps-${VERSION}
-REVISION-main= 5
-REVISION-maps= 0
CATEGORIES= astro
HOMEPAGE= http://www.arvernes.com/wiki/index.php/Sunclock
-MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/
-MASTER_SITES0=
ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/data_packages/
+MASTER_SITES=
https://raw.githubusercontent.com/nongiach/Sunclock/master/
+MASTER_SITES0=
https://raw.githubusercontent.com/nongiach/Sunclock/master/
SUPDISTFILES= big_images_270804.tar.bz2:0 \
medium_images_270804.tar.bz2:0 \
e43_color1_sh_16k.jpg:0 \
@@ -37,7 +35,7 @@ PKG_ARCH-maps= *
PERMIT_PACKAGE= Yes
PERMIT_PACKAGE-maps= no license for additional maps
-WANTLIB-main= X11 Xext Xpm Xau Xdmcp c m z jpeg png
+WANTLIB-main= X11 Xpm c m z jpeg png
DIST_SUBDIR= sunclock
Index: astro/sunclock//distinfo
===================================================================
RCS file: /cvs/ports/astro/sunclock/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- astro/sunclock//distinfo 4 Apr 2013 16:06:27 -0000 1.5
+++ astro/sunclock//distinfo 6 Jul 2021 14:57:56 -0000
@@ -2,9 +2,9 @@ SHA256 (sunclock/big_images_270804.tar.b
SHA256 (sunclock/e43_color1_sh_16k.jpg) =
BC2+a267GIMX35KRysfYHKFS4MuGfvc8O3iiJhd8sLQ=
SHA256 (sunclock/huge.jpg) = uqQhPRRUiGfWexYzmC12WykMwPLWGP0nitEqdnA5Yls=
SHA256 (sunclock/medium_images_270804.tar.bz2) =
0RFqdPNlSwKsnRzyc+5rdE+wlgYbIbDM3TTM+3kh68U=
-SHA256 (sunclock/sunclock-3.56.tar.bz2) =
J4caPw2Qjoh9y/EozDciuaYtqodI0h4kH3iCspxioi8=
+SHA256 (sunclock/sunclock-3.57.tar.bz2) =
4328200ceaa31160e901fb855d664033566d72b26a90605acc5d0ed9365402be
SIZE (sunclock/big_images_270804.tar.bz2) = 11871465
SIZE (sunclock/e43_color1_sh_16k.jpg) = 20507641
SIZE (sunclock/huge.jpg) = 11783876
SIZE (sunclock/medium_images_270804.tar.bz2) = 3917192
-SIZE (sunclock/sunclock-3.56.tar.bz2) = 1313390
+SIZE (sunclock/sunclock-3.57.tar.bz2) = 1325138
Index: astro/sunclock//patches/patch-Imakefile
===================================================================
RCS file: /cvs/ports/astro/sunclock/patches/patch-Imakefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Imakefile
--- astro/sunclock//patches/patch-Imakefile 4 Jun 2013 15:41:17 -0000
1.6
+++ astro/sunclock//patches/patch-Imakefile 6 Jul 2021 14:57:56 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Imakefile,v 1.6 2013/06/04 15:41:17 naddy Exp $
---- Imakefile.orig Sun Jun 18 15:58:50 2006
-+++ Imakefile Tue Jun 4 10:57:37 2013
+--- Imakefile.orig Tue Jul 6 23:07:06 2021
++++ Imakefile Tue Jul 6 23:05:29 2021
@@ -1,5 +1,5 @@
XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
@@ -15,9 +15,9 @@ $OpenBSD: patch-Imakefile,v 1.6 2013/06/
-SHAREDIR=/share/sunclock
+SHAREDIR=${PREFIX}/share/sunclock
- XCOMM Name of DOCDIR's subdirectories of DESTDIR:
- DOCDIR=/X11R6/lib/X11/doc
-@@ -42,31 +42,24 @@ CCOPTIONS = -Ae $(XPMINC) $(JINC) -DZLIB -DSHAREDIR=\"
+ XCOMM Name of library subdirectory of DESTDIR:
+ EMXBINDIR=/share/sunclock/bin
+@@ -48,13 +48,13 @@ CCOPTIONS = -Ae $(XPMINC) $(JINC) -DZLIB -DSHAREDIR=\"
#CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
# Solaris, Linux
@@ -32,17 +32,12 @@ $OpenBSD: patch-Imakefile,v 1.6 2013/06/
+ZLIBDIR=
+JINC=-I${LOCALBASE}/include
--CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
-+CCOPTIONS+= $(JINC) $(PINC) $(XPMINC) -DZLIB
-DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
-DEMXBINDIR=\"$(DESTDIR)$(EMXBINDIR)\"
++CCOPTIONS=$(JINC) $(PINC) $(XPMINC) -DZLIB
-DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DEMXBINDIR=\"$(DESTDIR)$(EMXBINDIR)\"
#endif
SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
- readvmf.c readxpm.c readgif.c readjpeg.c readpng.c
- OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
- readvmf.o readxpm.o readgif.o readjpeg.o readpng.o
--LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \
-+LOCAL_LIBRARIES=$(XPMLIBDIR) -lXpm $(XLIB) $(ZLIBDIR) -lz \
- $(JLIBDIR) -ljpeg -lpng -lm
+@@ -66,14 +66,6 @@ LOCAL_LIBRARIES=-lX11 $(XPMLIBDIR) -lXpm $(ZLIBDIR) -l
DEPLIBS= # I don't know what I'm doing, and I hate imake!
ComplexProgramTarget(sunclock)
@@ -50,9 +45,10 @@ $OpenBSD: patch-Imakefile,v 1.6 2013/06/
-all::
- cd editkit ; xmkmf ; make emx \
- DESTDIR=$(DESTDIR) \
-- BINDIR=$(SHAREDIR)/bin \
-- MANDIR=$(SHAREDIR)/editkit \
-- SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
+- BINDIR=$(EMXBINDIR) \
+- MANDIR=$(DESTDIR)$(SHAREDIR)/editkit \
+- SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit \
+- DOCDIR=$(DOCDIR)
install.man::
if [ -r $(DESTDIR)$(MANDIR)/sunclock.1x.gz ] ; \
Index: astro/sunclock//patches/patch-readvmf_c
===================================================================
RCS file: /cvs/ports/astro/sunclock/patches/patch-readvmf_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-readvmf_c
--- astro/sunclock//patches/patch-readvmf_c 4 Jul 2021 15:14:07 -0000
1.1
+++ astro/sunclock//patches/patch-readvmf_c 6 Jul 2021 14:57:56 -0000
@@ -3,10 +3,9 @@ $OpenBSD: patch-readvmf_c,v 1.1 2021/07/
Fix incorrect type usage, zlib's gzFile is already a pointer type.
Don't use data read from file as a format string (obvious security issue).
-Index: readvmf.c
---- readvmf.c.orig
-+++ readvmf.c
-@@ -339,7 +339,7 @@ pixmap_image()
+--- readvmf.c.orig Fri Aug 22 22:58:52 2008
++++ readvmf.c Tue Jul 6 23:10:48 2021
+@@ -340,7 +340,7 @@ pixmap_image()
char *
getdata(fd)
#ifdef ZLIB
@@ -15,16 +14,16 @@ Index: readvmf.c
#else
FILE *fd;
#endif
-@@ -432,7 +432,7 @@ struct Sundata * Context;
+@@ -433,7 +433,7 @@ struct Sundata * Context;
double theta, phi;
char *str, *ptr;
#ifdef ZLIB
- gzFile * fd;
+ gzFile fd;
+ int plen;
+ char *zpath;
#else
- FILE *fd;
- #endif
-@@ -480,7 +480,7 @@ struct Sundata * Context;
+@@ -505,7 +505,7 @@ struct Sundata * Context;
ret_value = 5;
goto abort;
}
Index: astro/sunclock//patches/patch-sunclock_c
===================================================================
RCS file: /cvs/ports/astro/sunclock/patches/patch-sunclock_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-sunclock_c
--- astro/sunclock//patches/patch-sunclock_c 6 Dec 2013 16:19:58 -0000
1.4
+++ astro/sunclock//patches/patch-sunclock_c 6 Jul 2021 14:57:56 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-sunclock_c,v 1.4 2013/12/06 16:19:58 naddy Exp $
---- sunclock.c.orig Thu Jun 22 01:21:40 2006
-+++ sunclock.c Thu Dec 5 19:46:00 2013
+--- sunclock.c.orig Thu Aug 7 21:40:24 2008
++++ sunclock.c Tue Jul 6 23:13:27 2021
@@ -113,7 +113,6 @@
#include <stdlib.h>
#include <stdio.h>
@@ -17,14 +17,3 @@ $OpenBSD: patch-sunclock_c,v 1.4 2013/12
#ifdef NEW_CTIME
extern char * timezone();
#endif
-@@ -3142,9 +3140,9 @@ struct Sundata * Context;
- {
- 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) {
- ilon = int_longitude(Context, label->lon);
Index: astro/sunclock//pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/astro/sunclock/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-main
--- astro/sunclock//pkg/PLIST-main 12 May 2018 09:41:31 -0000 1.3
+++ astro/sunclock//pkg/PLIST-main 6 Jul 2021 14:57:56 -0000
@@ -19,7 +19,6 @@ share/sunclock/i18n/Sunclock.it
share/sunclock/i18n/Sunclock.nl
share/sunclock/i18n/Sunclock.no
share/sunclock/i18n/Sunclock.pl
-share/sunclock/i18n/Sunclock.se
share/sunclock/wm_icons/
share/sunclock/wm_icons/mini-sunclock-16x14.xpm
share/sunclock/wm_icons/mini-sunclock-16x16.xpm
