Date: Mon, 28 Jul 2014 13:03:30 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363147 - in head/astro: ephem/files luna/files rmap/files saoimage/files stars stars/files wmglobe/files wmmoonclock/files wmsun/files xphoon/files xplanet/files Message-ID: <201407281303.s6SD3Uh4045084@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 13:03:29 2014 New Revision: 363147 URL: http://svnweb.freebsd.org/changeset/ports/363147 QAT: https://qat.redports.org/buildarchive/r363147/ Log: Rename old-style patch-xy patches in astro to reflect what files they modify. Added: head/astro/ephem/files/patch-Makefile - copied unchanged from r363137, head/astro/ephem/files/patch-aa head/astro/ephem/files/patch-compiler.c_2 - copied unchanged from r363137, head/astro/ephem/files/patch-ab head/astro/ephem/files/patch-formats.c - copied unchanged from r363137, head/astro/ephem/files/patch-ac head/astro/ephem/files/patch-io.c - copied unchanged from r363137, head/astro/ephem/files/patch-ad head/astro/ephem/files/patch-listing.c - copied unchanged from r363137, head/astro/ephem/files/patch-ae head/astro/ephem/files/patch-main.c - copied unchanged from r363137, head/astro/ephem/files/patch-af head/astro/ephem/files/patch-objx.c - copied unchanged from r363137, head/astro/ephem/files/patch-ag head/astro/ephem/files/patch-plot.c - copied unchanged from r363137, head/astro/ephem/files/patch-ah head/astro/ephem/files/patch-time.c - copied unchanged from r363137, head/astro/ephem/files/patch-ai head/astro/ephem/files/patch-version.c - copied unchanged from r363137, head/astro/ephem/files/patch-aj head/astro/luna/files/patch-iprintf_makefile - copied unchanged from r363137, head/astro/luna/files/patch-ag head/astro/luna/files/patch-luna.c - copied unchanged from r363137, head/astro/luna/files/patch-ac head/astro/luna/files/patch-luna.h - copied unchanged from r363137, head/astro/luna/files/patch-ah head/astro/luna/files/patch-pyramid.c - copied unchanged from r363137, head/astro/luna/files/patch-af head/astro/luna/files/patch-pyramid.h - copied unchanged from r363137, head/astro/luna/files/patch-ae head/astro/rmap/files/patch-main.c - copied unchanged from r363137, head/astro/rmap/files/patch-aa head/astro/saoimage/files/patch-btnlib_makefile - copied unchanged from r363137, head/astro/saoimage/files/patch-ab head/astro/saoimage/files/patch-disppsct.c - copied unchanged from r363137, head/astro/saoimage/files/patch-ad head/astro/saoimage/files/patch-makefile.FreeBSD - copied unchanged from r363137, head/astro/saoimage/files/patch-aa head/astro/saoimage/files/patch-rgnwrite.c - copied unchanged from r363137, head/astro/saoimage/files/patch-ae head/astro/stars/files/patch-main.c - copied unchanged from r363137, head/astro/stars/files/patch-aa head/astro/wmglobe/files/patch-Makefile - copied unchanged from r363137, head/astro/wmglobe/files/patch-aa head/astro/wmmoonclock/files/patch-Makefile - copied unchanged from r363137, head/astro/wmmoonclock/files/patch-aa head/astro/wmsun/files/patch-Makefile - copied unchanged from r363137, head/astro/wmsun/files/patch-aa head/astro/xphoon/files/patch-Imakefile - copied unchanged from r363137, head/astro/xphoon/files/patch-aa head/astro/xphoon/files/patch-dtime.c - copied unchanged from r363137, head/astro/xphoon/files/patch-ac head/astro/xphoon/files/patch-xphoon.c - copied unchanged from r363137, head/astro/xphoon/files/patch-ab head/astro/xplanet/files/patch-libprojections_stdiofix - copied unchanged from r363137, head/astro/xplanet/files/patch-aa Deleted: head/astro/ephem/files/patch-aa head/astro/ephem/files/patch-ab head/astro/ephem/files/patch-ac head/astro/ephem/files/patch-ad head/astro/ephem/files/patch-ae head/astro/ephem/files/patch-af head/astro/ephem/files/patch-ag head/astro/ephem/files/patch-ah head/astro/ephem/files/patch-ai head/astro/ephem/files/patch-aj head/astro/luna/files/patch-ac head/astro/luna/files/patch-ae head/astro/luna/files/patch-af head/astro/luna/files/patch-ag head/astro/luna/files/patch-ah head/astro/rmap/files/patch-aa head/astro/saoimage/files/patch-aa head/astro/saoimage/files/patch-ab head/astro/saoimage/files/patch-ad head/astro/saoimage/files/patch-ae head/astro/stars/files/patch-aa head/astro/wmglobe/files/patch-aa head/astro/wmmoonclock/files/patch-aa head/astro/wmsun/files/patch-aa head/astro/xphoon/files/patch-aa head/astro/xphoon/files/patch-ab head/astro/xphoon/files/patch-ac head/astro/xplanet/files/patch-aa Modified: head/astro/stars/Makefile Copied: head/astro/ephem/files/patch-Makefile (from r363137, head/astro/ephem/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-Makefile Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-aa) @@ -0,0 +1,18 @@ +*** Makefile.orig Sat Mar 14 23:21:45 1992 +--- Makefile Fri Apr 25 12:30:57 1997 +*************** +*** 1,6 **** + # Makefile for ephem, v 4.28 + +! CFLAGS = -O + + EPHEM= aa_hadec.o altj.o altmenus.o anomaly.o cal_mjd.o circum.o comet.o \ + compiler.o constel.o eq_ecl.o flog.o formats.o io.o listing.o main.o \ +--- 1,7 ---- + # Makefile for ephem, v 4.28 + +! #CFLAGS = -O +! CFLAGS+= -DPREFIX=\"${PREFIX}\" + + EPHEM= aa_hadec.o altj.o altmenus.o anomaly.o cal_mjd.o circum.o comet.o \ + compiler.o constel.o eq_ecl.o flog.o formats.o io.o listing.o main.o \ Copied: head/astro/ephem/files/patch-compiler.c_2 (from r363137, head/astro/ephem/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-compiler.c_2 Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-ab) @@ -0,0 +1,19 @@ +*** compiler.c.orig Tue Apr 15 01:07:37 1997 +--- compiler.c Tue Apr 15 01:33:14 1997 +*************** +*** 9,15 **** + + #include <math.h> + #include <ctype.h> +! #ifdef VMS + #include <stdlib.h> + #endif + #include "screen.h" +--- 9,15 ---- + + #include <math.h> + #include <ctype.h> +! #if defined(VMS) || defined(unix) + #include <stdlib.h> + #endif + #include "screen.h" Copied: head/astro/ephem/files/patch-formats.c (from r363137, head/astro/ephem/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-formats.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-ac) @@ -0,0 +1,19 @@ +*** formats.c.orig Tue Apr 15 01:07:37 1997 +--- formats.c Tue Apr 15 01:33:15 1997 +*************** +*** 5,11 **** + #include <stdio.h> + #include <math.h> + #include <ctype.h> +! #ifdef VMS + #include <stdlib.h> + #endif + #include "astro.h" +--- 5,11 ---- + #include <stdio.h> + #include <math.h> + #include <ctype.h> +! #if defined(VMS) || defined(unix) + #include <stdlib.h> + #endif + #include "astro.h" Copied: head/astro/ephem/files/patch-io.c (from r363137, head/astro/ephem/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-io.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-ad) @@ -0,0 +1,99 @@ +--- io.c.orig Sat Mar 14 23:22:07 1992 ++++ io.c Sun Jan 21 20:46:00 2007 +@@ -28,6 +28,17 @@ + * need to #define VMS since it is inherent in the compiler. + */ + ++#include <signal.h> ++#include <string.h> ++#include <stdlib.h> ++ ++static on_alrm(); ++static chk_arrow (register char c); ++static tload(); ++static char *egetstr (char *name, char **sptr); ++static setuptty(); ++ ++ + /* unless you are on VMS define one of these... */ + #define UNIX + /* #define TURBO_C */ +@@ -35,8 +46,8 @@ + /* then if you defined UNIX you must use one of these ways to do non-blocking + * tty reads + */ +-#define USE_FIONREAD +-/* #define USE_NDELAY */ ++/* #define USE_FIONREAD */ ++#define USE_NDELAY + /* #define USE_ATTSELECT */ + /* #define USE_BSDSELECT */ + +@@ -56,7 +67,7 @@ + #ifdef UNIX + #include <signal.h> + #ifdef USE_TERMIO +-#include <termio.h> ++#include <termios.h> + #endif + #ifdef USE_SGTTY + #include <sgtty.h> +@@ -73,7 +84,7 @@ + static int tloaded; + static int ttysetup; + #ifdef USE_TERMIO +-static struct termio orig_tio; ++static struct termios orig_tio; + #endif + #ifdef USE_SGTTY + static struct sgttyb orig_sgtty; +@@ -199,11 +210,19 @@ + seqa[0] = c; + if (l > 1) { + extern unsigned alarm(); ++ int ch_read, ch_expected, seqa_i; + /* cautiously read rest of arrow sequence */ + got_alrm = 0; + (void) signal (SIGALRM, on_alrm); + alarm(2); +- read (0, seqa+1, l-1); ++ /* to make the arrow keys work with FreeBSD ... */ ++ ch_expected = l-1; ++ seqa_i = 1; ++ while ((ch_read = read (0, seqa+seqa_i, ch_expected)) > 0 && ++ ch_read < ch_expected) { ++ ch_expected -= ch_read; ++ seqa_i += ch_read; ++ } + alarm(0); + if (got_alrm) + return (c); +@@ -232,7 +251,7 @@ + } + + #ifdef USE_TERMIO +- ioctl (0, TCSETA, &orig_tio); ++ tcsetattr(0, TCSANOW, &orig_tio); + #endif + #ifdef USE_SGTTY + ioctl (0, TIOCSETP, &orig_sgtty); +@@ -321,16 +340,16 @@ + setuptty() + { + #ifdef USE_TERMIO +- struct termio tio; ++ struct termios tio; + +- ioctl (0, TCGETA, &orig_tio); ++ tcgetattr(0, &orig_tio); + tio = orig_tio; + tio.c_iflag &= ~ICRNL; /* leave CR unchanged */ + tio.c_oflag &= ~OPOST; /* no output processing */ + tio.c_lflag &= ~(ICANON|ECHO); /* no input processing, no echo */ + tio.c_cc[VMIN] = 1; /* return after each char */ + tio.c_cc[VTIME] = 0; /* no read timeout */ +- ioctl (0, TCSETA, &tio); ++ tcsetattr(0, TCSANOW, &tio); + #endif + #ifdef USE_SGTTY + struct sgttyb sg; Copied: head/astro/ephem/files/patch-listing.c (from r363137, head/astro/ephem/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-listing.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-ae) @@ -0,0 +1,41 @@ +--- listing.c.orig Sat Mar 14 23:22:09 1992 ++++ listing.c Sun Jan 21 20:48:40 2007 +@@ -6,21 +6,36 @@ + * format of the listing file is one line per screen update. + */ + ++#include <string.h> + #include <stdio.h> + #include <math.h> + #include "screen.h" + +-extern char *strcpy(); ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ ++#if defined(VMS) || defined(unix) ++#include <errno.h> ++#endif + + #ifdef VMS + #include <perror.h> +-#include <errno.h> + #else ++#ifndef BSD + extern char *sys_errlist[]; ++#endif + extern errno; + #endif + + #define errsys (sys_errlist[errno]) ++ ++static lst_reset(); ++static lst_select_fields(); ++static lst_turn_off(); ++static lst_turn_on(); ++static lst_file(); ++static display_listing_file(FILE *lfp); + + + #define TRACE(x) {FILE *fp = fopen("trace","a"); fprintf x; fclose(fp);} Copied: head/astro/ephem/files/patch-main.c (from r363137, head/astro/ephem/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-main.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-af) @@ -0,0 +1,59 @@ +--- main.c.orig Sat Mar 14 23:22:10 1992 ++++ main.c Sun Jan 21 20:51:46 2007 +@@ -16,15 +16,26 @@ + #include <signal.h> + #include <setjmp.h> + #include <math.h> +-#ifdef VMS ++#if defined(VMS) || defined(unix) + #include <stdlib.h> + #endif ++#include <time.h> + #include "astro.h" + #include "circum.h" + #include "screen.h" ++#include <string.h> ++#include <stdlib.h> + +-extern char *strncpy(); +-extern char *getenv(); ++static read_cfgfile(); ++static void on_fpe(); ++static read_fieldargs(int ac, char *av[]); ++static crack_fieldset(char *buf); ++static chg_fld(char *bp, int *fld); ++static print_tminc(int force); ++static print_alt(int howmuch); ++static print_nstep(int force); ++static print_spause(int force); ++static toggle_body(int p); + + /* shorthands for fields of a Now structure, now. + * first undo the ones for a Now pointer from circum.h. +@@ -51,7 +62,11 @@ + + static jmp_buf fpe_err_jmp; /* used to recover from SIGFPE */ + static char *cfgfile; /* !0 if -c used */ ++#ifdef unix ++static char cfgdef[] = PREFIX "/share/ephem/ephem.cfg"; /* default configuration file name */ ++#else + static char cfgdef[] = "ephem.cfg"; /* default configuration file name */ ++#endif + static Now now; /* where when and how, right now */ + static double tminc; /* hrs to inc time by each loop; RTC means use clock */ + static int nstep; /* steps to go before stopping */ +@@ -1006,12 +1021,12 @@ + */ + slp_sync() + { +- extern long time(); ++ /*extern long time();*/ + + if (spause > 0 && !plot_ison() && !srch_ison() && !listing_ison()) { + int n; + if (tminc == RTC) { +- long t; ++ time_t t; + (void) time (&t); + n = spause - (t % spause); + } else Copied: head/astro/ephem/files/patch-objx.c (from r363137, head/astro/ephem/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-objx.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-ag) @@ -0,0 +1,44 @@ +--- objx.c.orig Sat Mar 14 23:22:15 1992 ++++ objx.c Sun Jan 21 20:59:07 2007 +@@ -6,17 +6,20 @@ + #include <stdio.h> + #include <math.h> + #include <ctype.h> +-#ifdef VMS ++#if defined(VMS) || defined(unix) + #include <stdlib.h> + #endif ++#include <string.h> + #include "astro.h" + #include "circum.h" + #include "screen.h" + +-extern char *strcat(), *strcpy(), *strncpy(), *getenv(); +- + static char *dbfile; /* !0 if set by -d option */ ++#ifdef unix ++static char dbfdef[] = PREFIX "/share/ephem/ephem.db"; /* default database file name */ ++#else + static char dbfdef[] = "ephem.db"; /* default database file name */ ++#endif + + /* structures to describe objects of various types. + */ +@@ -95,6 +98,17 @@ + + #define DY 0 /* decimal year flag for set_year() */ + #define YMD 1 /* year/mon/day flag for set_year() */ ++ ++static nxt_db(char buf[], int blen, FILE *fp); ++static obj_dfixed(Obj *op, int ac, char *av[]); ++static obj_delliptical(Obj *op, int ac, char *av[]); ++static obj_dhyperbolic(Obj *op, int ac, char *av[]); ++static obj_dparabolic(Obj *op, int ac, char *av[]); ++static set_double(char *av[], int vn, char *pr, double *fp); ++static set_name(char *av[], char *np); ++static set_year(char *av[], int vn, char *pr, int type, double *yp); ++static crack_year(char *bp, double *p); ++static set_mag(char *av[], int vn, Mag *mp); + + /* run when Objx or y is picked from menu. + * we tell which by the planet code. Copied: head/astro/ephem/files/patch-plot.c (from r363137, head/astro/ephem/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-plot.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-ah) @@ -0,0 +1,36 @@ +--- plot.c.orig Sat Mar 14 23:22:20 1992 ++++ plot.c Sun Jan 21 21:06:06 2007 +@@ -10,16 +10,31 @@ + */ + + #include <stdio.h> ++#include <string.h> + #include <math.h> + #include "screen.h" + +-extern char *strcpy(); ++static plt_select_fields(); ++static plt_turn_off(); ++static plt_turn_on(); ++static plt_file(); ++static plot_cartesian(FILE *pfp); ++static plot_polar(FILE *pfp); ++ ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ ++#if defined(VMS) || defined(unix) ++#include <errno.h> ++#endif + + #ifdef VMS + #include <perror.h> +-#include <errno.h> + #else ++#ifndef BSD + extern char *sys_errlist[]; ++#endif + extern errno; + #endif + Copied: head/astro/ephem/files/patch-time.c (from r363137, head/astro/ephem/files/patch-ai) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-time.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-ai) @@ -0,0 +1,115 @@ +*** time.c.orig Sun Mar 15 07:22:29 1992 +--- time.c Sun Jan 3 17:28:45 1999 +*************** +*** 13,37 **** + * returning 0. + */ + +- #define TZB +- + #ifdef VMS + #undef TZA + #undef TZB + #endif + + #include <stdio.h> + #include <time.h> + + #include "astro.h" + #include "circum.h" + + extern char *strncpy(); + #ifndef VMS + extern long time(); + #endif + +! static long c0; + static double mjd0; + + /* save current mjd and corresponding system clock for use by inc_mjd(). +--- 13,42 ---- + * returning 0. + */ + + #ifdef VMS + #undef TZA + #undef TZB + #endif + + #include <stdio.h> ++ #include <string.h> + #include <time.h> + ++ #if (defined(__unix__) || defined(unix)) && !defined(USG) ++ #include <sys/param.h> ++ #endif ++ + #include "astro.h" + #include "circum.h" + ++ #if !(defined(BSD) && BSD >= 199306) + extern char *strncpy(); + #ifndef VMS + extern long time(); + #endif ++ #endif + +! static time_t c0; + static double mjd0; + + /* save current mjd and corresponding system clock for use by inc_mjd(). +*************** +*** 49,57 **** + time_fromsys (np) + Now *np; + { + extern struct tm *gmtime(), *localtime(); + struct tm *tp; +! long c; + double day, hr; + + (void) time (&c); +--- 54,64 ---- + time_fromsys (np) + Now *np; + { ++ #if !(defined(BSD) && BSD >= 199306) + extern struct tm *gmtime(), *localtime(); ++ #endif + struct tm *tp; +! time_t c; + double day, hr; + + (void) time (&c); +*************** +*** 62,68 **** +--- 69,80 ---- + sex_dec (tp->tm_hour, tp->tm_min, tp->tm_sec, &hr); + mjd = day + hr/24.0; + tp = localtime (&c); ++ #ifdef __FreeBSD__ ++ tz = -tp->tm_gmtoff/3600; ++ strcpy(tznm, tp->tm_zone); ++ #else + settzstuff (tp->tm_isdst ? 1 : 0, np); ++ #endif + } else { + /* if gmtime() doesn't work, we assume the timezone stuff won't + * either, so we just use what it is and leave it alone. Some +*************** +*** 114,120 **** + double inc; + { + if (inc == RTC) { +! long c; + (void) time (&c); + mjd = mjd0 + (c - c0)/SPD; + } else +--- 126,132 ---- + double inc; + { + if (inc == RTC) { +! time_t c; + (void) time (&c); + mjd = mjd0 + (c - c0)/SPD; + } else Copied: head/astro/ephem/files/patch-version.c (from r363137, head/astro/ephem/files/patch-aj) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/ephem/files/patch-version.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/ephem/files/patch-aj) @@ -0,0 +1,19 @@ +*** version.c.orig Wed Apr 23 12:38:55 1997 +--- version.c Wed Apr 23 12:39:29 1997 +*************** +*** 214,220 **** + "Jupiter's moons based on information in \"Astronomical Formulae for", + "Calculators\" by Jean Meeus. Richmond, Va., U.S.A., Willmann-Bell, (c) 1982.", + */ +! "See the manual (Man.txt) for a list of references.", + "", + "type any key to continue..." + }; +--- 214,220 ---- + "Jupiter's moons based on information in \"Astronomical Formulae for", + "Calculators\" by Jean Meeus. Richmond, Va., U.S.A., Willmann-Bell, (c) 1982.", + */ +! "See the manual (" PREFIX "/share/ephem/Man.txt) for a list of references.", + "", + "type any key to continue..." + }; Copied: head/astro/luna/files/patch-iprintf_makefile (from r363137, head/astro/luna/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/luna/files/patch-iprintf_makefile Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/luna/files/patch-ag) @@ -0,0 +1,30 @@ +--- iprintf/makefile.orig Sun May 10 03:03:06 1992 ++++ iprintf/makefile Sat Feb 12 23:27:55 2000 +@@ -3,11 +3,11 @@ + # + + # MSDOS +-CC = cl +-CFLAGS = -Ox -AS -DANSI -W4 ++#CC = cl ++#CFLAGS = -Ox -AS -DANSI -W4 + # UNIX +-#CC = cc +-#CFLAGS = -O -DUNIX ++CC ?= cc ++CFLAGS += -DUNIX + + # + # All modules +@@ -15,9 +15,9 @@ + SRCS = iansilib.c idoprnt.c iprintf.c isprintf.c + + # MSDOS +-OBJS = iansilib.obj idoprnt.obj iprintf.obj isprintf.obj ++#OBJS = iansilib.obj idoprnt.obj iprintf.obj isprintf.obj + # UNIX +-#OBJS = iansilib.o idoprnt.o iprintf.o isprintf.o ++OBJS = iansilib.o idoprnt.o iprintf.o isprintf.o + + HDRS = iansilib.h iprint.h + # Copied: head/astro/luna/files/patch-luna.c (from r363137, head/astro/luna/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/luna/files/patch-luna.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/luna/files/patch-ac) @@ -0,0 +1,109 @@ +--- luna.c.orig 1992-05-25 01:01:32.000000000 +0200 ++++ luna.c 2011-12-20 19:57:51.404175556 +0100 +@@ -25,27 +25,43 @@ + #include "luna.h" + + +-void ++int + main(argc, argv) + int argc; + char **argv; + { +- int aotmoon, i; +- struct tm *localtmp, *algotmp; +- char *chp; ++ int aotmoon, tzhere, ++ i; ++ struct tm *localtmp, algotm; ++ char *chp, *envp, *tzname; + +- getoptions(argc, argv, &localtmp, &algotmp); ++ getoptions(argc, argv, &localtmp); ++ envp = getenv("TZ"); ++ if ((envp = getenv("TZ")) == NULL || ++ (chp = strchr(envp, '-')) == NULL && (chp = strchr(envp, '+')) == NULL ++ ) { ++ tzhere = TZ_DFL; ++ } else { ++ tzhere = atoi(chp); ++ } ++ tzconv(&algotm, localtmp, tzhere - TZ_ALGO); ++/*printf("%d %d:%d\n", algotm.tm_mday, algotm.tm_hour, algotm.tm_min);*/ ++ + for (i = 0; i < bdate; i++) { + if (extluna) { + aotmoon = getext(localtmp -> tm_year, localtmp -> tm_mon, + localtmp -> tm_mday); + } else { +- aotmoon = getmoon(algotmp -> tm_year, algotmp -> tm_yday); ++ aotmoon = getmoon(algotm.tm_year, algotm.tm_yday); + } + ++ ++ if ((tzname = getenv("TZ")) == NULL) { ++ tzname = TZNAME_DFL; ++ } + chp = Asctime(localtmp); + chp[LASCTIME - 2] = 0; +- printf("%s", chp); ++ printf("%s %3.3s", chp, tzname); + + if (numonly) { + printf(" "); +@@ -62,10 +78,11 @@ + + today = FALSE; + tomorrow(localtmp); +- tomorrow(algotmp); ++ tomorrow(&algotm); + } + + exit(0); ++/* NEVERREACHED */ + } + + +@@ -177,18 +194,15 @@ + + + void +-getoptions(argc, argv, localtmpp, algotmpp) ++getoptions(argc, argv, localtmpp) + int argc; + char **argv; + struct tm **localtmpp; +- struct tm **algotmpp; + { +- int argnum[3], argnumcnt, +- tzhere; +- char *chp, *envp; ++ int argnum[3], argnumcnt; ++ char *chp; + register int j, i; + BOOLEAN namedmon, followname; +- static struct tm algotm; + struct tm *localtmp; + + argnumcnt = 0; +@@ -375,20 +389,7 @@ + localtmp -> tm_yday + = ymd2yday(localtmp -> tm_year, localtmp -> tm_mon, + localtmp -> tm_mday); +- +- envp = getenv("TZ"); +- if ((envp = getenv("TZ")) == NULL || +- (chp = strchr(envp, '-')) == NULL && (chp = strchr(envp, '+')) == NULL +- ) { +- tzhere = TZ_DFL; +- } else { +- tzhere = atoi(chp); +- } +- tzconv(&algotm, localtmp, tzhere - TZ_ALGO); +-printf("%d %d:%d\n", algotm.tm_mday, algotm.tm_hour, algotm.tm_min); +- + *localtmpp = localtmp; +- *algotmpp = &algotm; + + return; + } Copied: head/astro/luna/files/patch-luna.h (from r363137, head/astro/luna/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/luna/files/patch-luna.h Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/luna/files/patch-ah) @@ -0,0 +1,20 @@ +--- luna.h~ 1992-05-25 00:48:34.000000000 +0200 ++++ luna.h 2011-12-20 19:57:27.963178999 +0100 +@@ -32,7 +32,7 @@ + + + #if defined(ANSI) +- extern void main(int argc, char **argv); ++ extern int main(int argc, char **argv); + extern void drawluna(int aotmoon); + extern void usage(void); + extern void getoptions(int argc, char **argv, +@@ -40,7 +40,7 @@ + extern int getext(int year, int mon, int day); + extern void printextstate(int age); + #else +- extern void main(); ++ extern int main(); + extern void drawluna(); + extern void usage(); + extern void getoptions(); Copied: head/astro/luna/files/patch-pyramid.c (from r363137, head/astro/luna/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/luna/files/patch-pyramid.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/luna/files/patch-af) @@ -0,0 +1,33 @@ +--- pyramid.c.orig Mon May 25 01:26:10 1992 ++++ pyramid.c Mon Feb 21 02:23:51 2000 +@@ -67,7 +67,7 @@ + Time_t ltime; + + time(<ime); +- return (localtime(ltime)); ++ return (localtime(<ime)); + #endif /* MSDOS or UNIX */ + } + +@@ -197,19 +197,14 @@ + Asctime(struct tm *tmp) + { + static char s[LASCTIME]; +- char *tzname; + +- if ((tzname = getenv("TZ")) == NULL) { +- tzname = TZNAME_DFL; +- } +- sprintf(s, "%s %s %2d %02d:%02d:%02d %4d %3.3s\n", ++ sprintf(s, "%s %s %2d %4d %02d:%02d:%02d\n", + downame[ymd2wday(tmp -> tm_year, tmp -> tm_mon, + tmp -> tm_mday)], + capitalize(monname[tmp -> tm_mon]), + tmp -> tm_mday, +- tmp -> tm_hour, tmp -> tm_min, tmp -> tm_sec, + tmp -> tm_year + 1900, +- tzname ++ tmp -> tm_hour, tmp -> tm_min, tmp -> tm_sec, + ); + + return (s); Copied: head/astro/luna/files/patch-pyramid.h (from r363137, head/astro/luna/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/luna/files/patch-pyramid.h Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/luna/files/patch-ae) @@ -0,0 +1,55 @@ +--- pyramid.h.orig Mon May 25 01:24:12 1992 ++++ pyramid.h Mon Feb 21 02:23:55 2000 +@@ -14,13 +14,16 @@ + # include <dos.h> + # include <stdlib.h> + # include <string.h> +-# define LASCTIME (30) ++# define LASCTIME (26) + + #else /* UNIX */ +-# include <sys/time.h> ++/*# include <sys/time.h>*/ ++# include <time.h> + typedef time_t Time_t; + # include <memory.h> +-# define LASCTIME (30) ++# define LASCTIME (26) ++ extern char *asctime(); ++ extern char *getenv(); + #endif /* MSDOS or not */ + + typedef long ABDATE; +@@ -52,15 +55,6 @@ + # if defined(MSDOS) + extern char *Asctime(struct tm *tmp); + extern char *capitalize(char *chp); +-# define Tolower(cc) tolower(cc) +-# define Toupper(cc) toupper(cc) +-# else /* MSDOS */ +-# define Asctime asctime +-/*# define Tolower(cc) \ +-/* (('A' <= (cc) && (cc) <= 'Z') ? ((cc) - 'A' + 'a') : (cc)) +-/*# define Toupper(cc) \ +-/* (('a' <= (cc) && (cc) <= 'z') ? ((cc) - 'a' + 'A') : (cc)) +- */ + # endif /* ANSI and MSDOS */ + + #else /* ANSI */ +@@ -69,3 +63,16 @@ + extern void tzconv(); + extern void tomorrow(); + #endif /* ANSI or not */ ++ ++ ++#if defined(MSDOS) ++# define Tolower(cc) tolower(cc) ++# define Toupper(cc) toupper(cc) ++ ++#else ++# define Asctime asctime ++# define Tolower(cc) \ ++ (('A' <= (cc) && (cc) <= 'Z') ? ((cc) - 'A' + 'a') : (cc)) ++# define Toupper(cc) \ ++ (('a' <= (cc) && (cc) <= 'z') ? ((cc) - 'a' + 'A') : (cc)) ++#endif /* MSDOS */ Copied: head/astro/rmap/files/patch-main.c (from r363137, head/astro/rmap/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/rmap/files/patch-main.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/rmap/files/patch-aa) @@ -0,0 +1,11 @@ +--- main.c.orig Tue Mar 28 17:01:17 2000 ++++ main.c Thu Mar 30 02:43:08 2000 +@@ -154,7 +154,7 @@ + case 'h': + printf("Usage: rmap [--zoom=VALUE] [--xrot=VALUE] [--yrot=VALUE] [--zrot=VALUE]\n"); + printf(" [--datafile=FILENAME] [--continent=LIST] [--category=LIST]\n"); +- printf(" [--outfile=FILENAME] [--height=PIXLES] [--width=PIXLES]\n"); ++ printf(" [--outfile=FILENAME] [--height=PIXELS] [--width=PIXELS]\n"); + printf(" [--colorfile=FILENAME] [--nogridlines] [--cities] [-h] [-v]\n"); + printf("\n"); + printf("\t--zoom=<value> Zoom Value, 1=whole earth\n"); Copied: head/astro/saoimage/files/patch-btnlib_makefile (from r363137, head/astro/saoimage/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/saoimage/files/patch-btnlib_makefile Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/saoimage/files/patch-ab) @@ -0,0 +1,20 @@ +--- btnlib/makefile.orig Wed Dec 6 14:51:17 1995 ++++ btnlib/makefile Thu Sep 24 15:54:53 1998 +@@ -8,7 +8,7 @@ + # the library would build. It is preferable to build btnlib as part of the + # make procedure in the parent SAOimage directory. + +-CFLAGS = -c -O ++CFLAGS += -c -I${LOCALBASE}/include + + LINT = lint + RANLIB = ranlib +@@ -27,7 +27,7 @@ + press.o remote.o resize.o util.o + + LIB = libbtn.a +-XLIBH = /usr/include/X11/Xlib.h ++XLIBH = ${LOCALBASE}/include/X11/Xlib.h + #XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows + + all: $(LIB) Copied: head/astro/saoimage/files/patch-disppsct.c (from r363137, head/astro/saoimage/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/saoimage/files/patch-disppsct.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/saoimage/files/patch-ad) @@ -0,0 +1,11 @@ +--- disppsct.c.orig Sun Jan 16 23:45:17 2000 ++++ disppsct.c Sun Jan 16 23:53:18 2000 +@@ -598,7 +598,7 @@ + char *getenv(); + #endif + +-#ifdef SUN ++#if defined(SUN) && !defined(__FreeBSD__) + long time(); /* should be in time.h, but not in SunOS */ + #endif + long clock; Copied: head/astro/saoimage/files/patch-makefile.FreeBSD (from r363137, head/astro/saoimage/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/saoimage/files/patch-makefile.FreeBSD Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/saoimage/files/patch-aa) @@ -0,0 +1,68 @@ +--- makefile.FreeBSD.orig Thu Sep 20 06:27:49 2001 ++++ makefile.FreeBSD Wed Jul 24 01:12:35 2002 +@@ -36,9 +36,9 @@ + # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of + # the CFLAGS macro below.) + +-SAOBINDIR = $(ROOT)/usr/local/bin/ +-SAOMANDIR = $(ROOT)/usr/local/man/manl/ +-IMTRCDIR = $(ROOT)/usr/local/lib/ ++SAOBINDIR = $(ROOT)$(PREFIX)/bin/ ++SAOMANDIR = $(ROOT)$(PREFIX)/man/manl/ ++IMTRCDIR = $(ROOT)$(PREFIX)/etc/ + + IMTOOLRC = $(IMTRCDIR)imtoolrc + FIFO_I = $(ROOT)/dev/imt1i +@@ -46,7 +46,7 @@ + FIFO_LN = $(ROOT)/dev/imt1 + + # Compiler specification. +-CC = cc ++CC ?= cc + # Uncomment these two lines to compile with gcc (add any optimizers you wish). + #CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce + # Delayed branches could win big on RISC: many inner loops have branches +@@ -76,12 +76,12 @@ + # OFLAGS: compiler optimization/debug options. + + #OFLAGS = -g -DDEBUG +-OFLAGS = -O2 -m486 -pipe ++OFLAGS ?= -O2 -m486 -pipe + + # ADFLAGS: architecture-dependent floating point flags, etc. + + #ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users... +-ADFLAGS = -I/usr/X11R6/include ++ADFLAGS = -I${LOCALBASE}/include + + # Libraries that move about or may require special specification. + # +@@ -89,7 +89,7 @@ + # usual link search path, i.e., it is not in /usr/lib, it may be necessary + # to specify its path fully in XLIB. + +-XLIB = -L/usr/X11R6/lib -lX11 ++XLIB = -L${LOCALBASE}/lib -lX11 + #XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users... + #F77LIB = -lF77 -lI77 -lU77 + F77LIB = -lf2c +@@ -307,7 +307,7 @@ + $(MAKE) ARCFILE=$(TAPEDEV) tar + + +-XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h ++XLIBH = ${LOCALBASE}/include/X11/Xlib.h ${LOCALBASE}/include/X11/Xutil.h + STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \ + hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h + WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH) +@@ -419,8 +419,8 @@ + defs/dispbox.def defs/magnibox.def defs/panbox.def \ + defs/btnbox.def defs/colorbox.def defs/graphbox.def \ + defs/desktop.def defs/cursor.def +-mainkey.o : $(WORKS) /usr/include/X11/keysym.h \ +- /usr/include/X11/keysymdef.h ++mainkey.o : $(WORKS) ${LOCALBASE}/include/X11/keysym.h \ ++ ${LOCALBASE}/include/X11/keysymdef.h + #mainkey.o : $(WORKS) # for OpenWindows + mainslct.o : $(WORKS) + mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h Copied: head/astro/saoimage/files/patch-rgnwrite.c (from r363137, head/astro/saoimage/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/saoimage/files/patch-rgnwrite.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/saoimage/files/patch-ae) @@ -0,0 +1,11 @@ +--- rgnwrite.c.orig Sun Jan 16 23:54:54 2000 ++++ rgnwrite.c Sun Jan 16 23:55:51 2000 +@@ -183,7 +183,7 @@ + #ifdef LONG64 + int time(); + #else +-#ifndef VMS ++#if !defined(VMS) && !defined(__FreeBSD__) + long time(); + #else + time_t time(); Modified: head/astro/stars/Makefile ============================================================================== --- head/astro/stars/Makefile Mon Jul 28 13:02:52 2014 (r363146) +++ head/astro/stars/Makefile Mon Jul 28 13:03:29 2014 (r363147) @@ -16,9 +16,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USE_XORG= x11 do-build: - @${CC} -I${PREFIX}/include ${CFLAGS} -c ${WRKSRC}/xwin.c -o ${WRKSRC}/xwin.o - @${CC} -I${PREFIX}/include ${CFLAGS} -c ${WRKSRC}/main.c -o ${WRKSRC}/main.o - @${CC} ${WRKSRC}/main.o ${WRKSRC}/xwin.o -L${PREFIX}/lib -lX11 -lm -o ${WRKSRC}/stars + ${CC} -I${PREFIX}/include ${CFLAGS} -c ${WRKSRC}/xwin.c -o ${WRKSRC}/xwin.o + ${CC} -I${PREFIX}/include ${CFLAGS} -c ${WRKSRC}/main.c -o ${WRKSRC}/main.o + ${CC} ${WRKSRC}/main.o ${WRKSRC}/xwin.o -L${PREFIX}/lib -lX11 -lm -o ${WRKSRC}/stars do-install: ${INSTALL_PROGRAM} ${WRKSRC}/stars ${STAGEDIR}${PREFIX}/bin/stars Copied: head/astro/stars/files/patch-main.c (from r363137, head/astro/stars/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/stars/files/patch-main.c Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/stars/files/patch-aa) @@ -0,0 +1,57 @@ +--- main.c.orig 1996-04-10 12:58:49.000000000 +0200 ++++ main.c 2011-12-20 20:04:16.146176426 +0100 +@@ -48,7 +48,7 @@ + void events(); + void shutdn(); + +-void main() ++int main() + { + setup(); + events(); +@@ -241,37 +241,37 @@ + + XQueryKeymap(xgh.display, keys); + +- if(keys[7] & 64) ++ if(keys[3] & 1) + Quit=1; + +- if(keys[12] & 16 && Speed < 20) ++ if(((keys[2] & 32) || (keys[10] & 64) ) && (Speed < 20)) + Speed++; + +- if(keys[12] & 8 && Speed > -20) ++ if( ((keys[2] & 16) || (keys[10] & 4) ) && (Speed > -20)) + Speed--; + + for(l=0; l<NumStars; l++) + c[l]=b[l]; + + XSetForeground(xgh.display,gc1,HiCol); +- if(keys[16] & 16) { ++ if(keys[12] & 64) { + r2+=0.02; + XFillPolygon(xgh.display,pix,gc1,a[0],3,Convex,CoordModeOrigin); + } +- if(keys[16] & 128) { ++ if(keys[12] & 16) { + r2-=0.02; + XFillPolygon(xgh.display,pix,gc1,a[2],3,Convex,CoordModeOrigin); + } +- if(keys[16] & 64) { ++ if(keys[13] & 1) { + r1+=0.02; + XFillPolygon(xgh.display,pix,gc1,a[1],3,Convex,CoordModeOrigin); + } +- if(keys[16] & 32) { ++ if(keys[12] & 4) { + r1-=0.02; + XFillPolygon(xgh.display,pix,gc1,a[3],3,Convex,CoordModeOrigin); + } + +- if(keys[16] & 2) ++ if(keys[8] & 2) + { + Speed=0; + r1=r2=0; Copied: head/astro/wmglobe/files/patch-Makefile (from r363137, head/astro/wmglobe/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/wmglobe/files/patch-Makefile Mon Jul 28 13:03:29 2014 (r363147, copy of r363137, head/astro/wmglobe/files/patch-aa) @@ -0,0 +1,31 @@ +--- Makefile.orig Wed Feb 3 05:11:37 1999 ++++ Makefile Tue Feb 22 22:22:20 2000 +@@ -1,12 +1,11 @@ +-INC = -I/usr/X11R6/include +-LIBS = -lXext -lX11 -lm -L/usr/X11R6/lib \ +- -ltiff -lXpm -lpng -lz -ljpeg -lungif -lwraster ++INC = `get-wraster-flags --cflags` ++LIBS = `get-wraster-flags --ldflags` `get-wraster-flags --libs` + OBJS = src/wmglobe.o src/rend.o src/wmgutil.o \ + src/sunpos.o src/myconvert.o src/mycontext.o + + + .c.o : +- gcc -c -O2 -Wall $(INC) $< -o $*.o ++ ${CC} -c ${CFLAGS} $(INC) $< -o $@ + + all: wmglobe + +@@ -14,9 +13,8 @@ + rm -f src/*.o wmglobe + + wmglobe : $(OBJS) +- gcc -O2 -Wall $(OBJS) -o wmglobe $(LIBS) +- strip wmglobe ++ ${CC} ${CFLAGS} $(OBJS) -o wmglobe $(LIBS) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407281303.s6SD3Uh4045084>