cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 3.56, from Nick Nauwelaerts.

Browse Source 
- Besides jpg sunclock now supports both png & gif images as well.
- Moved all data files to distfiles/sunclock, some of the additional
  maps have nondescriptive names (like "huge.jpg").
This commit is contained in:
naddy 2007-04-01 16:04:06 +00:00
parent 73fb821653
commit 69aa81a96c
7 changed files with 106 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
astro/sunclock/Makefile
View File

@ -1,25 +1,25 @@
# $OpenBSD: Makefile,v 1.8 2006/11/24 22:21:48 espie Exp $
# $OpenBSD: Makefile,v 1.9 2007/04/01 16:04:06 naddy Exp $
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.50pre1
VERSION= 3.56
DISTNAME= sunclock-${VERSION}
PKGNAME-main= ${DISTNAME}p2
PKGNAME-main= ${DISTNAME}
PKGNAME-maps= sunclock-maps-${VERSION}
CATEGORIES= astro
HOMEPAGE= http://frmas.free.fr/li_1.htm
MAINTAINER= Nick Nauwelaerts <nick@nauwelaerts.net>
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \
ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/data_packages/
SUPDISTFILES= big_images_270804.tar.bz2 \
medium_images_270804.tar.bz2 \
e43_color1_sh_16k.jpg \
huge.jpg
EXTRACT_SUFX= .tar.bz2
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/
SUPDISTFILES= sunclock_jpeg_medium_maps-1.0.tgz \
sunclock_jpeg_big_maps-1.0.tgz \
sunclock_huge_earthmap.jpg
EXTRACT_SUFX= .tgz
FAKE= lib
FAKE= lib
USE_X11= Yes
CONFIGURE_STYLE= imake
NO_REGRESS= Yes
@ -44,20 +44,23 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB-main= X11 Xext Xpm c m z
DIST_SUBDIR= sunclock
LIB_DEPENDS-main= jpeg.>=62::graphics/jpeg
LIB_DEPENDS-main= jpeg.>=62::graphics/jpeg \
png.>=2::graphics/png
.if ${MULTI_PACKAGES:M-maps} # with maps
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${SUPDISTFILES}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
post-extract:
tar -xzf ${FULLDISTDIR}/sunclock_jpeg_medium_maps-1.0.tgz \
-C ${WRKSRC}/vmf -s '#jpeg/medium#.#'
tar -xzf ${FULLDISTDIR}/sunclock_jpeg_big_maps-1.0.tgz \
-C ${WRKSRC}/vmf -s '#jpeg/big#.#'
cp ${FULLDISTDIR}/sunclock_huge_earthmap.jpg ${WRKSRC}/vmf/
${BZIP2} -dkc ${FULLDISTDIR}/medium_images_270804.tar.bz2 | tar -xf - \
-C ${WRKSRC}/vmf -s '#images/medium#.#'
${BZIP2} -dkc ${FULLDISTDIR}/big_images_270804.tar.bz2 | tar -xf - \
-C ${WRKSRC}/vmf -s '#images/big#.#'
cp ${FULLDISTDIR}/e43_color1_sh_16k.jpg ${WRKSRC}/vmf/
cp ${FULLDISTDIR}/huge.jpg ${WRKSRC}/vmf/
.else # no maps
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@ -73,7 +76,9 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/sunclock/i18n
${INSTALL_DATA_DIR} ${PREFIX}/share/sunclock/wm_icons/
${INSTALL_DATA} ${WRKSRC}/wm_icons/* ${PREFIX}/share/sunclock/wm_icons/
${INSTALL_DATA} ${WRKSRC}/vmf/* ${PREFIX}/share/sunclock/earthmaps/vmf/
${INSTALL_DATA} ${WRKSRC}/vmf/*jpg ${PREFIX}/share/sunclock/earthmaps/
${INSTALL_DATA} ${WRKSRC}/vmf/*png ${PREFIX}/share/sunclock/earthmaps/
${INSTALL_DATA} ${WRKSRC}/vmf/*vmf ${PREFIX}/share/sunclock/earthmaps/vmf/
${INSTALL_DATA} ${WRKSRC}/i18n/Sunclock.* ${PREFIX}/share/sunclock/i18n/
.include <bsd.port.mk>

41
astro/sunclock/distinfo
View File

@ -1,16 +1,25 @@
MD5 (sunclock-3.50pre1.tgz) = 6e07964a99848018432825c5b3297cc6
MD5 (sunclock_huge_earthmap.jpg) = 4f0c8fc61e9b545ac337e84df12331b7
MD5 (sunclock_jpeg_big_maps-1.0.tgz) = bf0074b24df6679c90ee39739566c845
MD5 (sunclock_jpeg_medium_maps-1.0.tgz) = 58c6cc76fa54f8bc2214bfa77b56c491
RMD160 (sunclock-3.50pre1.tgz) = e10b3bb14062ba2c9ac11b65cd8e18a7f5307c3f
RMD160 (sunclock_huge_earthmap.jpg) = 1bf3648ae85f42b1e5ad4563f9a1c04bfd5a40b2
RMD160 (sunclock_jpeg_big_maps-1.0.tgz) = ff25fe844bb52d173338b67a6beaea439fcc5c7b
RMD160 (sunclock_jpeg_medium_maps-1.0.tgz) = c922d3dd9773808f9275ffdfba1f8a79735abe78
SHA1 (sunclock-3.50pre1.tgz) = c6e265ad0d60568488c7b0331f7049bc668022e9
SHA1 (sunclock_huge_earthmap.jpg) = 226d9310f2d25a873f80b6dab90a35b64d0318a3
SHA1 (sunclock_jpeg_big_maps-1.0.tgz) = 391f83d53103847e5800b2a2450c9fc63036307b
SHA1 (sunclock_jpeg_medium_maps-1.0.tgz) = 7472a854fb851cefabfb3f0d79a03d072084549f
SIZE (sunclock-3.50pre1.tgz) = 714458
SIZE (sunclock_huge_earthmap.jpg) = 11783876
SIZE (sunclock_jpeg_big_maps-1.0.tgz) = 7929555
SIZE (sunclock_jpeg_medium_maps-1.0.tgz) = 2565489
MD5 (sunclock/big_images_270804.tar.bz2) = 4a68f40fabf8f7fa51e4452af99f16eb
MD5 (sunclock/e43_color1_sh_16k.jpg) = 52bded6c33162808465f35b61b3e1d18
MD5 (sunclock/huge.jpg) = 4f0c8fc61e9b545ac337e84df12331b7
MD5 (sunclock/medium_images_270804.tar.bz2) = c81f6e0fc9ca48452bb2390a37b36ed3
MD5 (sunclock/sunclock-3.56.tar.bz2) = 9dc92f071e211343e38cc23224dfe162
RMD160 (sunclock/big_images_270804.tar.bz2) = 6b0601f283b4d8def01ea056f5a13d1e9bd0da53
RMD160 (sunclock/e43_color1_sh_16k.jpg) = 26d0edeeaff5897ea336e8d448c6c79233020192
RMD160 (sunclock/huge.jpg) = 1bf3648ae85f42b1e5ad4563f9a1c04bfd5a40b2
RMD160 (sunclock/medium_images_270804.tar.bz2) = 683f086897a77fed05b3f76bb8a65ee09dcd5aed
RMD160 (sunclock/sunclock-3.56.tar.bz2) = 3e52dc277bac324007513ca332c2660c26c375d0
SHA1 (sunclock/big_images_270804.tar.bz2) = 82195e938d7c82523e73475edcf1e037ad4d4404
SHA1 (sunclock/e43_color1_sh_16k.jpg) = e9dda4e7530a72fc9e5f59aba9087a716ade11bd
SHA1 (sunclock/huge.jpg) = 226d9310f2d25a873f80b6dab90a35b64d0318a3
SHA1 (sunclock/medium_images_270804.tar.bz2) = 1d8effaa78dd7c6da9b13b15275e858964a44076
SHA1 (sunclock/sunclock-3.56.tar.bz2) = 041032376279a9c849c56db97efc74e4492e62e4
SHA256 (sunclock/big_images_270804.tar.bz2) = df5f82cbccc20d8d1cc0ed801b21cc0818f30f4aaca95fb8cc2111b80409daa3
SHA256 (sunclock/e43_color1_sh_16k.jpg) = 042dbe6b6ebb188317df9291cac7d81ca152e0cb867ef73c3b78a226177cb0b4
SHA256 (sunclock/huge.jpg) = baa4213d14548867d67b1633982d765b290cc0f2d618fd278ad12a767039625b
SHA256 (sunclock/medium_images_270804.tar.bz2) = d1116a74f3654b02ac9d1cf273ee6b744fb096061b21b0ccdd34ccfb7921ebc5
SHA256 (sunclock/sunclock-3.56.tar.bz2) = 27871a3f0d908e887dcbf128cc3722b9a62daa8748d21e241f7882b29c62a22f
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

29
astro/sunclock/patches/patch-Imakefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Imakefile,v 1.2 2005/04/17 13:46:20 espie Exp $
--- Imakefile.orig Tue Aug 14 15:30:24 2001
+++ Imakefile Sun Apr 17 15:44:08 2005
$OpenBSD: patch-Imakefile,v 1.3 2007/04/01 16:04:06 naddy Exp $
--- Imakefile.orig Sun Jun 18 21:58:50 2006
+++ Imakefile Fri Mar 23 21:40:39 2007
@@ -1,5 +1,5 @@
XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
@ -15,9 +15,9 @@ $OpenBSD: patch-Imakefile,v 1.2 2005/04/17 13:46:20 espie Exp $
-SHAREDIR=/share/sunclock
+SHAREDIR=${PREFIX}/share/sunclock
XCOMM
XCOMM Compile options:
@@ -38,13 +38,13 @@ CCOPTIONS = -Ae $(XPMINC) $(JINC) -DZLIB
XCOMM Name of DOCDIR's subdirectories of DESTDIR:
DOCDIR=/X11R6/lib/X11/doc
@@ -42,13 +42,14 @@ CCOPTIONS = -Ae $(XPMINC) $(JINC) -DZLIB
#CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
# Solaris, Linux
@ -31,9 +31,24 @@ $OpenBSD: patch-Imakefile,v 1.2 2005/04/17 13:46:20 espie Exp $
+JLIBDIR=-L${DEPBASE}/lib
+ZLIBDIR=
+JINC=-I${DEPBASE}/include
+PINC=-I${DEPBASE}/include/libpng
-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+CCOPTIONS+= $(JINC) $(XPMINC) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+CCOPTIONS+= $(JINC) $(PINC) $(XPMINC) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
#endif
SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
@@ -60,13 +61,6 @@ LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lX
DEPLIBS= # I don't know what I'm doing, and I hate imake!
ComplexProgramTarget(sunclock)
-
-all::
- cd editkit ; xmkmf ; make emx \
- DESTDIR=$(DESTDIR) \
- BINDIR=$(SHAREDIR)/bin \
- MANDIR=$(SHAREDIR)/editkit \
- SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
install.man::
if [ -r $(DESTDIR)$(MANDIR)/sunclock.1x.gz ] ; \

8
astro/sunclock/patches/patch-sunclock_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sunclock_c,v 1.1.1.1 2002/08/18 14:50:00 naddy Exp $
--- sunclock.c.orig Wed Aug 8 13:53:14 2001
+++ sunclock.c Wed Jan 23 13:47:02 2002
@@ -125,7 +125,6 @@
$OpenBSD: patch-sunclock_c,v 1.2 2007/04/01 16:04:06 naddy Exp $
--- sunclock.c.orig Thu Jun 22 08:21:40 2006
+++ sunclock.c Sat Jan 13 15:57:52 2007
@@ -127,7 +127,6 @@
* external routines
*/

10
astro/sunclock/patches/patch-sunclock_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-sunclock_h,v 1.1.1.1 2002/08/18 14:50:00 naddy Exp $
--- sunclock.h.orig Wed Jan 23 13:41:33 2002
+++ sunclock.h Wed Jan 23 13:42:23 2002
@@ -224,7 +224,7 @@ typedef struct Sundata {
unsigned char * daypixel; /* pointer to day pixels */
$OpenBSD: patch-sunclock_h,v 1.2 2007/04/01 16:04:06 naddy Exp $
--- sunclock.h.orig Tue Jun 20 22:23:14 2006
+++ sunclock.h Sat Jan 13 15:57:52 2007
@@ -238,7 +238,7 @@ typedef struct Sundata {
unsigned char * nightpixel; /* pointer to night pixels */
Pixel *vmfpixels; /* list of additional vmf pixels */
int ncolors; /* number of colors in day pixels */
- long time; /* time - real or fake, see flags */
+ time_t time; /* time - real or fake, see flags */

6
astro/sunclock/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 22:21:48 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2007/04/01 16:04:06 naddy Exp $
@pkgpath astro/sunclock
@pkgpath astro/sunclock,no_maps
bin/sunclock
@ -7,7 +7,8 @@ share/sunclock/
share/sunclock/Sunclockrc
share/sunclock/earthmaps/
share/sunclock/earthmaps/vmf/
share/sunclock/earthmaps/vmf/standard.vmf
share/sunclock/earthmaps/vmf/countries.vmf
share/sunclock/earthmaps/vmf/landwater.vmf
share/sunclock/earthmaps/vmf/timezones.vmf
share/sunclock/i18n/
share/sunclock/i18n/Sunclock.de
@ -17,6 +18,7 @@ share/sunclock/i18n/Sunclock.fr
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

41
astro/sunclock/pkg/PLIST-maps
View File

@ -1,18 +1,23 @@
@comment $OpenBSD: PLIST-maps,v 1.1.1.1 2002/08/18 14:50:00 naddy Exp $
share/sunclock/earthmaps/vmf/altitude.jpg
share/sunclock/earthmaps/vmf/biomap.jpg
share/sunclock/earthmaps/vmf/biomap_big.jpg
share/sunclock/earthmaps/vmf/caida.jpg
share/sunclock/earthmaps/vmf/depthmap.jpg
share/sunclock/earthmaps/vmf/earthlights.jpg
share/sunclock/earthmaps/vmf/elevation.jpg
share/sunclock/earthmaps/vmf/elevation_big.jpg
share/sunclock/earthmaps/vmf/photo1.jpg
share/sunclock/earthmaps/vmf/photo2.jpg
share/sunclock/earthmaps/vmf/photo_big1.jpg
share/sunclock/earthmaps/vmf/photo_big2.jpg
share/sunclock/earthmaps/vmf/population.jpg
share/sunclock/earthmaps/vmf/rainmap.jpg
share/sunclock/earthmaps/vmf/sunclock_huge_earthmap.jpg
share/sunclock/earthmaps/vmf/temperature.jpg
share/sunclock/earthmaps/vmf/topography.jpg
@comment $OpenBSD: PLIST-maps,v 1.2 2007/04/01 16:04:06 naddy Exp $
share/sunclock/earthmaps/altitude.jpg
share/sunclock/earthmaps/bathymetry.jpg
share/sunclock/earthmaps/biomap.jpg
share/sunclock/earthmaps/biomap_big.jpg
share/sunclock/earthmaps/caida.jpg
share/sunclock/earthmaps/crustal.png
share/sunclock/earthmaps/depthmap.jpg
share/sunclock/earthmaps/e43_color1_sh_16k.jpg
share/sunclock/earthmaps/earthlights.jpg
share/sunclock/earthmaps/elevation.jpg
share/sunclock/earthmaps/huge.jpg
share/sunclock/earthmaps/photo1.jpg
share/sunclock/earthmaps/photo2.jpg
share/sunclock/earthmaps/photo_big1.jpg
share/sunclock/earthmaps/photo_big2.jpg
share/sunclock/earthmaps/population.jpg
share/sunclock/earthmaps/rainmap.jpg
share/sunclock/earthmaps/temperature.jpg
share/sunclock/earthmaps/topography.png
share/sunclock/earthmaps/topography1.jpg
share/sunclock/earthmaps/topography2.jpg
share/sunclock/earthmaps/topography3.jpg