Date: Fri, 29 Feb 2008 23:07:26 +0100 (CET) From: "Frank W. Josellis" <frank@dynamical-systems.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/121238: Update port: astro/aa -- fix various failures Message-ID: <200802292207.m1TM7QI6034952@pollux.senax.net> Resent-Message-ID: <200802292210.m1TMA1ih091405@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121238 >Category: ports >Synopsis: Update port: astro/aa -- fix various failures >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Feb 29 22:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Frank W. Josellis >Release: FreeBSD 5.5-STABLE i386 >Organization: >Environment: System: FreeBSD pollux.senax.net 5.5-STABLE FreeBSD 5.5-STABLE #21: Fri Feb 15 15:23:21 CET 2008 root@pollux.senax.net:/usr/obj/usr/src/sys/POLLUX i386 >Description: (1) Update distinfo for latest distfile. (2) Eventually install the catalogues of stars, comets, galaxies... which come along with this software (should have been done long ago). (3) Bump PORTREVISION. Added files: files/patch-gplan.c >How-To-Repeat: >Fix: --- aa.patch begins here --- diff -Nur aa.BAK/Makefile aa/Makefile --- aa.BAK/Makefile Mon Aug 13 11:32:39 2007 +++ aa/Makefile Fri Feb 29 21:25:14 2008 @@ -7,6 +7,7 @@ PORTNAME= aa PORTVERSION= 56 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= http://moshier.net/ \ http://www.mirrorservice.org/sites/www.moshier.net/ @@ -24,15 +25,22 @@ SUB_FILES= pkg-message PORTDOCS= read.me readme.404 Readme.FreeBSD +PORTDATA= messier.cat orbit.cat star.cat PLIST_FILES= bin/aa etc/aa.ini.default post-patch: - @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/kfiles.c + @${REINPLACE_CMD} \ + 's|%%PREFIX%%|${PREFIX}|g ; s|%%DATADIR%%|${DATADIR}|g' \ + ${WRKSRC}/kfiles.c @${REINPLACE_CMD} 's|CFLAGS= -O2|CFLAGS+=|' ${WRKSRC}/makefile do-install: @${INSTALL_PROGRAM} ${WRKSRC}/aa ${PREFIX}/bin @${INSTALL_DATA} ${WRKSRC}/aa.ini ${PREFIX}/etc/aa.ini.default + @${MKDIR} ${DATADIR} +.for i in ${PORTDATA} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR} +.endfor post-install: .if !defined(NOPORTDOCS) diff -Nur aa.BAK/distinfo aa/distinfo --- aa.BAK/distinfo Sat Aug 12 23:39:55 2006 +++ aa/distinfo Fri Feb 29 21:25:14 2008 @@ -1,3 +1,3 @@ -MD5 (aa-56.zip) = 74dfb091d8a749e6583bfc2880aecd10 -SHA256 (aa-56.zip) = c7b1a3d2bcf46b7e649fbe7858725f80be153668cbb8ce51d9f39ee4567c262b -SIZE (aa-56.zip) = 415059 +MD5 (aa-56.zip) = 39c5e66a0650b17e405266fd3ed603ca +SHA256 (aa-56.zip) = 6ecd9d84ab5022b8952d7f1a88d1f7e9f05109b1d5c27abe2866f2494ff3f861 +SIZE (aa-56.zip) = 415444 diff -Nur aa.BAK/files/patch-gplan.c aa/files/patch-gplan.c --- aa.BAK/files/patch-gplan.c Thu Jan 1 01:00:00 1970 +++ aa/files/patch-gplan.c Fri Feb 29 21:25:14 2008 @@ -0,0 +1,54 @@ +--- gplan.c.orig 2003-11-27 02:37:42.000000000 +0100 ++++ gplan.c 2008-02-29 19:00:02.000000000 +0100 +@@ -83,12 +83,8 @@ + /* VAX CC rejects "signed char." */ + char *p; + #else +-#ifdef __STDC__ +- signed char *p; +-#else + char *p; + #endif +-#endif + double *pl, *pb, *pr; + #endif + +@@ -441,12 +437,8 @@ + /* VAX CC rejects "signed char." */ + char *p; + #else +-#ifdef __STDC__ +- signed char *p; +-#else + char *p; + #endif +-#endif + long *pl, *pb, *pr; + #endif + double su, cu, sv, cv; +@@ -613,12 +605,8 @@ + /* VAX CC rejects "signed char." */ + char *p; + #else +-#ifdef __STDC__ +- signed char *p; +-#else + char *p; + #endif +-#endif + long *pl, *pr; + #endif + double su, cu, sv, cv; +@@ -764,12 +752,8 @@ + /* VAX CC rejects "signed char." */ + char *p; + #else +-#ifdef __STDC__ +- signed char *p; +-#else + char *p; + #endif +-#endif + long *pl; + #endif + double su, cu, sv, cv; diff -Nur aa.BAK/files/patch-kfiles.c aa/files/patch-kfiles.c --- aa.BAK/files/patch-kfiles.c Sat Aug 12 23:39:55 2006 +++ aa/files/patch-kfiles.c Fri Feb 29 21:25:14 2008 @@ -1,16 +1,28 @@ --- kfiles.c.orig Sat Aug 9 17:01:51 2003 -+++ kfiles.c Fri Aug 11 18:51:05 2006 -@@ -3,9 +3,7 @@ ++++ kfiles.c Fri Feb 29 16:51:58 2008 +@@ -3,9 +3,8 @@ * or file containing orbital elements. */ -#if __BORLANDC__ #include <stdlib.h> -#endif ++#include <stdio.h> #include "kep.h" -@@ -67,13 +65,33 @@ +@@ -26,8 +25,8 @@ + + extern char *intfmt, *strfmt;/* see dms.c */ + +-static char starnam[80] = {'s','t','a','r','.','c','a','t','\0'}; +-static char orbnam[80] = {'o','r','b','i','t','.','c','a','t','\0'}; ++static char starnam[80]; ++static char orbnam[80]; + static int linenum = 1; + + /* Read initialization file aa.ini +@@ -67,13 +66,36 @@ int kinit() { double a, b, fl, co, si, u; @@ -23,6 +35,9 @@ printf( "Planetary and lunar positions approximate DE404.\n" ); -f = fopen( "aa.ini", "r" ); ++ snprintf(starnam, 80, "%%DATADIR%%/star.cat"); ++ snprintf(orbnam, 80, "%%DATADIR%%/orbit.cat"); ++ +/* User inifile */ + if(home){ + inifile = strdup(home); diff -Nur aa.BAK/pkg-descr aa/pkg-descr --- aa.BAK/pkg-descr Sat Aug 12 23:39:55 2006 +++ aa/pkg-descr Fri Feb 29 21:25:14 2008 @@ -5,6 +5,6 @@ catalogues of stars and orbital elements. Displays all adjustments as it finds local azimuth and elevation, rise and set times, etc. -Latest update 2005-11-09. +Latest update 2006-09-02. WWW: http://moshier.net/aadoc.html --- aa.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802292207.m1TM7QI6034952>