diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
| commit | 9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896 (patch) | |
| tree | 9b071a8105704e992946dcd6b801e9fcb7635142 /astro | |
| parent | 5a20e7990eb544509174d617d359bf0d4ac64737 (diff) | |
| download | ports-9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896.tar.gz ports-9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896.zip | |
Notes
Diffstat (limited to 'astro')
110 files changed, 709 insertions, 716 deletions
diff --git a/astro/astrometry/files/patch-cairoutils.c b/astro/astrometry/files/patch-cairoutils.c deleted file mode 100644 index 65255ecab452..000000000000 --- a/astro/astrometry/files/patch-cairoutils.c +++ /dev/null @@ -1,10 +0,0 @@ ---- util/cairoutils.c.orig 2012-04-25 05:33:34.000000000 +0200 -+++ util/cairoutils.c 2012-04-25 05:35:29.000000000 +0200 -@@ -25,6 +25,7 @@ - - #include <cairo.h> - #include <png.h> -+#include <zlib.h> - #include <jpeglib.h> - - #include "an-bool.h" diff --git a/astro/astrometry/files/patch-util_cairoutils.c b/astro/astrometry/files/patch-util_cairoutils.c new file mode 100644 index 000000000000..16552f3a577a --- /dev/null +++ b/astro/astrometry/files/patch-util_cairoutils.c @@ -0,0 +1,10 @@ +--- util/cairoutils.c.orig 2015-12-12 19:02:27 UTC ++++ util/cairoutils.c +@@ -12,6 +12,7 @@ + + #include <cairo.h> + #include <png.h> ++#include <zlib.h> + #include <jpeglib.h> + #include <zlib.h> + diff --git a/astro/astrometry/files/patch-util-permutedsort.c b/astro/astrometry/files/patch-util_permutedsort.c index 66c756326b97..82962a23a40e 100644 --- a/astro/astrometry/files/patch-util-permutedsort.c +++ b/astro/astrometry/files/patch-util_permutedsort.c @@ -1,6 +1,6 @@ ---- util/permutedsort.c.orig 2013-10-29 22:08:09 +0800 +--- util/permutedsort.c.orig 2015-12-12 19:02:27 UTC +++ util/permutedsort.c -@@ -105,6 +105,12 @@ int* permuted_sort(const void* realarray +@@ -92,6 +92,12 @@ int* permuted_sort(const void* realarray if (isnan(d2)) return -1; \ assert(0); return 0; @@ -13,7 +13,7 @@ //printf("d1=%g, d2=%g\n", d1, d2); int compare_doubles_asc(const void* v1, const void* v2) { -@@ -135,13 +141,13 @@ int compare_floats_desc(const void* v1, +@@ -122,13 +128,13 @@ int compare_floats_desc(const void* v1, int compare_int64_asc(const void* v1, const void* v2) { int64_t f1 = *(int64_t*)v1; int64_t f2 = *(int64_t*)v2; @@ -28,4 +28,4 @@ + COMPARE_INT(f1, f2, >, <); } - + // Versions for use with QSORT_R diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index 330a6bdeb48e..2771a86a4226 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libfftw3f.so:math/fftw3-float GNU_CONFIGURE= yes USES= autoreconf gmake libtool pkgconfig tar:xz -WRKSRC= ${WRKDIR}/${DISTNAME}/client +WRKSRC_SUBDIR= client CPPFLAGS+= -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib diff --git a/astro/boinc-astropulse/files/patch-client__Makefile.am b/astro/boinc-astropulse/files/patch-Makefile.am index ff5a32b8fd46..9083bb5b2dda 100644 --- a/astro/boinc-astropulse/files/patch-client__Makefile.am +++ b/astro/boinc-astropulse/files/patch-Makefile.am @@ -1,6 +1,6 @@ ---- Makefile.am (revision 633) -+++ Makefile.am (working copy) -@@ -31,7 +31,7 @@ +--- Makefile.am.orig 2009-06-11 17:35:16 UTC ++++ Makefile.am +@@ -31,7 +31,7 @@ if ENABLE_GUI GUI_C_FLAGS = $(CLIENT_C_FLAGS) $(GRAPHICS_CFLAGS) GUI_LD_FLAGS = $(CLIENT_LD_FLAGS) GUI_LD_ADD = -L$(BOINCDIR)/api -L$(BOINCDIR)/lib $(BOINC_LIBS) $(GRAPHICS_LIBS_RAW) $(APP_LIBS) diff --git a/astro/boinc-astropulse/files/patch-client__ap_client_main.cpp b/astro/boinc-astropulse/files/patch-ap__client__main.cpp index 6c21d7b9330a..8c8b3d28a70f 100644 --- a/astro/boinc-astropulse/files/patch-client__ap_client_main.cpp +++ b/astro/boinc-astropulse/files/patch-ap__client__main.cpp @@ -1,6 +1,6 @@ ---- ap_client_main.cpp.orig 2012-08-14 02:07:20.000000000 +0200 -+++ ap_client_main.cpp 2013-08-06 18:41:38.000000000 +0200 -@@ -1288,7 +1288,6 @@ +--- ap_client_main.cpp.orig 2012-08-14 00:07:20 UTC ++++ ap_client_main.cpp +@@ -1288,7 +1288,6 @@ void Science::mainloop() { * used to inform the core client GUI of the % complete. */ boinc_fraction_done(state.frac_done); diff --git a/astro/boinc-astropulse/files/patch-client__ap_fileio.cpp b/astro/boinc-astropulse/files/patch-ap__fileio.cpp index 7a0929cb3dad..649bf4b31e33 100644 --- a/astro/boinc-astropulse/files/patch-client__ap_fileio.cpp +++ b/astro/boinc-astropulse/files/patch-ap__fileio.cpp @@ -1,5 +1,5 @@ ---- ap_fileio.cpp.orig 2012-02-28 00:01:04.000000000 +0100 -+++ ap_fileio.cpp 2013-08-05 22:45:10.000000000 +0200 +--- ap_fileio.cpp.orig 2012-02-27 23:01:04 UTC ++++ ap_fileio.cpp @@ -22,6 +22,7 @@ #include "windows.h" #endif diff --git a/astro/boinc-astropulse/files/patch-client__ap_fold.cpp b/astro/boinc-astropulse/files/patch-ap__fold.cpp index 1b37fa85c797..23d13a925dfd 100644 --- a/astro/boinc-astropulse/files/patch-client__ap_fold.cpp +++ b/astro/boinc-astropulse/files/patch-ap__fold.cpp @@ -1,6 +1,6 @@ ---- ap_fold.cpp.orig 2009-04-01 02:11:24.000000000 +0200 -+++ ap_fold.cpp 2013-08-06 18:42:02.000000000 +0200 -@@ -283,7 +283,6 @@ +--- ap_fold.cpp.orig 2009-04-01 00:11:24 UTC ++++ ap_fold.cpp +@@ -283,7 +283,6 @@ int Science::ffa(float *data, int num_su * used to inform the core client GUI of the % complete. */ boinc_fraction_done(state.frac_done); diff --git a/astro/boinc-astropulse/files/patch-client__ap_remove_radar.cpp b/astro/boinc-astropulse/files/patch-ap__remove__radar.cpp index 102c63b9839b..ee531cec87f4 100644 --- a/astro/boinc-astropulse/files/patch-client__ap_remove_radar.cpp +++ b/astro/boinc-astropulse/files/patch-ap__remove__radar.cpp @@ -1,5 +1,5 @@ ---- ap_remove_radar.cpp.orig 2012-01-26 07:53:16.000000000 +0100 -+++ ap_remove_radar.cpp 2012-08-12 00:14:40.000000000 +0200 +--- ap_remove_radar.cpp.orig 2012-01-26 06:53:16 UTC ++++ ap_remove_radar.cpp @@ -1,5 +1,4 @@ #include "astropulse.h" -#include "ap_graphics.h" diff --git a/astro/boinc-astropulse/files/patch-client__configure.ac b/astro/boinc-astropulse/files/patch-configure.ac index e91d5942cc49..f02cac4fe642 100644 --- a/astro/boinc-astropulse/files/patch-client__configure.ac +++ b/astro/boinc-astropulse/files/patch-configure.ac @@ -1,8 +1,8 @@ ---- configure.ac.orig 2009-06-11 19:35:16.000000000 +0200 -+++ configure.ac 2010-11-28 11:40:22.000000000 +0100 -@@ -7,17 +7,9 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(astropulse, 5.06) +--- configure.ac.orig 2012-08-14 00:07:20 UTC ++++ configure.ac +@@ -10,17 +10,9 @@ AC_INIT(astropulse, 6.01) + dnl tell libtool the location of the m4 macros + AC_CONFIG_MACRO_DIR([m4]) -svnrev="`svn info | grep Revision:`" - @@ -20,7 +20,7 @@ echo "--- Configuring Astropulse $AC_PACKAGE_VERSION ---" -@@ -262,9 +254,7 @@ +@@ -267,9 +259,7 @@ dnl AC_CHECK_LIB([z], [uncompress]) dnl AC_CHECK_LIB([stdc++], [main]) SAH_GRX_LIBS AC_LANG(C++) @@ -30,7 +30,7 @@ AC_CACHE_SAVE if test "${ac_cv_cxx_compiler_gnu}" = "yes" ; then -@@ -378,7 +368,7 @@ +@@ -383,7 +373,7 @@ AM_CONDITIONAL(ENABLE_CLIENT, [test "${e AM_CONDITIONAL(ENABLE_GUI, [test "${enable_graphics}" = yes]) AM_CONDITIONAL(LINUX, [test -n "`echo ${target} | grep linux`"]) AM_CONDITIONAL(I386, [test -n "`echo ${target} | grep i.86`"]) diff --git a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 b/astro/boinc-astropulse/files/patch-m4_sah__check__boinc.m4 index d1996c0de03d..6cbf7ca91f6f 100644 --- a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 +++ b/astro/boinc-astropulse/files/patch-m4_sah__check__boinc.m4 @@ -1,6 +1,6 @@ ---- m4/sah_check_boinc.m4.orig 2010-03-23 22:00:23.000000000 +0100 -+++ m4/sah_check_boinc.m4 2011-03-13 16:32:29.000000000 +0100 -@@ -30,7 +30,7 @@ +--- m4/sah_check_boinc.m4.orig 2010-03-23 21:00:23 UTC ++++ m4/sah_check_boinc.m4 +@@ -30,7 +30,7 @@ AC_DEFUN([SAH_CHECK_BOINC],[ cd $thisdir break else diff --git a/astro/boinc-setiathome-v7/files/patch-client__Makefile.am b/astro/boinc-setiathome-v7/files/patch-client_Makefile.am index 8bf2690d6c2b..fe1245fe5f86 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__Makefile.am +++ b/astro/boinc-setiathome-v7/files/patch-client_Makefile.am @@ -1,6 +1,6 @@ ---- client/Makefile.am.orig 2009-09-23 01:50:50.000000000 +0200 -+++ client/Makefile.am 2011-12-04 17:19:18.000000000 +0100 -@@ -165,7 +165,7 @@ +--- client/Makefile.am.orig 2013-06-26 17:01:48 UTC ++++ client/Makefile.am +@@ -199,7 +199,7 @@ if PPC seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \ diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_sse.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp index 162d1cb8509f..65ac60317069 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_sse.cpp +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp @@ -1,6 +1,6 @@ ---- client/vector/analyzeFuncs_sse.cpp.origin 2013-08-02 01:08:24.000000000 +0400 -+++ client/vector/analyzeFuncs_sse.cpp 2013-08-02 01:18:33.000000000 +0400 -@@ -191,7 +191,7 @@ +--- client/vector/analyzeFuncs_sse.cpp.orig 2013-06-26 16:56:49 UTC ++++ client/vector/analyzeFuncs_sse.cpp +@@ -191,7 +191,7 @@ inline void v_vsubTranspose4(float *in, prefetcht0(out+3*yline); // TODO: figure out why the intrinsic version crashes for MinGW build // not critical, but shuffle-only _MM_TRANSPOSE4_PS is optimal on some @@ -9,7 +9,7 @@ register float4 row0=*(__m128 *)in; register float4 row1=*(__m128 *)(in+xline); register float4 row2=*(__m128 *)(in+2*xline); -@@ -273,7 +273,7 @@ +@@ -273,7 +273,7 @@ inline void v_vsubTranspose4np(float *in // TODO: figure out why the intrinsic version crashes for MinGW build // not critical, but the shuffle-only _MM_TRANSPOSE4_PS is optimal on some @@ -18,7 +18,7 @@ register float4 row0=*(__m128 *)in; register float4 row1=*(__m128 *)(in+xline); register float4 row2=*(__m128 *)(in+2*xline); -@@ -1592,8 +1592,14 @@ +@@ -1592,8 +1592,14 @@ inline float s_maxp2f( __m128 max1 ) { return ( tMax ); } diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_vector.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp index 1a418db27f3e..f047dc9898ca 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_vector.cpp +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp @@ -1,5 +1,5 @@ ---- client/vector/analyzeFuncs_vector.cpp.orig 2013-07-11 22:32:37.000000000 +0200 -+++ client/vector/analyzeFuncs_vector.cpp 2013-07-11 22:41:59.000000000 +0200 +--- client/vector/analyzeFuncs_vector.cpp.orig 2011-08-04 00:35:40 UTC ++++ client/vector/analyzeFuncs_vector.cpp @@ -98,9 +98,7 @@ diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_x86_64.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp index beb6e2abfc7a..82b9b0df5fff 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_x86_64.cpp +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp @@ -1,6 +1,6 @@ ---- client/vector/analyzeFuncs_x86_64.cpp.orig 2011-04-03 07:25:53.000000000 +0200 -+++ client/vector/analyzeFuncs_x86_64.cpp 2013-07-29 17:41:37.000000000 +0200 -@@ -61,8 +61,14 @@ +--- client/vector/analyzeFuncs_x86_64.cpp.orig 2011-04-03 05:25:53 UTC ++++ client/vector/analyzeFuncs_x86_64.cpp +@@ -61,8 +61,14 @@ int v_vChirpData_x86_64( static const int as [4] __attribute__((aligned(16)))= {INT_MIN, 0, INT_MIN, 0} ; // {-, +, -, +} char *cblock = (char *)alloca(11*16); cblock+=(16-((ssize_t)cblock % 16)); diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__x86_float4.h b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h index e8e426206164..75316f94e46c 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__x86_float4.h +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h @@ -1,6 +1,6 @@ ---- client/vector/x86_float4.h.orig 2011-05-22 21:08:50.000000000 +0200 -+++ client/vector/x86_float4.h 2013-07-29 18:52:18.000000000 +0200 -@@ -58,11 +58,15 @@ +--- client/vector/x86_float4.h.orig 2011-05-22 19:08:50 UTC ++++ client/vector/x86_float4.h +@@ -58,11 +58,15 @@ extern const_float4 INDGEN[2]; ALIGNED(static const int sign_bits[4],16)={INT_MIN, INT_MIN, INT_MIN, INT_MIN}; ALIGNED(static const int other_bits[4],16)={INT_MAX, INT_MAX, INT_MAX, INT_MAX}; @@ -18,7 +18,7 @@ struct float4 { float4() {}; float4(const __m128 b) { m=b; }; -@@ -263,4 +267,3 @@ +@@ -263,4 +267,3 @@ struct const_float4 : public float4 { #endif #endif diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__x86_ops.h b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h index 27c17f4493cd..f84ade69d655 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__x86_ops.h +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h @@ -1,5 +1,5 @@ ---- client/vector/x86_ops.h.orig 2011-05-22 21:08:50.000000000 +0200 -+++ client/vector/x86_ops.h 2013-07-29 17:42:54.000000000 +0200 +--- client/vector/x86_ops.h.orig 2011-05-22 19:08:50 UTC ++++ client/vector/x86_ops.h @@ -135,7 +135,11 @@ #if defined(__SSE2__) @@ -13,7 +13,7 @@ typedef __m128d x86_m128d; #else typedef double x86_m128d __attribute__ ((mode(V2DF))) __attribute__((aligned(16))); -@@ -144,7 +148,11 @@ +@@ -144,7 +148,11 @@ typedef double x86_m128d __attribute__ ( #if defined(__SSE__) // SSE specific functions/macros here. @@ -26,7 +26,7 @@ typedef __m128 x86_m128; typedef __m128i x86_m128i; #else -@@ -186,6 +194,7 @@ +@@ -186,6 +194,7 @@ static inline void prefetchnta(const voi #endif @@ -34,7 +34,7 @@ #ifndef __m128d #define __m128d x86_m128d #endif -@@ -197,5 +206,6 @@ +@@ -197,5 +206,6 @@ static inline void prefetchnta(const voi #ifndef __m128 #define __m128 x86_m128 #endif diff --git a/astro/boinc-setiathome-v7/files/patch-configure.ac b/astro/boinc-setiathome-v7/files/patch-configure.ac index 34287cc90ad3..5cb2366b2ef7 100644 --- a/astro/boinc-setiathome-v7/files/patch-configure.ac +++ b/astro/boinc-setiathome-v7/files/patch-configure.ac @@ -1,5 +1,5 @@ ---- configure.ac.orig 2013-07-02 22:51:54.000000000 +0200 -+++ configure.ac 2013-07-11 21:40:55.000000000 +0200 +--- configure.ac.orig 2013-07-02 20:51:54 UTC ++++ configure.ac @@ -5,17 +5,10 @@ AC_PREREQ(2.57) @@ -21,7 +21,7 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(dist-zip) -@@ -55,8 +48,6 @@ +@@ -55,8 +48,6 @@ if test -z "`echo ${LDFLAGS} | grep ${tm fi # set posix source on linux diff --git a/astro/boinc-setiathome-v7/files/patch-m4__sah_check_boinc.m4 b/astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 index 821d7e296845..762f6c940204 100644 --- a/astro/boinc-setiathome-v7/files/patch-m4__sah_check_boinc.m4 +++ b/astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 @@ -1,6 +1,6 @@ ---- m4/sah_check_boinc.m4.orig 2008-09-09 18:55:19.000000000 +0200 -+++ m4/sah_check_boinc.m4 2011-03-13 16:24:18.000000000 +0100 -@@ -30,7 +30,7 @@ +--- m4/sah_check_boinc.m4.orig 2008-09-09 16:55:19 UTC ++++ m4/sah_check_boinc.m4 +@@ -30,7 +30,7 @@ AC_DEFUN([SAH_CHECK_BOINC],[ cd $thisdir break else diff --git a/astro/boinc-setiathome-v7/files/patch-sah_config.h b/astro/boinc-setiathome-v7/files/patch-sah__config.h index c24b82c8a6c6..b88bf5b419df 100644 --- a/astro/boinc-setiathome-v7/files/patch-sah_config.h +++ b/astro/boinc-setiathome-v7/files/patch-sah__config.h @@ -1,5 +1,5 @@ ---- sah_config.h.orig 2012-09-19 00:45:14.000000000 +0200 -+++ sah_config.h 2013-07-19 18:35:22.000000000 +0200 +--- sah_config.h.orig 2012-09-18 22:45:14 UTC ++++ sah_config.h @@ -21,7 +21,7 @@ #define AVX_MASKSTORE_TYPECAST(x) reinterpret_cast<__m256i>(x) diff --git a/astro/fowsr/files/patch-fowsr-c b/astro/fowsr/files/patch-fowsr.c index d7eb95d15757..9e312de81977 100644 --- a/astro/fowsr/files/patch-fowsr-c +++ b/astro/fowsr/files/patch-fowsr.c @@ -1,6 +1,6 @@ ---- fowsr.c.orig 2010-07-18 18:06:30.000000000 +0200 -+++ fowsr.c 2010-09-01 10:59:58.004518772 +0200 -@@ -110,13 +110,17 @@ +--- fowsr.c.orig 2016-07-26 12:57:00 UTC ++++ fowsr.c +@@ -110,13 +110,17 @@ int CUSB_Open(int vendor, int product) signal(SIGTERM, release_usb_device); @@ -18,7 +18,7 @@ ret = usb_claim_interface(devh, 0); if (ret != 0) { printf("claim failed with error %d\n", ret); -@@ -159,12 +163,14 @@ +@@ -159,12 +163,14 @@ void CWS_Cache(char isStoring) FILE* f; if (isStoring == ISREADING) { if (f=fopen(fname,"rb")) { @@ -33,7 +33,7 @@ n=fwrite(&m_timestamp,sizeof(m_timestamp),1,f); n=fwrite(m_buf,sizeof(m_buf[0]),WS_BUFFER_SIZE,f); } -@@ -566,6 +572,7 @@ +@@ -566,6 +572,7 @@ int CWF_Write(char arg,char* fname) FILE* f; if (f=fopen(fname,"a+s")) { diff --git a/astro/foxtrotgps/files/patch-src_tracks.c b/astro/foxtrotgps/files/patch-src_tracks.c index b31601124a4b..bb6d6f0aed5f 100644 --- a/astro/foxtrotgps/files/patch-src_tracks.c +++ b/astro/foxtrotgps/files/patch-src_tracks.c @@ -1,4 +1,4 @@ ---- src/tracks.c.orig 2015-05-21 11:26:32 UTC +--- src/tracks.c.orig 2014-10-24 04:57:10 UTC +++ src/tracks.c @@ -41,8 +41,10 @@ bbox_t get_track_bbox(GSList *track); GSList * load_log_file_into_list(char *file); diff --git a/astro/gkrellmoon2/files/patch-CalcEphem.c b/astro/gkrellmoon2/files/patch-CalcEphem.c index 780aa1d2a3be..7d65e0d68381 100644 --- a/astro/gkrellmoon2/files/patch-CalcEphem.c +++ b/astro/gkrellmoon2/files/patch-CalcEphem.c @@ -1,5 +1,5 @@ ---- CalcEphem.c.orig Thu Aug 15 20:41:03 2002 -+++ CalcEphem.c Thu Aug 15 20:41:23 2002 +--- CalcEphem.c.orig 2002-12-11 03:36:06 UTC ++++ CalcEphem.c @@ -8,6 +8,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/astro/gkrellmoon2/files/patch-Makefile b/astro/gkrellmoon2/files/patch-Makefile index 66c053c20eab..e08f52ee9eb3 100644 --- a/astro/gkrellmoon2/files/patch-Makefile +++ b/astro/gkrellmoon2/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Dec 11 04:36:06 2002 -+++ Makefile Wed Aug 25 13:09:01 2004 -@@ -4,11 +4,9 @@ +--- Makefile.orig 2002-12-11 03:36:06 UTC ++++ Makefile +@@ -4,12 +4,10 @@ GTK_LIB = `pkg-config gtk+-2.0 --libs` INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins @@ -8,8 +8,9 @@ +CFLAGS += -Wall -fPIC $(GTK_INCLUDE) LIBS = $(GTK_LIB) LFLAGS = -shared -- --CC = gcc $(CFLAGS) $(FLAGS) +-CC = gcc $(CFLAGS) $(FLAGS) +- OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o + gkrellmoon.so: $(OBJS) diff --git a/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py b/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py index 5d06dd885401..f922dd520bf2 100644 --- a/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py +++ b/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py @@ -1,6 +1,6 @@ ---- gmapcatcher/mapArgs.py.orig 2012-10-17 02:09:15.000000000 +0800 -+++ gmapcatcher/mapArgs.py 2012-12-12 13:58:33.000000000 +0800 -@@ -46,10 +46,10 @@ +--- gmapcatcher/mapArgs.py.orig 2013-07-19 08:20:47 UTC ++++ gmapcatcher/mapArgs.py +@@ -46,10 +46,10 @@ class MapArgs(): print ' very useful to download maps of entire world' print ' ' print 'SAMPLE USAGE' @@ -15,7 +15,7 @@ def __init__(self, arrArgs=()): if len(arrArgs) > 1: -@@ -99,7 +99,7 @@ +@@ -99,7 +99,7 @@ class MapArgs(): self.lng_range = 179 def __str__(self): diff --git a/astro/gmapcatcher/files/patch-setup.py b/astro/gmapcatcher/files/patch-setup.py index ba5a82f6741b..7f6d4a342b8c 100644 --- a/astro/gmapcatcher/files/patch-setup.py +++ b/astro/gmapcatcher/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2012-10-17 02:09:15.000000000 +0800 -+++ setup.py 2012-12-12 13:13:04.000000000 +0800 -@@ -13,15 +13,13 @@ +--- setup.py.orig 2013-07-19 08:20:47 UTC ++++ setup.py +@@ -13,15 +13,13 @@ if os.name == "posix": description = 'Offline Map Viewer', version = VERSION, url = WEB_ADDRESS, diff --git a/astro/google-earth/files/patch-bin-googleearth b/astro/google-earth/files/patch-bin-googleearth index a56aeb9494d6..0a3428911691 100644 --- a/astro/google-earth/files/patch-bin-googleearth +++ b/astro/google-earth/files/patch-bin-googleearth @@ -1,6 +1,6 @@ ---- ./bin/googleearth.orig 2011-05-17 10:42:02.000000000 +0300 -+++ ./bin/googleearth 2014-03-13 08:59:26.456795260 +0200 -@@ -8,6 +8,17 @@ +--- bin/googleearth.orig 2011-05-17 07:42:02 UTC ++++ bin/googleearth +@@ -8,6 +8,17 @@ if [ "${GOOGLEEARTH_DATA_PATH}" = "" ]; GOOGLEEARTH_DATA_PATH="$(dirname "$(readlink -f "$0")")" fi @@ -18,7 +18,7 @@ LD_LIBRARY_PATH=.:${GOOGLEEARTH_DATA_PATH}:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH -@@ -15,10 +26,11 @@ +@@ -15,10 +26,11 @@ export LD_LIBRARY_PATH if [ -x "${GOOGLEEARTH_DATA_PATH}/googleearth-bin" ] then cd "${GOOGLEEARTH_DATA_PATH}/" diff --git a/astro/gpsbabel/files/patch-Makefile.in b/astro/gpsbabel/files/patch-Makefile.in index 218684aeab3a..c83b242e4b2e 100644 --- a/astro/gpsbabel/files/patch-Makefile.in +++ b/astro/gpsbabel/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig +--- Makefile.in.orig 2016-01-03 02:09:17 UTC +++ Makefile.in @@ -148,10 +148,10 @@ toolinfo all: gpsbabel$(EXEEXT) diff --git a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc b/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc index 60f7859af9dc..6995a8224c48 100644 --- a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc +++ b/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc @@ -1,4 +1,4 @@ ---- jeeps/gpslibusb.cc.orig +--- jeeps/gpslibusb.cc.orig 2016-01-03 02:09:17 UTC +++ jeeps/gpslibusb.cc @@ -20,8 +20,8 @@ */ diff --git a/astro/gpsbabel/files/patch-src-core-ziparchive.cc b/astro/gpsbabel/files/patch-src_core_ziparchive.cc index 283b5a6ddd2e..718db70a6496 100644 --- a/astro/gpsbabel/files/patch-src-core-ziparchive.cc +++ b/astro/gpsbabel/files/patch-src_core_ziparchive.cc @@ -1,4 +1,4 @@ ---- src/core/ziparchive.cc.orig +--- src/core/ziparchive.cc.orig 2016-01-03 02:09:17 UTC +++ src/core/ziparchive.cc @@ -23,7 +23,7 @@ diff --git a/astro/gpsbabel/files/patch-src-core-ziparchive.h b/astro/gpsbabel/files/patch-src_core_ziparchive.h index 3a2165d7be69..b6816189892f 100644 --- a/astro/gpsbabel/files/patch-src-core-ziparchive.h +++ b/astro/gpsbabel/files/patch-src_core_ziparchive.h @@ -1,4 +1,4 @@ ---- src/core/ziparchive.h.orig +--- src/core/ziparchive.h.orig 2016-01-03 02:09:17 UTC +++ src/core/ziparchive.h @@ -21,7 +21,7 @@ diff --git a/astro/gpsbabel14/files/patch-libusb b/astro/gpsbabel14/files/patch-libusb index 4bf7613de5d0..99caa8136d9c 100644 --- a/astro/gpsbabel14/files/patch-libusb +++ b/astro/gpsbabel14/files/patch-libusb @@ -1,6 +1,6 @@ ---- configure.in.orig 2008-10-31 15:43:21.000000000 +0300 -+++ configure.in 2009-03-07 01:08:46.000000000 +0300 -@@ -170,6 +169,28 @@ +--- configure.in.orig 2012-09-03 22:09:52 UTC ++++ configure.in +@@ -189,6 +189,28 @@ case "$target" in AC_DEFINE(HAVE_LIBUSB, 1) CFLAGS="$CFLAGS -Imac/libusb/" ;; diff --git a/astro/gpsd/files/patch-libgps.pc.in b/astro/gpsd/files/patch-libgps.pc.in index 2a0106e99fcf..3242278e458f 100644 --- a/astro/gpsd/files/patch-libgps.pc.in +++ b/astro/gpsd/files/patch-libgps.pc.in @@ -1,5 +1,5 @@ ---- libgps.pc.in.orig 2015-01-25 12:09:01.000000000 +0000 -+++ libgps.pc.in 2015-05-21 02:11:05.192169497 +0000 +--- libgps.pc.in.orig 2015-01-25 12:09:01 UTC ++++ libgps.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=${prefix} diff --git a/astro/gpsd/files/patch-libgpsd.pc.in b/astro/gpsd/files/patch-libgpsd.pc.in index 913feef4b813..1f716e4d7ba4 100644 --- a/astro/gpsd/files/patch-libgpsd.pc.in +++ b/astro/gpsd/files/patch-libgpsd.pc.in @@ -1,5 +1,5 @@ ---- libgpsd.pc.in.orig 2015-01-23 18:48:09.000000000 +0000 -+++ libgpsd.pc.in 2015-05-21 02:11:05.192169497 +0000 +--- libgpsd.pc.in.orig 2015-01-23 18:48:09 UTC ++++ libgpsd.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=${prefix} diff --git a/astro/gpsdrive/files/patch-src__gpsserial.c b/astro/gpsdrive/files/patch-src_gpsserial.c index 531570d64224..208613e2d91c 100644 --- a/astro/gpsdrive/files/patch-src__gpsserial.c +++ b/astro/gpsdrive/files/patch-src_gpsserial.c @@ -1,6 +1,6 @@ ---- src/gpsserial.c.orig Thu Feb 12 18:42:53 2004 -+++ src/gpsserial.c Mon Sep 6 00:44:34 2004 -@@ -178,7 +178,9 @@ +--- src/gpsserial.c.orig 2004-02-12 17:42:53 UTC ++++ src/gpsserial.c +@@ -178,7 +178,9 @@ readinput_init (void) CLOCAL : local connection, no modem contol CREAD : enable receiving characters */ diff --git a/astro/gpsdrive/files/patch-src__splash.c b/astro/gpsdrive/files/patch-src_splash.c index 22e57ada2d77..5f12a99db103 100644 --- a/astro/gpsdrive/files/patch-src__splash.c +++ b/astro/gpsdrive/files/patch-src_splash.c @@ -1,6 +1,6 @@ ---- src/splash.c.orig Mon Jun 7 09:55:30 2004 -+++ src/splash.c Mon Jun 7 09:56:28 2004 -@@ -529,6 +529,24 @@ +--- src/splash.c.orig 2004-03-02 03:07:17 UTC ++++ src/splash.c +@@ -529,6 +529,24 @@ insert_text (GtkTextBuffer * buffer) { GtkTextIter iter; GtkTextIter start, end; @@ -25,7 +25,7 @@ /* demo_find_file() looks in the the current directory first, * so you can run gtk-demo without installing GTK, then looks -@@ -564,19 +582,7 @@ +@@ -564,19 +582,7 @@ insert_text (GtkTextBuffer * buffer) -1, "blue_foreground", NULL); gtk_text_buffer_insert (buffer, &iter, "\n", -1); @@ -45,7 +45,7 @@ gtk_text_buffer_insert (buffer, &iter, t1, -1); gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, -@@ -592,12 +598,6 @@ +@@ -592,12 +598,6 @@ insert_text (GtkTextBuffer * buffer) -1, "underline", NULL); gtk_text_buffer_insert (buffer, &iter, _(" letters in the button text.\n"), -1); diff --git a/astro/gpsman/files/patch-gpsman.tcl b/astro/gpsman/files/patch-gpsman.tcl index 260fa54fea1f..34ba22be299a 100644 --- a/astro/gpsman/files/patch-gpsman.tcl +++ b/astro/gpsman/files/patch-gpsman.tcl @@ -1,20 +1,19 @@ -diff -ruN gpsman.tcl gpsman.tcl ---- gpsman.tcl Tue May 9 02:37:24 2006 -+++ gpsman.tcl Wed May 10 17:56:02 2006 +--- gpsman.tcl.orig 2013-10-06 21:12:47 UTC ++++ gpsman.tcl @@ -1,6 +1,6 @@ #!/bin/sh # This is a Tcl/Tk script to be interpreted by wish (Tk8.3 or better): \ -exec wish "$0" -- "$@" +exec %%WISH%% "$0" -- "$@" + # This is the main file of: # - # gpsman --- GPS Manager: a manager for GPS receiver data -@@ -247,7 +247,7 @@ +@@ -247,7 +247,7 @@ switch $tcl_platform(platform) { } # path to directory containing program files -set SRCDIR gmsrc +set SRCDIR %%GPSMANDIR%%/gmsrc - # all other defaults configuration is now done in file $SRCDIR/config.tcl + # all other default configuration is now done in file $SRCDIR/config.tcl diff --git a/astro/kstars/files/patch-kstars__skyobjects__kscomet.cpp b/astro/kstars/files/patch-kstars_skyobjects_kscomet.cpp index 9b06ba84006e..85037a9c3a6e 100644 --- a/astro/kstars/files/patch-kstars__skyobjects__kscomet.cpp +++ b/astro/kstars/files/patch-kstars_skyobjects_kscomet.cpp @@ -1,6 +1,6 @@ ---- kstars/skyobjects/kscomet.cpp.orig 2014-09-15 23:02:14.160209962 +0200 -+++ kstars/skyobjects/kscomet.cpp 2014-09-15 23:03:33.261204279 +0200 -@@ -119,7 +119,7 @@ +--- kstars/skyobjects/kscomet.cpp.orig 2014-09-19 05:39:42 UTC ++++ kstars/skyobjects/kscomet.cpp +@@ -119,7 +119,7 @@ KSComet::KSComet( const QString &_s, con qint64 fragment = letterDesigToN( rePro.cap(6) ); uidPart = diff --git a/astro/libnova/files/patch-src_hyperbolic_motion.c b/astro/libnova/files/patch-src_hyperbolic__motion.c index f5af5ce7154c..70492aa02d1a 100644 --- a/astro/libnova/files/patch-src_hyperbolic_motion.c +++ b/astro/libnova/files/patch-src_hyperbolic__motion.c @@ -1,6 +1,6 @@ ---- src/hyperbolic_motion.c.orig Tue Jul 5 11:09:22 2005 -+++ src/hyperbolic_motion.c Sat Feb 18 02:17:12 2006 -@@ -69,12 +69,12 @@ +--- src/hyperbolic_motion.c.orig 2011-07-28 11:02:50 UTC ++++ src/hyperbolic_motion.c +@@ -70,12 +70,12 @@ next_z: F = Z1 * G1; Q3 = Q3 + F; if (Z > 100 || fabs(F) > 10000) diff --git a/astro/libnova/files/patch-src_precession.c b/astro/libnova/files/patch-src_precession.c index 0f7784f12cef..78d8c407d871 100644 --- a/astro/libnova/files/patch-src_precession.c +++ b/astro/libnova/files/patch-src_precession.c @@ -1,6 +1,6 @@ ---- src/precession.c.orig Tue Jan 10 23:35:08 2006 -+++ src/precession.c Tue Aug 15 18:03:50 2006 -@@ -56,21 +56,21 @@ +--- src/precession.c.orig 2011-07-28 11:02:50 UTC ++++ src/precession.c +@@ -82,21 +82,21 @@ void ln_get_equ_prec (struct ln_equ_posn theta = ln_deg_to_rad (theta); /* calc A,B,C equ 20.4 */ @@ -28,7 +28,7 @@ } /* change to degrees */ -@@ -114,21 +114,21 @@ +@@ -140,21 +140,21 @@ void ln_get_equ_prec2 (struct ln_equ_pos theta = ln_deg_to_rad (theta); /* calc A,B,C equ 20.4 */ diff --git a/astro/libnova/files/patch-src__utility.c b/astro/libnova/files/patch-src_utility.c index 2a9161955e31..5b77ca6862a4 100644 --- a/astro/libnova/files/patch-src__utility.c +++ b/astro/libnova/files/patch-src_utility.c @@ -1,8 +1,8 @@ ---- src/utility.c.orig Wed Jan 17 08:16:02 2007 -+++ src/utility.c Sat Feb 10 12:08:36 2007 -@@ -45,10 +45,6 @@ +--- src/utility.c.orig 2012-04-28 09:41:42 UTC ++++ src/utility.c +@@ -44,10 +44,6 @@ #include <ctype.h> - #include <libnova/utility.h> + #include <libnova/libnova.h> -#ifndef __APPLE__ -#include <malloc.h> diff --git a/astro/luna/files/patch-iprintf-iprintf.c b/astro/luna/files/patch-iprintf_iprintf.c index fa449c78759d..7f0a5f4f6cf0 100644 --- a/astro/luna/files/patch-iprintf-iprintf.c +++ b/astro/luna/files/patch-iprintf_iprintf.c @@ -1,5 +1,5 @@ ---- iprintf/iprintf.c.orig Thu Apr 23 16:23:14 1992 -+++ iprintf/iprintf.c Sat Nov 22 04:11:33 2003 +--- iprintf/iprintf.c.orig 2016-07-26 13:07:24 UTC ++++ iprintf/iprintf.c @@ -13,7 +13,7 @@ #if defined(ANSI) # include <stdarg.h> @@ -9,7 +9,7 @@ #else Error : varargs.h or stdarg.h is required to compile this. #endif /* ANSI or UNIX */ -@@ -52,44 +52,21 @@ +@@ -52,44 +52,21 @@ i_fputn(stream, string, count, total_cou } diff --git a/astro/luna/files/patch-iprintf-isprintf.c b/astro/luna/files/patch-iprintf_isprintf.c index e1b3835574fb..487cb4be9061 100644 --- a/astro/luna/files/patch-iprintf-isprintf.c +++ b/astro/luna/files/patch-iprintf_isprintf.c @@ -1,5 +1,5 @@ ---- iprintf/isprintf.c.orig Thu Apr 23 16:23:16 1992 -+++ iprintf/isprintf.c Sat Nov 22 04:13:54 2003 +--- iprintf/isprintf.c.orig 2016-07-26 13:07:24 UTC ++++ iprintf/isprintf.c @@ -8,13 +8,7 @@ @@ -14,7 +14,7 @@ #if defined(ANSI) -@@ -49,47 +43,22 @@ +@@ -49,47 +43,22 @@ i_sputn(dest, string, count, total_count } diff --git a/astro/luna/files/patch-iprintf_makefile b/astro/luna/files/patch-iprintf_makefile index 941d222dd192..5171952303ad 100644 --- a/astro/luna/files/patch-iprintf_makefile +++ b/astro/luna/files/patch-iprintf_makefile @@ -1,5 +1,5 @@ ---- iprintf/makefile.orig Sun May 10 03:03:06 1992 -+++ iprintf/makefile Sat Feb 12 23:27:55 2000 +--- iprintf/makefile.orig 2016-07-26 13:07:24 UTC ++++ iprintf/makefile @@ -3,11 +3,11 @@ # @@ -16,7 +16,7 @@ # # All modules -@@ -15,9 +15,9 @@ +@@ -15,9 +15,9 @@ CFLAGS = -Ox -AS -DANSI -W4 SRCS = iansilib.c idoprnt.c iprintf.c isprintf.c # MSDOS diff --git a/astro/luna/files/patch-luna.c b/astro/luna/files/patch-luna.c index 2936f2cd56ec..4fd5e681ab80 100644 --- a/astro/luna/files/patch-luna.c +++ b/astro/luna/files/patch-luna.c @@ -1,5 +1,5 @@ ---- luna.c.orig 1992-05-25 01:01:32.000000000 +0200 -+++ luna.c 2011-12-20 19:57:51.404175556 +0100 +--- luna.c.orig 2016-07-26 13:07:24 UTC ++++ luna.c @@ -25,27 +25,43 @@ #include "luna.h" @@ -51,7 +51,7 @@ if (numonly) { printf(" "); -@@ -62,10 +78,11 @@ +@@ -62,10 +78,11 @@ main(argc, argv) today = FALSE; tomorrow(localtmp); @@ -64,7 +64,7 @@ } -@@ -177,18 +194,15 @@ +@@ -177,18 +194,15 @@ usage() void @@ -86,7 +86,7 @@ struct tm *localtmp; argnumcnt = 0; -@@ -375,20 +389,7 @@ +@@ -375,20 +389,7 @@ getoptions(argc, argv, localtmpp, algotm localtmp -> tm_yday = ymd2yday(localtmp -> tm_year, localtmp -> tm_mon, localtmp -> tm_mday); diff --git a/astro/luna/files/patch-luna.h b/astro/luna/files/patch-luna.h index 6467f053a898..2f4d6f6940b0 100644 --- a/astro/luna/files/patch-luna.h +++ b/astro/luna/files/patch-luna.h @@ -1,6 +1,6 @@ ---- luna.h~ 1992-05-25 00:48:34.000000000 +0200 -+++ luna.h 2011-12-20 19:57:27.963178999 +0100 -@@ -32,7 +32,7 @@ +--- luna.h.orig 2016-07-26 13:07:24 UTC ++++ luna.h +@@ -32,7 +32,7 @@ typedef enum { #if defined(ANSI) @@ -9,7 +9,7 @@ extern void drawluna(int aotmoon); extern void usage(void); extern void getoptions(int argc, char **argv, -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ typedef enum { extern int getext(int year, int mon, int day); extern void printextstate(int age); #else diff --git a/astro/luna/files/patch-makefile b/astro/luna/files/patch-makefile index 39a3160d5029..ca6043bdf551 100644 --- a/astro/luna/files/patch-makefile +++ b/astro/luna/files/patch-makefile @@ -1,5 +1,5 @@ ---- makefile.orig 2013-10-25 16:28:17.000000000 +0800 -+++ makefile 2013-10-25 16:28:43.000000000 +0800 +--- makefile.orig 2016-07-26 13:07:24 UTC ++++ makefile @@ -2,23 +2,24 @@ # Makefile for luna using BSD cc # diff --git a/astro/luna/files/patch-pyramid.c b/astro/luna/files/patch-pyramid.c index da829614cf00..4fda198a43a5 100644 --- a/astro/luna/files/patch-pyramid.c +++ b/astro/luna/files/patch-pyramid.c @@ -1,6 +1,6 @@ ---- pyramid.c.orig Mon May 25 01:26:10 1992 -+++ pyramid.c Mon Feb 21 02:23:51 2000 -@@ -67,7 +67,7 @@ +--- pyramid.c.orig 2016-07-26 13:07:24 UTC ++++ pyramid.c +@@ -67,7 +67,7 @@ getlocaltm() Time_t ltime; time(<ime); @@ -9,7 +9,7 @@ #endif /* MSDOS or UNIX */ } -@@ -197,19 +197,14 @@ +@@ -197,19 +197,14 @@ char * Asctime(struct tm *tmp) { static char s[LASCTIME]; diff --git a/astro/luna/files/patch-pyramid.h b/astro/luna/files/patch-pyramid.h index 06ad88e9511a..c34bf77c4d2a 100644 --- a/astro/luna/files/patch-pyramid.h +++ b/astro/luna/files/patch-pyramid.h @@ -1,5 +1,5 @@ ---- pyramid.h.orig Mon May 25 01:24:12 1992 -+++ pyramid.h Mon Feb 21 02:23:55 2000 +--- pyramid.h.orig 2016-07-26 13:07:24 UTC ++++ pyramid.h @@ -14,13 +14,16 @@ # include <dos.h> # include <stdlib.h> @@ -20,7 +20,7 @@ #endif /* MSDOS or not */ typedef long ABDATE; -@@ -52,15 +55,6 @@ +@@ -52,15 +55,6 @@ typedef long ABDATE; # if defined(MSDOS) extern char *Asctime(struct tm *tmp); extern char *capitalize(char *chp); @@ -36,7 +36,7 @@ # endif /* ANSI and MSDOS */ #else /* ANSI */ -@@ -69,3 +63,16 @@ +@@ -69,3 +63,16 @@ typedef long ABDATE; extern void tzconv(); extern void tomorrow(); #endif /* ANSI or not */ diff --git a/astro/merkaartor/files/patch-src_src.pro b/astro/merkaartor/files/patch-src_src.pro index 28afade9d899..0319e85e7eb6 100644 --- a/astro/merkaartor/files/patch-src_src.pro +++ b/astro/merkaartor/files/patch-src_src.pro @@ -1,5 +1,5 @@ Link against the right library name for archivers/quazip-qt5. ---- src/src.pro.orig 2015-12-28 22:27:47 UTC +--- src/src.pro.orig 2015-07-19 14:50:09 UTC +++ src/src.pro @@ -15,7 +15,7 @@ isEmpty(SYSTEM_QUAZIP) { DEFINES += QUAZIP_STATIC diff --git a/astro/mymoon/files/patch-configure b/astro/mymoon/files/patch-configure index 4e83da2d07f8..0efe65afcc50 100644 --- a/astro/mymoon/files/patch-configure +++ b/astro/mymoon/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat May 24 06:09:38 2003 -+++ configure Fri Oct 14 19:51:18 2005 -@@ -849,7 +849,7 @@ +--- configure.orig 2003-05-23 20:09:38 UTC ++++ configure +@@ -849,7 +849,7 @@ done PACKAGE=mymoon VERSION=1.0 @@ -9,7 +9,7 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -890,9 +890,9 @@ +@@ -890,9 +890,9 @@ fi done LNOVA_LIB_NAME="" @@ -22,7 +22,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -904,10 +904,10 @@ +@@ -904,10 +904,10 @@ cat > conftest.$ac_ext <<EOF /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ diff --git a/astro/mymoon/files/patch-grapher.h b/astro/mymoon/files/patch-grapher.h index b4828f9420b0..de59606dcb68 100644 --- a/astro/mymoon/files/patch-grapher.h +++ b/astro/mymoon/files/patch-grapher.h @@ -1,6 +1,6 @@ ---- grapher.h.orig Wed Jul 16 21:24:46 2003 -+++ grapher.h Fri Oct 14 20:08:52 2005 -@@ -13,15 +13,14 @@ +--- grapher.h.orig 2003-07-16 11:24:46 UTC ++++ grapher.h +@@ -13,15 +13,14 @@ memset(&arrow, 0, sizeof(arrow)); for (z=0;z<=progress;z++) {arrow[z]=bar;}for (k=z;k<=max/4;k++) {arrow[k]=empty;} mvprintw(row/4,0, diff --git a/astro/mymoon/files/patch-mymoon.c b/astro/mymoon/files/patch-mymoon.c index 2288dffaa3c1..e6a83da14aa6 100644 --- a/astro/mymoon/files/patch-mymoon.c +++ b/astro/mymoon/files/patch-mymoon.c @@ -1,12 +1,12 @@ ---- mymoon.c.orig Wed Jul 16 21:13:55 2003 -+++ mymoon.c Fri Oct 14 19:55:31 2005 +--- mymoon.c.orig 2003-07-16 11:13:55 UTC ++++ mymoon.c @@ -1,4 +1,4 @@ -#include <libnova.h> +#include <libnova/libnova.h> #include <curses.h> #include <time.h> #include <stdlib.h> -@@ -59,7 +59,7 @@ +@@ -59,7 +59,7 @@ memset(&date2, 0, sizeof(date2)); memset(&date3, 0, sizeof(date3)); while (1) { @@ -15,7 +15,7 @@ age=moonphase(); -@@ -67,12 +67,12 @@ +@@ -67,12 +67,12 @@ if ( (latitude != 0) || (longitude != 0 observer.lng=latitude; observer.lat=longitude; } else {observer.lng=45.12;observer.lat=8.42;} diff --git a/astro/openuniverse/files/patch-src_comet.cpp b/astro/openuniverse/files/patch-src_comet.cpp index 2396b6492f5d..a8dd2baec728 100644 --- a/astro/openuniverse/files/patch-src_comet.cpp +++ b/astro/openuniverse/files/patch-src_comet.cpp @@ -1,6 +1,6 @@ ---- src/comet.cpp.orig Sat May 13 15:48:51 2000 -+++ src/comet.cpp Fri Mar 23 19:49:12 2001 -@@ -52,7 +52,7 @@ +--- src/comet.cpp.orig 2000-05-13 22:48:51 UTC ++++ src/comet.cpp +@@ -52,7 +52,7 @@ void CometTail(int body) #ifdef WIN32 wglPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quad); #else diff --git a/astro/openuniverse/files/patch-a b/astro/openuniverse/files/patch-src_ou.cpp index 76b6ad6ad7f1..38cc3f4d10f4 100644 --- a/astro/openuniverse/files/patch-a +++ b/astro/openuniverse/files/patch-src_ou.cpp @@ -1,6 +1,5 @@ -diff -ruN src/ou.cpp.orig src/ou.cpp ---- src/ou.cpp.orig Sun Jun 4 21:29:29 2000 -+++ src/ou.cpp Sat Jun 10 07:37:23 2000 +--- src/ou.cpp.orig 2000-06-04 21:29:29 UTC ++++ src/ou.cpp @@ -22,7 +22,7 @@ #include <string.h> #include <math.h> diff --git a/astro/openuniverse/files/patch-src_ou.h b/astro/openuniverse/files/patch-src_ou.h index fbadc8fa3863..098eee0407e7 100644 --- a/astro/openuniverse/files/patch-src_ou.h +++ b/astro/openuniverse/files/patch-src_ou.h @@ -1,5 +1,5 @@ ---- src/ou.h.orig Sun Jun 4 12:35:09 2000 -+++ src/ou.h Tue Nov 5 12:17:24 2002 +--- src/ou.h.orig 2000-06-04 19:35:09 UTC ++++ src/ou.h @@ -19,6 +19,7 @@ #include <stdio.h> diff --git a/astro/openuniverse/files/patch-b b/astro/openuniverse/files/patch-src_timeb.h index f87af09f7600..8c2f67c51eae 100644 --- a/astro/openuniverse/files/patch-b +++ b/astro/openuniverse/files/patch-src_timeb.h @@ -1,6 +1,5 @@ -diff -ruN src/timeb.h.orig src/timeb.h ---- src/timeb.h.orig Thu Jan 1 00:00:00 1970 -+++ src/timeb.h Sat Jun 10 07:37:45 2000 +--- src/timeb.h.orig 2016-07-26 13:11:57 UTC ++++ src/timeb.h @@ -0,0 +1,46 @@ +/* Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. diff --git a/astro/osmium/files/patch-test-run__tests.sh b/astro/osmium/files/patch-test_run__tests.sh index 8a7f46bcdd1d..388e09a86eac 100644 --- a/astro/osmium/files/patch-test-run__tests.sh +++ b/astro/osmium/files/patch-test_run__tests.sh @@ -1,5 +1,5 @@ ---- test/run_tests.sh.orig 2013-05-09 19:20:50.000000000 +0400 -+++ test/run_tests.sh 2013-05-23 00:01:42.140354335 +0400 +--- test/run_tests.sh.orig 2013-05-09 15:20:50 UTC ++++ test/run_tests.sh @@ -10,8 +10,10 @@ set -e diff --git a/astro/p5-Astro-FITS-CFITSIO/files/patch-Makefile.PL b/astro/p5-Astro-FITS-CFITSIO/files/patch-Makefile.PL index 8c7ba9a34c2d..b81c298f07d0 100644 --- a/astro/p5-Astro-FITS-CFITSIO/files/patch-Makefile.PL +++ b/astro/p5-Astro-FITS-CFITSIO/files/patch-Makefile.PL @@ -1,6 +1,6 @@ ---- Makefile.PL.orig 2012-01-22 01:52:49.000000000 -0500 -+++ Makefile.PL 2012-01-22 01:53:32.000000000 -0500 -@@ -22,9 +22,9 @@ +--- Makefile.PL.orig 2012-01-19 19:18:45 UTC ++++ Makefile.PL +@@ -22,9 +22,9 @@ FOUND_IT: { } } diff --git a/astro/phoon/files/patch-Makefile b/astro/phoon/files/patch-Makefile index f01683bd8fab..65fb53888e8c 100644 --- a/astro/phoon/files/patch-Makefile +++ b/astro/phoon/files/patch-Makefile @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2003-01-21 04:04:36.000000000 +0100 -+++ ./Makefile 2014-02-12 22:39:19.404018490 +0100 +--- Makefile.orig 2003-01-21 03:04:36 UTC ++++ Makefile @@ -1,15 +1,15 @@ # Makefile for phoon @@ -21,7 +21,7 @@ all: phoon -@@ -24,7 +24,7 @@ +@@ -24,7 +24,7 @@ date_parse.o: date_parse.h astro.o: astro.h install: all diff --git a/astro/phoon/files/patch-astro.h b/astro/phoon/files/patch-astro.h index 22929650029c..74e0d9ab242c 100644 --- a/astro/phoon/files/patch-astro.h +++ b/astro/phoon/files/patch-astro.h @@ -1,6 +1,6 @@ ---- ./astro.h.orig 2003-01-28 01:55:32.000000000 +0100 -+++ ./astro.h 2014-02-12 22:38:52.437019902 +0100 -@@ -43,4 +43,4 @@ +--- astro.h.orig 2003-01-28 00:55:32 UTC ++++ astro.h +@@ -43,4 +43,4 @@ extern void phasehunt2( double sdate, do */ extern double phase( double pdate, double* pphase, double* mage, double* dist, double* angdia, double* sudist, double* suangdia ); diff --git a/astro/phoon/files/patch-phoon.c b/astro/phoon/files/patch-phoon.c index b59e6679f2cf..5922fc4271cd 100644 --- a/astro/phoon/files/patch-phoon.c +++ b/astro/phoon/files/patch-phoon.c @@ -1,6 +1,6 @@ ---- ./phoon.c.orig 2005-05-20 21:10:24.000000000 +0200 -+++ ./phoon.c 2014-02-12 22:38:52.438019914 +0100 -@@ -354,7 +354,7 @@ +--- phoon.c.orig 2005-05-20 19:10:24 UTC ++++ phoon.c +@@ -354,7 +354,7 @@ putmoon( time_t t, int numlines, char* a struct tm* tmP; double jd, pctphase, angphase, cphase, aom, cdist, cangdia, csund, csuang; double phases[2], which[2]; diff --git a/astro/py-astropy/files/patch-astropy_io_fits_setup__package.py b/astro/py-astropy/files/patch-astropy_io_fits_setup__package.py index 6926c24440a4..e1fa9457aea1 100644 --- a/astro/py-astropy/files/patch-astropy_io_fits_setup__package.py +++ b/astro/py-astropy/files/patch-astropy_io_fits_setup__package.py @@ -1,4 +1,4 @@ ---- astropy/io/fits/setup_package.py.orig 2016-07-02 18:54:36 UTC +--- astropy/io/fits/setup_package.py.orig 2016-03-10 22:20:43 UTC +++ astropy/io/fits/setup_package.py @@ -39,7 +39,7 @@ def _get_compression_extension(): '-Wno-uninitialized', '-Wno-format', diff --git a/astro/py-astropy/files/patch-astropy_wcs_setup__package.py b/astro/py-astropy/files/patch-astropy_wcs_setup__package.py index b4b0629e40e8..a2a12f28f3d8 100644 --- a/astro/py-astropy/files/patch-astropy_wcs_setup__package.py +++ b/astro/py-astropy/files/patch-astropy_wcs_setup__package.py @@ -1,4 +1,4 @@ ---- astropy/wcs/setup_package.py.orig 2016-07-02 18:53:24 UTC +--- astropy/wcs/setup_package.py.orig 2016-03-10 22:20:43 UTC +++ astropy/wcs/setup_package.py @@ -244,8 +244,7 @@ def get_wcslib_cfg(cfg, wcslib_files, in '-Wno-strict-prototypes', diff --git a/astro/qlandkartegt/files/patch-cmake-Modules-DefineInstallationPaths.cmake b/astro/qlandkartegt/files/patch-cmake_Modules_DefineInstallationPaths.cmake index 2605a2b9f15a..2605a2b9f15a 100644 --- a/astro/qlandkartegt/files/patch-cmake-Modules-DefineInstallationPaths.cmake +++ b/astro/qlandkartegt/files/patch-cmake_Modules_DefineInstallationPaths.cmake diff --git a/astro/qmapshack/files/patch-cmake-Modules-DefineInstallationPaths.cmake b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake index c384115378a0..ad5a5abd31a5 100644 --- a/astro/qmapshack/files/patch-cmake-Modules-DefineInstallationPaths.cmake +++ b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake @@ -1,4 +1,4 @@ ---- cmake/Modules/DefineInstallationPaths.cmake.orig 2015-05-22 16:29:44 UTC +--- cmake/Modules/DefineInstallationPaths.cmake.orig 2014-08-18 10:08:14 UTC +++ cmake/Modules/DefineInstallationPaths.cmake @@ -101,7 +101,7 @@ if (UNIX) FORCE diff --git a/astro/rmap/files/patch-main.c b/astro/rmap/files/patch-main.c index 781a7b095d17..4e08e2d79a44 100644 --- a/astro/rmap/files/patch-main.c +++ b/astro/rmap/files/patch-main.c @@ -1,6 +1,6 @@ ---- main.c.orig Tue Mar 28 17:01:17 2000 -+++ main.c Thu Mar 30 02:43:08 2000 -@@ -154,7 +154,7 @@ +--- main.c.orig 2000-03-28 16:01:17 UTC ++++ main.c +@@ -154,7 +154,7 @@ int main (int argc, char **argv) { case 'h': printf("Usage: rmap [--zoom=VALUE] [--xrot=VALUE] [--yrot=VALUE] [--zrot=VALUE]\n"); printf(" [--datafile=FILENAME] [--continent=LIST] [--category=LIST]\n"); diff --git a/astro/routino/files/patch-doc_Makefile b/astro/routino/files/patch-doc_Makefile index a4ac4da5356e..7e9b02313dd2 100644 --- a/astro/routino/files/patch-doc_Makefile +++ b/astro/routino/files/patch-doc_Makefile @@ -1,4 +1,4 @@ ---- doc/Makefile.orig 2016-06-04 17:01:05 UTC +--- doc/Makefile.orig 2014-03-22 11:28:26 UTC +++ doc/Makefile @@ -43,19 +43,19 @@ install: install-txt install-html install-txt: diff --git a/astro/routino/files/patch-extras_find-fixme_Makefile b/astro/routino/files/patch-extras_find-fixme_Makefile index 32ef40c00de8..11c825c8a07e 100644 --- a/astro/routino/files/patch-extras_find-fixme_Makefile +++ b/astro/routino/files/patch-extras_find-fixme_Makefile @@ -1,4 +1,4 @@ ---- extras/find-fixme/Makefile.orig 2016-06-04 17:12:29 UTC +--- extras/find-fixme/Makefile.orig 2016-02-09 19:05:19 UTC +++ extras/find-fixme/Makefile @@ -52,8 +52,8 @@ all-bin: $(EXE) @[ -d $(WEBBINDIR) ] || mkdir -p $(WEBBINDIR) diff --git a/astro/routino/files/patch-web_Makefile b/astro/routino/files/patch-web_Makefile index e87a7becd44d..68360567777f 100644 --- a/astro/routino/files/patch-web_Makefile +++ b/astro/routino/files/patch-web_Makefile @@ -1,4 +1,4 @@ ---- web/Makefile.orig 2016-06-04 17:03:11 UTC +--- web/Makefile.orig 2015-09-30 18:22:28 UTC +++ web/Makefile @@ -64,8 +64,8 @@ all-bin: all-exe @[ -d $(WEBBINDIR) ] || mkdir -p $(WEBBINDIR) diff --git a/astro/routino/files/patch-xml_Makefile b/astro/routino/files/patch-xml_Makefile index 690b3093f495..bea51b99e0a2 100644 --- a/astro/routino/files/patch-xml_Makefile +++ b/astro/routino/files/patch-xml_Makefile @@ -1,4 +1,4 @@ ---- xml/Makefile.orig 2016-06-04 17:08:07 UTC +--- xml/Makefile.orig 2015-05-28 18:03:07 UTC +++ xml/Makefile @@ -56,12 +56,12 @@ test: install: all diff --git a/astro/saoimage/files/patch-btnlib_makefile b/astro/saoimage/files/patch-btnlib_makefile index a556ab3fe672..d65f0aad01c0 100644 --- a/astro/saoimage/files/patch-btnlib_makefile +++ b/astro/saoimage/files/patch-btnlib_makefile @@ -1,5 +1,5 @@ ---- btnlib/makefile.orig Wed Dec 6 14:51:17 1995 -+++ btnlib/makefile Thu Sep 24 15:54:53 1998 +--- btnlib/makefile.orig 1995-12-06 20:51:17 UTC ++++ btnlib/makefile @@ -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. @@ -9,7 +9,7 @@ LINT = lint RANLIB = ranlib -@@ -27,7 +27,7 @@ +@@ -27,7 +27,7 @@ OBJS = attach.o draw.o event.o border. press.o remote.o resize.o util.o LIB = libbtn.a diff --git a/astro/saoimage/files/patch-disppsct.c b/astro/saoimage/files/patch-disppsct.c index 159f9586512c..0aa347de9877 100644 --- a/astro/saoimage/files/patch-disppsct.c +++ b/astro/saoimage/files/patch-disppsct.c @@ -1,6 +1,6 @@ ---- disppsct.c.orig Sun Jan 16 23:45:17 2000 -+++ disppsct.c Sun Jan 16 23:53:18 2000 -@@ -598,7 +598,7 @@ +--- disppsct.c.orig 2003-09-03 18:23:08 UTC ++++ disppsct.c +@@ -599,7 +599,7 @@ static char *make_label() char *getenv(); #endif diff --git a/astro/saoimage/files/patch-gcc4 b/astro/saoimage/files/patch-gcc4 index 64cc64a6bf7e..4483e5e976c3 100644 --- a/astro/saoimage/files/patch-gcc4 +++ b/astro/saoimage/files/patch-gcc4 @@ -1,6 +1,6 @@ ---- btnlib/border.c.orig Fri May 5 00:21:13 1995 -+++ btnlib/border.c Fri Jun 29 11:08:51 2007 -@@ -35,6 +35,10 @@ +--- btnlib/border.c.orig 1995-05-04 17:21:13 UTC ++++ btnlib/border.c +@@ -35,6 +35,10 @@ static char SccsId[] = "%W% %G%"; * Note: For each byte, bit 0 (0x01) appears on the left. * Note: For each byte, bit 7 (0x80) appears on the right. */ @@ -11,7 +11,7 @@ void btn_MakeBdrBitmap ( buttonmap, width, height, byte_width, form, inverse ) unsigned char *buttonmap; /* i,o: pointer to bitmap of button */ int width, height; /* i: dimensions of button window (to cover) */ -@@ -52,8 +56,6 @@ +@@ -52,8 +56,6 @@ void btn_MakeBdrBitmap ( buttonmap, widt int right_form_bit; /* l: bit in first right form byte to use */ int right_bdr_byte; /* l: index of first line byte for right bdr */ int right_bdr_bit; /* l: bit in first line byte for right bdr */ @@ -20,7 +20,7 @@ /* portion of pattern form used (clip overlap if button very small) */ /* middle overlap on odd size counted for height, omitted for width */ -@@ -119,6 +121,9 @@ +@@ -119,6 +121,9 @@ void btn_MakeBdrBitmap ( buttonmap, widt * Subroutine: btn_MakeBdrLine * Purpose: set the bits for one line of the button's border */ @@ -30,7 +30,7 @@ static void btn_MakeBdrLine ( line, form, byte_width, inverse, right_bdr_byte, right_bdr_bit, right_form_byte, right_form_bit ) -@@ -131,7 +136,6 @@ +@@ -131,7 +136,6 @@ static void btn_MakeBdrLine ( line, form int right_bdr_byte; /* l: index of first line byte for right bdr */ int right_bdr_bit; /* l: bit in first line byte for right bdr */ { @@ -38,9 +38,9 @@ /* copy in top left, store reverse for top right */ *line = *form; *(line+1) = *(++form); ---- btnlib/create.c.orig Sun Apr 29 04:17:46 1990 -+++ btnlib/create.c Fri Jun 29 11:09:21 2007 -@@ -53,6 +53,9 @@ +--- btnlib/create.c.orig 1990-04-28 20:17:46 UTC ++++ btnlib/create.c +@@ -53,6 +53,9 @@ static GC def_gc = NULL; * Note: Buttonboxes must later be combined into menus and panels * Note: Call TouchButton to activate buttons and submenus when ready */ @@ -50,7 +50,7 @@ ButtonBox MakeButtonBox ( parent, gc, visual, background, geo, defs, borders ) BoxParent *parent; /* i: Parent window info */ GC gc; /* i: graphics context for drawing labels */ -@@ -70,7 +73,6 @@ +@@ -70,7 +73,6 @@ ButtonBox MakeButtonBox ( parent, gc, vi int x, y; /* l: coordinates of box in parent */ int i; /* l: loop counter */ char *btn_Alloc(); @@ -58,9 +58,9 @@ void btn_LabelButtons(), btn_Dimensions(); /* allocate the space for the new record */ ---- btnlib/draw.c.orig Sat Jun 22 06:40:21 1991 -+++ btnlib/draw.c Fri Jun 29 11:06:53 2007 -@@ -103,11 +103,13 @@ +--- btnlib/draw.c.orig 1991-06-21 23:40:21 UTC ++++ btnlib/draw.c +@@ -103,11 +103,13 @@ void btn_PutImage ( button, phase ) * Xlib calls: none * Method: Dim this box and all co-menu boxes */ @@ -75,7 +75,7 @@ btn_DimButtons(buttonbox); for( i=0; i < buttonbox->co_menu_count; i++ ) { -@@ -153,11 +155,13 @@ +@@ -153,11 +155,13 @@ static void btn_DimButtons ( buttonbox ) * Uses: btn_LightButtons() below * Xlib calls: none */ @@ -90,9 +90,9 @@ btn_LightButtons(buttonbox); for( i=0; i < buttonbox->co_menu_count; i++ ) { ---- btnlib/event.c.orig Fri May 5 00:27:33 1995 -+++ btnlib/event.c Fri Jun 29 11:07:53 2007 -@@ -52,12 +52,14 @@ +--- btnlib/event.c.orig 1995-05-04 17:27:33 UTC ++++ btnlib/event.c +@@ -52,12 +52,14 @@ static int select_size=0; * with their active submenus. * Note: Must be called with a buttonbox at the base of the menu tree */ @@ -108,7 +108,7 @@ /* is the event in the primary buttonbox (or its sub-menus) */ if( btn_Event(buttonbox, event) != 0 ) { -@@ -139,6 +141,10 @@ +@@ -139,6 +141,10 @@ static int btn_Event ( buttonbox, event * with their active submenus. * Note: Must be called with a buttonbox at the base of the menu tree */ @@ -119,7 +119,7 @@ int ButtonControl ( buttonbox, event, response ) ButtonBox buttonbox; /* i: top handle for button menu group */ XEvent *event; /* i: pointer to filled event record */ -@@ -147,8 +153,6 @@ +@@ -147,8 +153,6 @@ int ButtonControl ( buttonbox, event, re int status; /* o: reason for return code (-1,0,1) */ int not_found; /* l: event search status */ int i; /* l: loop counter */ @@ -128,7 +128,7 @@ status = 1; *response = NULL; -@@ -206,6 +210,9 @@ +@@ -206,6 +210,9 @@ int ButtonControl ( buttonbox, event, re * until one fields it. If still not, return NULL, else (it * was fielded) get the next event and loop again. */ @@ -138,7 +138,7 @@ static int btn_Control ( buttonbox, event, response ) ButtonBox buttonbox; /* i: top handle for button menu tree */ XEvent *event; /* i: pointer to filled event record */ -@@ -218,7 +225,6 @@ +@@ -218,7 +225,6 @@ static int btn_Control ( buttonbox, even int type; /* l: temp for button response type */ int id; /* l: temp for button id */ int mask[2]; /* l: temp store for select mask (select changes it) */ @@ -146,9 +146,9 @@ int btn_PushButton(); void btn_PutImage(), btn_DrawButton(), btn_ReleaseButton(); ---- btnlib/image.c.orig Sun Aug 4 05:42:11 1991 -+++ btnlib/image.c Fri Jun 29 11:10:36 2007 -@@ -38,6 +38,9 @@ +--- btnlib/image.c.orig 1991-08-03 22:42:11 UTC ++++ btnlib/image.c +@@ -38,6 +38,9 @@ static char SccsId[] = "%W% %G%"; * Post-state: off_out, off_in, on_out, on_in XImage's set in button record. * Exception: Only labels present are installed. */ @@ -158,7 +158,7 @@ void btn_MakeXImages ( button, width, height, byte_width, visual, off_out, off_in, on_out, on_in, mapsz, off, on, motf ) ButtonRecord *button; /* i: main structure describing button */ -@@ -56,7 +59,6 @@ +@@ -56,7 +59,6 @@ void btn_MakeXImages ( button, width, he unsigned char *data; /* l: pointer to bitmap currently processing */ XImage *ximage; char *btn_Alloc(); @@ -166,7 +166,7 @@ #ifdef ALLIANT extern int nbutton; -@@ -173,6 +175,9 @@ +@@ -173,6 +175,9 @@ void btn_MakeXImages ( button, width, he * Exception: Label is not stenciled if one dimension would be zero. * Method: Get basic alignment parameters and call btn_StencilLabel(); */ @@ -176,7 +176,7 @@ static void btn_AddLabel ( label, width, height, byte_width, bitmap, inverse ) ButtonLabel *label; /* i: record of label bitmap to stencil in */ int width; /* i: width in pixels of button */ -@@ -185,7 +190,6 @@ +@@ -185,7 +190,6 @@ static void btn_AddLabel ( label, width, int dst_x, dst_y; /* l: coords of start of stencil in dst (button) */ int xwdth; /* l: width (cols) to stencil */ int yhght; /* l: number of lines (rows) to stencil */ @@ -184,9 +184,9 @@ void btn_StencilLabel(); if( ((xwdth = btn_LabelX(label, width, &src_x, &dst_x)) > 0) && ---- btnlib/label.c.orig Fri May 5 00:19:37 1995 -+++ btnlib/label.c Fri Jun 29 11:09:45 2007 -@@ -42,6 +42,10 @@ +--- btnlib/label.c.orig 1995-05-04 17:19:37 UTC ++++ btnlib/label.c +@@ -42,6 +42,10 @@ static unsigned char lmask[8] = { 0x01,0 * Note: For each byte, bit 0 (0x01) appears on the left. * Note: For each byte, bit 7 (0x80) appears on the right. */ @@ -197,19 +197,19 @@ void btn_StencilLabel ( src, msk, dst, src_byte_width, dst_byte_width, src_x, src_y, dst_x, dst_y, width, height, inverse ) unsigned char *src; /* i: ptr to first byte of pattern */ -@@ -65,9 +69,6 @@ - unsigned char *last_dst; /* l: ptr to last byte used in first line */ +@@ -66,9 +70,6 @@ void btn_StencilLabel ( src, msk, dst, s int first_mask; /* l: bit mask, with coded sign (see above) */ int last_mask; /* l: bit mask, with coded sign (see above) */ -- + - static void btn_Stencil(), btn_StencilInv(); - static void btn_StencilAlligned(),btn_StencilAllignedInv(); - +- /* advance src and msk to their first used bytes */ byte_offset = (src_y * src_byte_width) + (src_x / 8); ---- btnlib/mount.c.orig Sat Apr 21 05:56:27 1990 -+++ btnlib/mount.c Fri Jun 29 11:11:16 2007 -@@ -35,11 +35,13 @@ + src += byte_offset; +--- btnlib/mount.c.orig 1990-04-20 21:56:27 UTC ++++ btnlib/mount.c +@@ -35,11 +35,13 @@ static char SccsId[] = "%W% %G%"; * Xlib calls: none * Note: This routine moves latterally to cover co-menus */ @@ -224,7 +224,7 @@ btn_MapButtonbox(buttonbox); for( i = 0; i < buttonbox->co_menu_count; i++ ) -@@ -109,6 +111,9 @@ +@@ -109,6 +111,9 @@ static void btn_UnmapButtonbox ( buttonb * map submenus of new button. * Note: Unmapping submenus is harmless if they were not mapped. */ @@ -234,7 +234,7 @@ void btn_ReplaceSubmenus ( buttonbox, btn, op_num, mapping ) ButtonBox buttonbox; int btn; -@@ -116,7 +121,6 @@ +@@ -116,7 +121,6 @@ void btn_ReplaceSubmenus ( buttonbox, bt int mapping; /* i: switch allows suppression of mapping */ { int i; @@ -242,7 +242,7 @@ /* clear out the old submenus */ for( i=0; i < buttonbox->submenu_count; i++ ) -@@ -149,6 +153,9 @@ +@@ -149,6 +153,9 @@ void btn_ReplaceSubmenus ( buttonbox, bt * Note: Requires search through co-menus * Note: Unmapping cosubmenus is harmless if they were not mapped. */ @@ -252,7 +252,7 @@ void btn_ReplaceCosubmenus ( buttonbox, btn, op_num, mapping ) ButtonBox buttonbox; int btn; -@@ -156,7 +163,6 @@ +@@ -156,7 +163,6 @@ void btn_ReplaceCosubmenus ( buttonbox, int mapping; /* i: switch allows suppression of mapping */ { int i, j; @@ -260,9 +260,9 @@ /* check to see if we have the co-mode submenus */ if( buttonbox->cosubmenu_count > 0 ) { ---- btnlib/resize.c.orig Sat Apr 21 06:15:57 1990 -+++ btnlib/resize.c Fri Jun 29 11:11:35 2007 -@@ -33,12 +33,14 @@ +--- btnlib/resize.c.orig 1990-04-20 22:15:57 UTC ++++ btnlib/resize.c +@@ -33,12 +33,14 @@ static char SccsId[] = "%W% %G%"; * Post-state: All buttonboxes having given parent are resized to fill * Method: Call btn_ChkResize with this menu and then its co-menus. */ @@ -278,9 +278,9 @@ /* check this buttonbox */ btn_ChkResize(buttonbox, parent); ---- clralloc.c.orig Thu May 13 01:40:45 1999 -+++ clralloc.c Fri Jun 29 11:12:28 2007 -@@ -39,12 +39,14 @@ +--- clralloc.c.orig 1999-05-12 18:40:45 UTC ++++ clralloc.c +@@ -39,12 +39,14 @@ static unsigned long overlay_mask; /* fo * Method: Try for at least min cells in default colormap, if failed * try to create a private colormap. */ @@ -297,9 +297,9 @@ if( (color->map.default_permit != NO) && (color->map.default_enable == YES) && ---- clrctrl.c.orig Fri Apr 20 22:43:37 1990 -+++ clrctrl.c Fri Jun 29 11:13:02 2007 -@@ -36,13 +36,15 @@ +--- clrctrl.c.orig 1990-04-20 14:43:37 UTC ++++ clrctrl.c +@@ -36,13 +36,15 @@ extern struct cgraphRec cgraph; * Subroutine: select_color * Purpose: Things to do when a buttonbox color menu button is selected */ @@ -316,7 +316,7 @@ if( control.response[0] == VOP ) { switch( control.response[1] ) { -@@ -218,10 +220,12 @@ +@@ -218,10 +220,12 @@ static void new_color_table ( map_code ) * Purpose: Reverse all colors at once (respond to invert button) * Xlib call: XStoreColors() */ @@ -330,9 +330,9 @@ /* invert color tables and remake storemap */ invert_table(&color.ctable.red); ---- clrhard.c.orig Fri Apr 20 21:54:21 1990 -+++ clrhard.c Fri Jun 29 11:30:10 2007 -@@ -29,11 +29,13 @@ +--- clrhard.c.orig 1990-04-20 13:54:21 UTC ++++ clrhard.c +@@ -29,11 +29,13 @@ static char SccsId[] = "%W% %G%"; * Subroutine: init_hard_colors * Purpose: Set up basic hardware colors */ @@ -347,7 +347,7 @@ color->hard.red = get_hard_color(color->display, colormap, "red", 63000, 0, 0); -@@ -58,12 +60,14 @@ +@@ -58,12 +60,14 @@ void init_hard_colors ( color, colormap * Subroutine: lookup_cursor_colors * Purpose: Get color parameters from named cursor colors */ @@ -363,7 +363,7 @@ /* update xcolor structs if needed */ if( init || (color->cur.desired_cur != NULL) ) { -@@ -90,12 +94,14 @@ +@@ -90,12 +94,14 @@ void lookup_cursor_colors ( color, color * Pre-state: XColor for cur, one, and two, initialized * Post-state: Pixel values for one and two set, that for cur returned. */ @@ -379,7 +379,7 @@ if( (color->cur.disp_one = alloc_hard_color(color->display, colormap, &color->cur.color_one)) < 0 ) -@@ -113,10 +119,12 @@ +@@ -113,10 +119,12 @@ int alloc_cursor_cell_color ( color, col * Subroutine: free_cursor_cell_color * Purpose: Free cell color overlay colors */ @@ -393,9 +393,9 @@ free_readonly_color(color, (int)color->cur.color_one.pixel); free_readonly_color(color, (int)color->cur.color_two.pixel); ---- clrinit.c.orig Sat Dec 15 05:17:55 2001 -+++ clrinit.c Fri Jun 29 11:30:25 2007 -@@ -38,6 +38,9 @@ +--- clrinit.c.orig 2001-12-14 23:17:55 UTC ++++ clrinit.c +@@ -38,6 +38,9 @@ static Display *display; * Subroutine: init_color * Purpose: Claim and set up colors (and do any needed initial work) */ @@ -405,7 +405,7 @@ void init_color ( color, init ) struct colorRec *color; int init; -@@ -46,7 +49,6 @@ +@@ -46,7 +49,6 @@ void init_color ( color, init ) void exit_errmsg(), init_hard_colors(), init_halftone(); void free_color_cells(), lookup_cursor_colors(), free_cursor_cell_color(); void init_overlay_color(), init_cell_color(), init_halftone_color(); @@ -413,9 +413,9 @@ if( init ) { display = color->display; ---- clrmenu.c.orig Sun Apr 29 06:40:14 1990 -+++ clrmenu.c Fri Jun 29 11:31:13 2007 -@@ -35,14 +35,16 @@ +--- clrmenu.c.orig 1990-04-28 22:40:14 UTC ++++ clrmenu.c +@@ -35,14 +35,16 @@ EditStruct *color_edit; /* key to popup * Purpose: Get a new pre-defined color table and load it for use * Returns: 1 if succeeded, else 0 */ @@ -434,7 +434,7 @@ switch( table_code ) { case MOP_Init_A: -@@ -111,13 +113,15 @@ +@@ -111,13 +113,15 @@ static ColorTable *read_color_file ( ) * Subroutine: write_color_file * Purpose: Open and write a color table file */ @@ -451,7 +451,7 @@ EditStruct *init_edit_popup(); int open_output_file(); void timestamp(); -@@ -189,11 +193,13 @@ +@@ -189,11 +193,13 @@ static void print_one_color ( fp, table * Subroutine: load_newtable * Purpose: Load an internally stored color table for use */ @@ -466,9 +466,9 @@ load_subtable(&ctable->red, &new->red); load_subtable(&ctable->green, &new->green); ---- clrread.c.orig Sun Apr 29 07:30:35 1990 -+++ clrread.c Fri Jun 29 11:31:49 2007 -@@ -25,6 +25,9 @@ +--- clrread.c.orig 1990-04-28 23:30:35 UTC ++++ clrread.c +@@ -25,6 +25,9 @@ static char SccsId[] = "%W% %G%"; * Subroutine: parse_color_file * Purpose: Parse values after color identifier */ @@ -478,7 +478,7 @@ int parse_color_file ( fp, ctable, max_entries ) ColorTable *ctable; int max_entries; -@@ -35,7 +38,6 @@ +@@ -35,7 +38,6 @@ int parse_color_file ( fp, ctable, max_e char line[SZ_LINE]; char cbuf[SZ_LINE]; struct SubTable *table; @@ -486,7 +486,7 @@ line_num = 0; /* advance to first non-comment line */ -@@ -95,6 +97,9 @@ +@@ -95,6 +97,9 @@ int parse_color_file ( fp, ctable, max_e * Purpose: Read color table entries for one color * Note: Values may start with word "gamma" and its value */ @@ -496,7 +496,7 @@ static int parse_color_table ( fp, line, cbuf, i, len, line_num, farb, max_entries, color_cnt ) FILE *fp; -@@ -110,7 +115,6 @@ +@@ -110,7 +115,6 @@ static int parse_color_table ( fp, line, float level, intensity; char *level_token, *intensity_token; int status, entry; @@ -504,7 +504,7 @@ int check_parens(); char *next_token(); -@@ -227,6 +231,9 @@ +@@ -227,6 +231,9 @@ static int parse_color_table ( fp, line, * Negative val if string starts with a number or paren * 0 if file ended, or first character was neither char nor num */ @@ -514,7 +514,7 @@ static int advance_to_ascii ( fp, line, scratch, len, line_num, dont_end ) FILE *fp; /* i: file descriptor */ char *line; /* i: buffer to get entire line */ -@@ -236,7 +243,6 @@ +@@ -236,7 +243,6 @@ static int advance_to_ascii ( fp, line, int dont_end; /* flag that more is definitely expected */ { int i; @@ -522,9 +522,9 @@ int check_parens(); /* advance to first non-comment line */ ---- clrsetup.c.orig Sun Jun 3 12:07:29 1990 -+++ clrsetup.c Fri Jun 29 11:32:20 2007 -@@ -29,12 +29,14 @@ +--- clrsetup.c.orig 1990-06-03 04:07:29 UTC ++++ clrsetup.c +@@ -29,12 +29,14 @@ static char SccsId[] = "%W% %G%"; * Purpose: Set up color parameters unique to overlay type usage * Xlib calls: XStoreColors() */ @@ -540,7 +540,7 @@ init_cellstore(color->cellstore, color->pixvalmap, color->ncolors); /* color in the cursor range of the color map */ -@@ -75,12 +77,14 @@ +@@ -75,12 +77,14 @@ void init_overlay_color ( color ) * Purpose: Set up color parameters unique to cell usage without overlay * Xlib calls: XStoreColors() */ @@ -556,9 +556,9 @@ init_cellstore(color->cellstore, color->pixvalmap, color->ncolors); /* Not cursor plane */ ---- clrvary.c.orig Fri Apr 20 21:57:20 1990 -+++ clrvary.c Fri Jun 29 11:32:33 2007 -@@ -130,6 +130,9 @@ +--- clrvary.c.orig 1990-04-20 13:57:20 UTC ++++ clrvary.c +@@ -130,6 +130,9 @@ void vary_colors ( event, mode, track, x * Subroutine: vary_contrast_and_bias * Purpose: change color table cell_levels as per new contrast and bias */ @@ -568,7 +568,7 @@ void vary_contrast_and_bias ( table, contrast, bias ) struct subtableRec *table; double contrast; /* i: normal = 1.0 */ -@@ -137,7 +140,6 @@ +@@ -137,7 +140,6 @@ void vary_contrast_and_bias ( table, con { double *base_level, *cell_level; int vertex_cnt; @@ -576,9 +576,9 @@ base_level = table->base_level; cell_level = table->cell_level; ---- cmdnew.c.orig Fri Jun 6 21:52:04 1997 -+++ cmdnew.c Fri Jun 29 11:33:12 2007 -@@ -73,9 +73,11 @@ +--- cmdnew.c.orig 1997-06-06 14:52:04 UTC ++++ cmdnew.c +@@ -73,9 +73,11 @@ static char *prompt = "Enter new image f * Called by: key_response() in MainKey.c * Called by: select_environment() in MainSelect.c */ @@ -591,7 +591,7 @@ int get_edit_input(); EditStruct *init_edit_popup(); -@@ -95,6 +97,11 @@ +@@ -95,6 +97,11 @@ void get_new_cmd ( ) * Purpose: Given a new command line, parse it and do what is called for * Returns: 1 = success, 0 = user decided not to do anything, -1 = error */ @@ -603,7 +603,7 @@ static int new_command ( input_line ) char *input_line; { -@@ -104,9 +111,6 @@ +@@ -104,9 +111,6 @@ static int new_command ( input_line ) int headersize; int parse_cmdline(), check_image(); void reinit_color(), redraw_magnifier(), touch_submenu_button(); @@ -613,9 +613,9 @@ /* store some key initial values */ headersize = img.headersize; ---- cmdparse.c.orig Tue Apr 9 02:26:55 2002 -+++ cmdparse.c Fri Jun 29 11:33:24 2007 -@@ -47,6 +47,9 @@ +--- cmdparse.c.orig 2002-04-08 19:26:55 UTC ++++ cmdparse.c +@@ -47,6 +47,9 @@ extern int bad_buttons; * Purpose: Process options to set filename and change defaults * Returns: -1 on error, 0 OK but no filename, 1 OK and new filename given */ @@ -625,7 +625,7 @@ int parse_cmdline ( argc, argv, displayname ) int argc; char *argv[]; -@@ -58,7 +61,6 @@ +@@ -58,7 +61,6 @@ int parse_cmdline ( argc, argv, displayn int parse_rotate(), parse_scale(), parse_color(), parse_fileread(), usage(); int parse_cursor(); void init_cmdline(); @@ -633,9 +633,9 @@ if( displayname != NULL ) { /* if initial program command line, strip off program name, store line */ ---- crdinvrt.c.orig Fri Apr 20 22:00:26 1990 -+++ crdinvrt.c Fri Jun 29 11:33:51 2007 -@@ -28,12 +28,14 @@ +--- crdinvrt.c.orig 1990-04-20 14:00:26 UTC ++++ crdinvrt.c +@@ -28,12 +28,14 @@ static char SccsId[] = "%W% %G%"; * Purpose: Compute parameters of the inverse transform * Method: Uses LU decomposition method */ @@ -651,7 +651,7 @@ scratch[0][0] = old->inx_outx; scratch[1][0] = old->iny_outx; -@@ -65,13 +67,15 @@ +@@ -65,13 +67,15 @@ void invert_matrix ( old, new ) * Purpose: Compute the offsets used for integer transforms * Method: Uses matrix inversion */ @@ -668,9 +668,9 @@ /* set transform equations in matrix form */ scratch[0][0] = old->inx_outx; ---- crdrot.c.orig Fri Apr 20 22:00:51 1990 -+++ crdrot.c Fri Jun 29 11:35:13 2007 -@@ -55,6 +55,9 @@ +--- crdrot.c.orig 1990-04-20 14:00:51 UTC ++++ crdrot.c +@@ -55,6 +55,9 @@ static char SccsId[] = "%W% %G%"; * As each transform is applied to the front, we apply them in reverse order * the result is, from img->A,B,C,imgtofile(as given)->file */ @@ -680,7 +680,7 @@ void rotate_transform ( img, imgtofile, flip, rotcode ) Coordsys *img; Transform *imgtofile; -@@ -63,7 +66,6 @@ +@@ -63,7 +66,6 @@ void rotate_transform ( img, imgtofile, { double xmove, ymove; int angle; @@ -688,7 +688,7 @@ /* if no rotation, do nothing */ if( (rotcode == 0) && (flip == 0) ) return; -@@ -93,6 +95,9 @@ +@@ -93,6 +95,9 @@ void rotate_transform ( img, imgtofile, * Note: ioff is not used for turn or flip, as it is assumed that both * will be bracketed between two moves (to place origin at center) */ @@ -698,7 +698,7 @@ static void move_mtrx ( mtrx, xtran, ytran, ioff, prior ) Transform *mtrx; double xtran, ytran; -@@ -100,7 +105,6 @@ +@@ -100,7 +105,6 @@ static void move_mtrx ( mtrx, xtran, ytr int prior; { Transform translate; @@ -706,7 +706,7 @@ bzero((char *)(&translate), sizeof(Transform)); translate.inx_outx = 1.0; -@@ -119,12 +123,14 @@ +@@ -119,12 +123,14 @@ static void move_mtrx ( mtrx, xtran, ytr * Subroutine: flip_mtrx * Purpose: Apply a mirror reflection to the passed Transform */ @@ -722,7 +722,7 @@ bzero((char *)(&reflect), sizeof(Transform)); reflect.inx_outx = 1.0; -@@ -141,6 +147,9 @@ +@@ -141,6 +147,9 @@ static void flip_mtrx ( mtrx, prior ) * Note: the pivot is 0,0 of the passed Transform's coordinate system * Exception: only multiples of 90 degrees are allowed */ @@ -732,7 +732,7 @@ static void turn_mtrx ( mtrx, angle, prior ) Transform *mtrx; int angle; -@@ -148,7 +157,6 @@ +@@ -148,7 +157,6 @@ static void turn_mtrx ( mtrx, angle, pri { Transform rotate; void exit_errmsg(); @@ -740,9 +740,9 @@ while( angle >= 360 ) angle -= 360; while( angle < 0 ) angle += 360; ---- crdsynth.c.orig Fri Apr 20 22:01:55 1990 -+++ crdsynth.c Fri Jun 29 11:35:34 2007 -@@ -147,11 +147,13 @@ +--- crdsynth.c.orig 1990-04-20 14:01:55 UTC ++++ crdsynth.c +@@ -147,11 +147,13 @@ void combine_transform ( new, first, sec * Subroutine: set_trans_speed * Purpose: Set parameters for fast integer computation */ @@ -757,9 +757,9 @@ trans->ixzoom = 0; trans->iyzoom = 0; ---- crdtemp.c.orig Tue Feb 27 02:14:19 1996 -+++ crdtemp.c Fri Jun 29 11:35:55 2007 -@@ -126,6 +126,9 @@ +--- crdtemp.c.orig 1996-02-26 20:14:19 UTC ++++ crdtemp.c +@@ -126,6 +126,9 @@ void set_disptran ( coord ) * Purpose: set up zoom given edges of desired display and * appropriate img transform */ @@ -769,7 +769,7 @@ void panedge_zoom ( coord, wintoimgtrans, win_x, win_y ) struct coordRec *coord; /* i: collected coords */ Transform *wintoimgtrans; /* i: transform from mouse's window to img */ -@@ -134,7 +137,6 @@ +@@ -134,7 +137,6 @@ void panedge_zoom ( coord, wintoimgtrans float imgX, imgY; int box_width, box_height; void i_transform(); @@ -777,9 +777,9 @@ /* calculate image coordinates of win_x and win_y */ i_transform(wintoimgtrans, win_x, win_y, &imgX, &imgY); ---- csrarea.c.orig Fri Apr 20 22:07:03 1990 -+++ csrarea.c Fri Jun 29 11:36:28 2007 -@@ -28,13 +28,15 @@ +--- csrarea.c.orig 1990-04-20 14:07:03 UTC ++++ csrarea.c +@@ -28,13 +28,15 @@ static char SccsId[] = "%W% %G%"; * Purpose: Calculate area, in float units file pixels, enclosed by cursor * Method: Use mathematical formula appropriate to cursor type */ @@ -796,7 +796,7 @@ switch( cursor->type ) { case COP_Circle: -@@ -83,13 +85,15 @@ +@@ -83,13 +85,15 @@ static double x11, y11, x12, y12; * are not tested since neighbors cannot cross but neighbors do * share a common point. */ @@ -813,9 +813,9 @@ if( (i+2) >= cnt ) { return( 0 ); ---- csrgrab.c.orig Fri Apr 20 22:08:42 1990 -+++ csrgrab.c Fri Jun 29 11:37:13 2007 -@@ -38,12 +38,14 @@ +--- csrgrab.c.orig 1990-04-20 14:08:42 UTC ++++ csrgrab.c +@@ -38,12 +38,14 @@ extern struct colorRec color; /* need to * Purpose: Change size of cursor to intersect current mouse cursor * while keeping aspect ratio of cursor constant */ @@ -831,7 +831,7 @@ /* if this event is initiating tracking, don't erase the cursor */ if( event->type == MotionNotify ) -@@ -64,13 +66,15 @@ +@@ -64,13 +66,15 @@ void size_annuli ( cursor, event ) * Purpose: Respond to a mouse request to delete an annulus * */ @@ -849,7 +849,7 @@ /* if there are two or more annuli */ if( (cursor->next_annulus != 0) && -@@ -169,14 +173,16 @@ +@@ -169,14 +173,16 @@ static void remove_annulus ( parent ) * Purpose: Set up cursor to for a size annulus interaction * Called by: size_annuli() */ @@ -868,9 +868,9 @@ code = on_annulus(cursor, &parent); /* decide what to draw */ ---- csrpoly1.c.orig Fri Apr 20 22:11:54 1990 -+++ csrpoly1.c Fri Jun 29 11:37:39 2007 -@@ -36,6 +36,9 @@ +--- csrpoly1.c.orig 1990-04-20 14:11:54 UTC ++++ csrpoly1.c +@@ -36,6 +36,9 @@ extern struct colorRec color; /* need to * Used when initiating a move or size action * Called by: control_cursor() in CursorCtrl.c */ @@ -880,7 +880,7 @@ void grab_polygon_vertex ( cursor, event, size ) struct cursorRec *cursor; XEvent *event; /* i: XbuttonEvent (ButtonPress) for x & y */ -@@ -45,7 +48,6 @@ +@@ -45,7 +48,6 @@ void grab_polygon_vertex ( cursor, event int pt; /* l: index of polygon vertex */ int closest_polygon_line(); void draw_cursor(), add_polygon_vertex(); @@ -888,7 +888,7 @@ /* erase existing cursor */ draw_cursor(cursor, &color.gcset.undraw); -@@ -84,13 +86,15 @@ +@@ -84,13 +86,15 @@ void grab_polygon_vertex ( cursor, event * Returns: 1 if image must be redrawn, else 0 * Called by: control_cursor() in CursorCtrl.c */ @@ -905,9 +905,9 @@ i = on_polygon_vertex((int)event->xbutton.x, (int)event->xbutton.y, cursor->points, cursor->poly_cnt); ---- csrpoly2.c.orig Thu Jul 9 23:29:27 1998 -+++ csrpoly2.c Fri Jun 29 11:37:55 2007 -@@ -72,12 +72,14 @@ +--- csrpoly2.c.orig 1998-07-09 16:29:27 UTC ++++ csrpoly2.c +@@ -72,12 +72,14 @@ void collapse_polygon ( cursor ) * Subroutine: start_polygon * Purpose: Install polygon drawing stuff for the active cursor */ @@ -923,9 +923,9 @@ if( polysz == 0 ) init_polygon(); ---- csrpoly3.c.orig Fri Apr 20 22:11:40 1990 -+++ csrpoly3.c Fri Jun 29 11:38:09 2007 -@@ -28,6 +28,9 @@ +--- csrpoly3.c.orig 1990-04-20 14:11:40 UTC ++++ csrpoly3.c +@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%"; * vector from pointer to closest point on segment * Method: top down search */ @@ -935,7 +935,7 @@ int closest_polygon_line ( x, y, vertex, cnt ) int x, y; XPoint *vertex; -@@ -38,7 +41,6 @@ +@@ -38,7 +41,6 @@ int closest_polygon_line ( x, y, vertex, int min_endpoint, endpoint; int min_j; int i, j; @@ -943,9 +943,9 @@ min_distance = 1.0E30; min_j = 0; ---- csrshape.c.orig Tue Oct 20 01:46:41 1998 -+++ csrshape.c Fri Jun 29 11:40:32 2007 -@@ -31,9 +31,6 @@ +--- csrshape.c.orig 1998-10-19 18:46:41 UTC ++++ csrshape.c +@@ -31,9 +31,6 @@ static char SccsId[] = "%W% %G%"; #include "defs/circle.def" /* Define Unit_circles */ @@ -955,7 +955,7 @@ void make_cursor( struct cursorRec *cursor); static int make_arrow( double xtip, double ytip, double xray, double rotsin, double rotcos, XPoint *points); -@@ -41,28 +38,20 @@ +@@ -41,28 +38,20 @@ static int make_boxcur( double xcen, dou double xray, double yray, double rotsin, double rotcos, XPoint *points); static int make_circur( double xcen, double ycen, double radius, @@ -990,9 +990,9 @@ /* Declare and initialize drawing tools */ double *UnitPieX = Circle12X; ---- ctrlcntn.c.orig Thu Jul 9 23:29:00 1998 -+++ ctrlcntn.c Fri Jun 29 11:41:15 2007 -@@ -61,6 +61,9 @@ +--- ctrlcntn.c.orig 1998-07-09 16:29:00 UTC ++++ ctrlcntn.c +@@ -61,6 +61,9 @@ void init_connections () * Purpose: Open a connection to a remote process and update event handlers * Returns: -1 on failure, else IPC number */ @@ -1002,7 +1002,7 @@ int open_connection ( connection ) struct connectRec *connection; { -@@ -71,7 +74,6 @@ +@@ -71,7 +74,6 @@ int open_connection ( connection ) extern int ButtonSelectMask(), open_pipe(); extern int open_socket_listener(); extern struct connectRec *accept_socket_connection(); @@ -1010,9 +1010,9 @@ #endif #ifdef NOPIPEFLUSH ---- ctrlfile.c.orig Fri Apr 20 21:49:12 1990 -+++ ctrlfile.c Fri Jun 29 11:41:47 2007 -@@ -40,6 +40,9 @@ +--- ctrlfile.c.orig 1990-04-20 13:49:12 UTC ++++ ctrlfile.c +@@ -40,6 +40,9 @@ extern int errno; * Post state: Sets pointer to file, open and ready for writing * Returns: 2 = append, 1 = new file, 0 = user decided not to, -1 = error */ @@ -1022,7 +1022,7 @@ int open_output_file ( fd, edit, one_popup_row, prompt ) FILE **fd; EditStruct *edit; -@@ -56,7 +59,6 @@ +@@ -56,7 +59,6 @@ int open_output_file ( fd, edit, one_pop int get_edit_input(); EditStruct *init_edit_popup(); void clear_edit_buf(), unmap_popwin(); @@ -1030,7 +1030,7 @@ open_type[0] = 0; if( (get_edit_input(edit, one_popup_row, 1, 0, prompt) <= 0) || -@@ -137,6 +139,9 @@ +@@ -137,6 +139,9 @@ int open_output_file ( fd, edit, one_pop * Note: Sets pointer of file open and ready for reading * Returns: 1 on success, 0 if user decided not to, -1 on error */ @@ -1040,7 +1040,7 @@ int open_input_file ( fd, edit, one_popup_row, prompt ) FILE **fd; EditStruct *edit; -@@ -146,7 +151,6 @@ +@@ -146,7 +151,6 @@ int open_input_file ( fd, edit, one_popu char filename[132]; int exist; int get_edit_input(); @@ -1048,9 +1048,9 @@ if( get_edit_input(edit, one_popup_row, 1, 1, prompt) <= 0 ) return( 0 ); ---- ctrlgc.c.orig Wed May 2 16:19:55 1990 -+++ ctrlgc.c Fri Jun 29 11:42:09 2007 -@@ -237,10 +237,12 @@ +--- ctrlgc.c.orig 1990-05-02 08:19:55 UTC ++++ ctrlgc.c +@@ -237,10 +237,12 @@ GC set_edit_gc ( font, foreground, backg * Subroutine: get_fontstruct * Returns: Pointer to the specified fontstruct */ @@ -1064,7 +1064,7 @@ if( (app_font[app_code] == NULL) && (init_font(app_code) == NULL) ) return( NULL ); -@@ -253,11 +255,13 @@ +@@ -253,11 +255,13 @@ XFontStruct *get_fontstruct ( app_code ) * Purpose: Load the fonts used by this program * Returns: Font on success, else 0 */ @@ -1079,9 +1079,9 @@ for( i=0; i<OPTION_COUNT; i++ ) { name_index = preference[app_code][i]; ---- dispblnk.c.orig Fri Apr 20 22:23:14 1990 -+++ dispblnk.c Fri Jun 29 11:42:36 2007 -@@ -181,13 +181,15 @@ +--- dispblnk.c.orig 1990-04-20 14:23:14 UTC ++++ dispblnk.c +@@ -181,13 +181,15 @@ static int display_blink ( index ) * For each button release, if it is on top of stack, release it and display * one below, else just release it */ @@ -1098,9 +1098,9 @@ if( control.event.type == ButtonPress ) { /* don't respond if it's with a meta key (window resize) */ ---- dispbtmp.c.orig Sat Jun 22 05:58:15 1991 -+++ dispbtmp.c Fri Jun 29 11:42:53 2007 -@@ -55,9 +55,11 @@ +--- dispbtmp.c.orig 1991-06-21 22:58:15 UTC ++++ dispbtmp.c +@@ -55,9 +55,11 @@ void init_halftone () * Subroutine: select_halftone * Purpose: Respond to halftone selection command */ @@ -1113,9 +1113,9 @@ switch( control.response[1] ) { case 0: ---- editctrl.c.orig Sun Jun 3 12:07:48 1990 -+++ editctrl.c Fri Jun 29 11:44:00 2007 -@@ -61,6 +61,9 @@ +--- editctrl.c.orig 1990-06-03 04:07:48 UTC ++++ editctrl.c +@@ -61,6 +61,9 @@ extern int XZ_efn; * Subroutine: init_edit_popup * Purpose: Get everything ready for running editor sessions */ @@ -1125,7 +1125,7 @@ EditStruct *init_edit_popup ( string, max_chars ) char *string; int max_chars; -@@ -69,7 +72,6 @@ +@@ -69,7 +72,6 @@ EditStruct *init_edit_popup ( string, ma int len; EditStruct *get_edit_struct(); void init_edit_struct(), load_edit_struct(); @@ -1133,7 +1133,7 @@ if( init_window ) { init_popwin(color.gcset.menu.foreground, color.gcset.menu.background); -@@ -91,6 +93,9 @@ +@@ -91,6 +93,9 @@ EditStruct *init_edit_popup ( string, ma * (but expose is fielded and configure is saved for end). * Returns: 1 if user returns with a response, 0 if user cancels session */ @@ -1143,7 +1143,7 @@ int get_edit_input ( edit, one_row, map, unmap, prompt ) EditStruct *edit; int one_row; /* i: put-edit-after-prompt-on-same-line */ -@@ -104,7 +109,6 @@ +@@ -104,7 +109,6 @@ int get_edit_input ( edit, one_row, map, int emacs_response(); void draw_new_string(), redraw_edit_string(); void adjust_desktop(), redraw_window(), unmap_popwin(); @@ -1151,9 +1151,9 @@ map_popwin(edit, one_row, prompt, map); if( !map ) { ---- grphbtmp.c.orig Fri Apr 20 22:31:04 1990 -+++ grphbtmp.c Fri Jun 29 11:44:16 2007 -@@ -27,6 +27,9 @@ +--- grphbtmp.c.orig 1990-04-20 14:31:04 UTC ++++ grphbtmp.c +@@ -27,6 +27,9 @@ extern struct colorRec color; * Subroutine: make_halftone_panimage * Purpose: Make halftone bitmap for pan window (panbox) */ @@ -1163,7 +1163,7 @@ void make_halftone_colorbar ( bytedata, bitdata, width, height, bytes_per_line ) unsigned char *bytedata; -@@ -34,7 +37,6 @@ +@@ -34,7 +37,6 @@ void make_halftone_colorbar ( bytedata, int width, height; int bytes_per_line; { @@ -1171,9 +1171,9 @@ bzero((char *)bitdata, bytes_per_line * height); if( color.halftone.mode == BOP_Dither ) { ---- grphgrab.c.orig Fri Apr 20 22:33:27 1990 -+++ grphgrab.c Fri Jun 29 11:45:43 2007 -@@ -30,10 +30,12 @@ +--- grphgrab.c.orig 1990-04-20 14:33:27 UTC ++++ grphgrab.c +@@ -30,10 +30,12 @@ extern struct cgraphRec cgraph; * Subroutine: grab_cgraph_vertex * Purpose: When a mouse button is pressed, assign a vertex to that button */ @@ -1187,7 +1187,7 @@ switch( event->xbutton.button ) { case Button1: -@@ -58,10 +60,12 @@ +@@ -58,10 +60,12 @@ void get_cgraph_vertex ( event ) * event * Returns: 1 if a vertex was dropped, else 0 */ @@ -1201,7 +1201,7 @@ switch( event->xbutton.button ) { case Button1: -@@ -83,13 +87,15 @@ +@@ -83,13 +87,15 @@ int drop_cgraph_vertex ( event ) * Purpose: Handle grab vertex event for single color * Method: Grab old vertex or make new vertex - under mouse pointer */ @@ -1219,7 +1219,7 @@ /* clip against limits */ if( x < cgraph.graph.xzero ) -@@ -151,6 +157,9 @@ +@@ -151,6 +157,9 @@ static int grab_old_color_vertex ( x, y, * Subroutine: install_new_color_vertex * Purpose: Given hash position, install a new vertex, and make active */ @@ -1229,7 +1229,7 @@ static void install_new_color_vertex ( x, y, col ) int x, y; /* i: position of ULcorner of new hash mark */ struct colgRec *col; /* i: color info structure for one color */ -@@ -158,7 +167,6 @@ +@@ -158,7 +167,6 @@ static void install_new_color_vertex ( x double intensity, cell_level; int match; int select_best_hash_position(); @@ -1237,7 +1237,7 @@ col->active_hash = select_best_hash_position(x, y, col->hash, col->hash_cnt, &match, cgraph.vertical); -@@ -251,11 +259,13 @@ +@@ -251,11 +259,13 @@ static void add_color_vertex_hash ( col, * Purpose: Delete a color table vertex if one is under the mouse position * Returns: 1 if vertex was dropped, else 0 */ @@ -1252,9 +1252,9 @@ /* hash mark positions are upper left corner of hash box */ x -= HASH_RAY; ---- grphinit.c.orig Fri Apr 20 22:40:44 1990 -+++ grphinit.c Fri Jun 29 11:46:50 2007 -@@ -46,9 +46,11 @@ +--- grphinit.c.orig 1990-04-20 14:40:44 UTC ++++ grphinit.c +@@ -46,9 +46,11 @@ extern int XZ_efn; * Subroutine: init_colorbox * Purpose: Handle program init-time color bar and graph initialization */ @@ -1267,7 +1267,7 @@ cgraph.ncolors = color.ncolors; cgraph.red.table = &color.ctable.red; -@@ -68,10 +70,12 @@ +@@ -68,10 +70,12 @@ void init_colorbox ( ) * Purpose: Initialize color bar and related params * Xlib calls: XCreateSimpleWindow(), XMapSubwindows() */ @@ -1281,7 +1281,7 @@ colorbar.display = colorbox.display; colorbar.ref_width = colorbox.width; -@@ -92,10 +96,12 @@ +@@ -92,10 +96,12 @@ static void init_main_colorbar ( ) * Subroutine: adjust_main_colorbar * Purpose: Adjust color bar size params and/or color data if needed */ @@ -1295,7 +1295,7 @@ if( (colorbox.width != colorbar.ref_width) || (colorbox.height != colorbar.ref_height) ) { -@@ -113,11 +119,13 @@ +@@ -113,11 +119,13 @@ void adjust_main_colorbar ( ) * Purpose: Initialize color bar and related params * Xlib calls: XMapSubwindows() */ @@ -1310,7 +1310,7 @@ cgraph.bar.display = graphbox.display; cgraph.bar.ref_width = graphbox.width; -@@ -149,11 +157,13 @@ +@@ -149,11 +157,13 @@ void init_graph_colorbar ( ) * Subroutine: adjust_graph_colorbar * Purpose: Adjust color bar size params and/or color data if needed */ @@ -1325,9 +1325,9 @@ if( cgraph.vertical ) { if( graphbox.height != cgraph.bar.ref_height ) { ---- grphmove.c.orig Fri Apr 20 22:37:26 1990 -+++ grphmove.c Fri Jun 29 11:47:08 2007 -@@ -26,12 +26,14 @@ +--- grphmove.c.orig 1990-04-20 14:37:26 UTC ++++ grphmove.c +@@ -26,12 +26,14 @@ extern struct cgraphRec cgraph; * Purpose: Change values (and position) of designated vertices in * response to mouse movement */ @@ -1343,9 +1343,9 @@ /* clip against limits */ if( x < cgraph.graph.xzero ) ---- grpholap.c.orig Fri Apr 20 22:36:00 1990 -+++ grpholap.c Fri Jun 29 11:47:22 2007 -@@ -28,13 +28,15 @@ +--- grpholap.c.orig 1990-04-20 14:36:00 UTC ++++ grpholap.c +@@ -28,13 +28,15 @@ extern struct cgraphRec cgraph; * Subroutine: mark_colorline_overlap * Purpose: Make line representing more than one color black (or white) */ @@ -1362,9 +1362,9 @@ j = 0; if( cgraph.vertical ) { ---- grphtext.c.orig Fri Apr 20 22:39:37 1990 -+++ grphtext.c Fri Jun 29 11:49:42 2007 -@@ -33,6 +33,9 @@ +--- grphtext.c.orig 1990-04-20 14:39:37 UTC ++++ grphtext.c +@@ -33,6 +33,9 @@ extern struct cgraphRec cgraph; * Purpose: Set labeling pieces according to the graph window size * Xlib calls: XMoveWindow(), XResizeWindow(), XMapWindow() */ @@ -1374,7 +1374,7 @@ void init_color_graph_label ( ) { int new = 0; -@@ -40,7 +43,6 @@ +@@ -40,7 +43,6 @@ void init_color_graph_label ( ) int resize = 0; Window create_cgraph_box(); void init_color_graph_label(); @@ -1382,9 +1382,9 @@ if( cgraph.graphlabel.active == 0 ) return; ---- histdist.c.orig Wed Jul 29 01:56:45 1998 -+++ histdist.c Fri Jun 29 11:51:37 2007 -@@ -24,6 +24,9 @@ +--- histdist.c.orig 1998-07-28 18:56:45 UTC ++++ histdist.c +@@ -24,6 +24,9 @@ static char SccsId[] = "%W% %G%"; * Purpose: Distribute the levels among histogram sub-groups * Returns: number of groups with no assigned color levels */ @@ -1394,7 +1394,7 @@ int distribute_levels ( linklist, pixel_area, color_levels, pmin, pmax, ncolor ) SubrangeLink *linklist; -@@ -39,7 +42,6 @@ +@@ -39,7 +42,6 @@ int distribute_levels ( linklist, pixel_ #ifdef DEBUG int census = 0; #endif @@ -1402,9 +1402,9 @@ /* if all one group (no strong peaks), allocation is simple */ if( linklist->next == 0 ) { ---- histeql.c.orig Fri Apr 20 22:59:27 1990 -+++ histeql.c Fri Jun 29 11:51:55 2007 -@@ -24,6 +24,10 @@ +--- histeql.c.orig 1990-04-20 14:59:27 UTC ++++ histeql.c +@@ -24,6 +24,10 @@ static char SccsId[] = "%W% %G%"; * output level optimization accounts for large cell counts * for single levels (e.g. half of all pixels with value 0) */ @@ -1415,7 +1415,7 @@ void histogram_equalize ( scalemap, histogram, area, pmin, pmax, color_levels, pixels ) unsigned char *scalemap; /* i/o: scalemap (for signed indexing) */ -@@ -42,8 +46,6 @@ +@@ -42,8 +46,6 @@ void histogram_equalize ( scalemap, hist char *calloc_errchk(); int distribute_levels(); void generate_scalemap(), scan_histogram_for_peaks(), resolve_zeroes(); @@ -1424,9 +1424,9 @@ /* initialize link list */ linklist = (SubrangeLink *)calloc_errchk(10, sizeof(int), "HElink"); ---- histlist.c.orig Sat Jun 22 05:58:44 1991 -+++ histlist.c Fri Jun 29 11:52:24 2007 -@@ -29,6 +29,12 @@ +--- histlist.c.orig 1991-06-21 22:58:44 UTC ++++ histlist.c +@@ -29,6 +29,12 @@ static char SccsId[] = "%W% %G%"; * Subroutine: make_equalized_list * Purpose: Distributing levels for a subrange section of the histogram */ @@ -1439,7 +1439,7 @@ void make_equalized_list ( histogram, list, low_entry, high_entry, pixel_area, color_levels ) int *histogram; -@@ -47,10 +53,6 @@ +@@ -47,10 +53,6 @@ void make_equalized_list ( histogram, li int best_levels_under; int best_average_over = 0; /* average_area used to get best_levels */ int best_average_under = 0; @@ -1450,9 +1450,9 @@ /* else allocation distribution must first be determined */ /* run through histgram section making basic allocation and taking notes */ ---- histmap.c.orig Fri Apr 20 23:00:13 1990 -+++ histmap.c Fri Jun 29 11:53:06 2007 -@@ -28,6 +28,9 @@ +--- histmap.c.orig 1990-04-20 15:00:13 UTC ++++ histmap.c +@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%"; * safely be applied. * Note: The original link-list of groups is freed. */ @@ -1462,7 +1462,7 @@ void generate_scalemap ( hist, subrange, scalemap, pixels ) int *hist; /* i: histogram (for signed offsets) */ SubrangeLink *subrange; /* i: linklist of subranges */ -@@ -36,7 +39,6 @@ +@@ -36,7 +39,6 @@ void generate_scalemap ( hist, subrange, { int baselevel; SubrangeLink *trash; @@ -1470,7 +1470,7 @@ baselevel = 0; while( subrange != 0 ) { -@@ -54,6 +56,9 @@ +@@ -54,6 +56,9 @@ void generate_scalemap ( hist, subrange, * Purpose: Make a section of scale map using histgroup link as guide * Called by: make_HE_scalemap() in HistEqual.c */ @@ -1480,7 +1480,7 @@ static void make_subrange_scalemap ( histogram, subrange, scalemap, baselevel, pixels ) int *histogram; -@@ -67,7 +72,6 @@ +@@ -67,7 +72,6 @@ static void unsigned char dispval; char *calloc_errchk(); void make_equalized_list(); @@ -1488,7 +1488,7 @@ /* if only one level, make map section */ if( subrange->color_levels <= 1 ) { -@@ -135,6 +139,10 @@ +@@ -135,6 +139,10 @@ static void list_to_map ( scalemap, hist * Purpose: Allocate levels for a histogram subrange. Special process * for situation when more levels than actually used values. */ @@ -1499,7 +1499,7 @@ static void make_gapped_list ( histogram, list, low, high, levels ) int *histogram; SubrangeList *list; -@@ -142,8 +150,6 @@ +@@ -142,8 +150,6 @@ static void make_gapped_list ( histogram { int range_j, max_range; int levels_used; @@ -1508,9 +1508,9 @@ levels_used = first_shortlist_pass(histogram, list, low, high, levels, ---- histscan.c.orig Fri Apr 20 23:00:36 1990 -+++ histscan.c Fri Jun 29 11:53:29 2007 -@@ -21,6 +21,10 @@ +--- histscan.c.orig 1990-04-20 15:00:36 UTC ++++ histscan.c +@@ -21,6 +21,10 @@ static char SccsId[] = "%W% %G%"; * Purpose: Scan the image histogram picking out large cell count values * make sub-groups of the histogram between the large count levels */ @@ -1521,7 +1521,7 @@ void scan_histogram_for_peaks ( subrange, histogram, pixel_area, map_levels, average ) SubrangeLink *subrange; /* i/o: link (initially covers range) */ -@@ -36,8 +40,6 @@ +@@ -36,8 +40,6 @@ void scan_histogram_for_peaks ( subrange int sr_nzentries; /* l: number of non-zero entries in subrange */ int sr_pixel_area; /* l: number of pixels in current subrange */ int sr_max_peak; /* l: highest peak within current subrange */ @@ -1530,9 +1530,9 @@ /* set initial pixel_count values */ sr_pixel_area = 0; ---- histzero.c.orig Fri Apr 20 23:01:03 1990 -+++ histzero.c Fri Jun 29 11:53:39 2007 -@@ -23,13 +23,15 @@ +--- histzero.c.orig 1990-04-20 15:01:03 UTC ++++ histzero.c +@@ -23,13 +23,15 @@ static char SccsId[] = "%W% %G%"; * Note: Adjoining groups are large count single level groups * Called by: histrogram_equalize() above */ @@ -1549,9 +1549,9 @@ /* if very first entry is a zero allocated link */ if( PriorLink->color_levels == 0 ) { ---- imgcheck.c.orig Tue Mar 13 03:31:30 2001 -+++ imgcheck.c Fri Jun 29 11:54:08 2007 -@@ -46,13 +46,15 @@ +--- imgcheck.c.orig 2001-03-12 21:31:30 UTC ++++ imgcheck.c +@@ -46,13 +46,15 @@ static char SccsId[] = "%W% %G%"; * Purpose: Do some consistency checks on image type and size * Returns: 0 if no errors found, else -1 */ @@ -1568,7 +1568,7 @@ extern int isfits(); ext = NULL; -@@ -148,6 +150,9 @@ +@@ -148,6 +150,9 @@ int check_image ( img, got_status ) * Purpose: Check array size vs file size etc * Returns: 0 if size determined and/or OK, else -1 */ @@ -1578,7 +1578,7 @@ static int check_array ( img ) struct imageRec *img; { -@@ -156,7 +161,6 @@ +@@ -156,7 +161,6 @@ static int check_array ( img ) float posdim; /* possible dimension */ int headersize; /* size in bytes of header */ int rawsize; @@ -1586,9 +1586,9 @@ /* get header size */ headersize = img->headersize; ---- imglogo.c.orig Fri Apr 27 00:31:48 1990 -+++ imglogo.c Fri Jun 29 11:54:27 2007 -@@ -372,13 +372,15 @@ +--- imglogo.c.orig 1990-04-26 16:31:48 UTC ++++ imglogo.c +@@ -372,13 +372,15 @@ static unsigned char logo[LOGO_SZ] = { * Subroutine: load_logo * Purpose: place logo image in image buffer */ @@ -1605,9 +1605,9 @@ /* fill buffer with background color */ bufpt = shortbuf; ---- imgnew.c.orig Thu Oct 15 06:01:58 1998 -+++ imgnew.c Fri Jun 29 11:54:42 2007 -@@ -52,6 +52,9 @@ +--- imgnew.c.orig 1998-10-14 23:01:58 UTC ++++ imgnew.c +@@ -52,6 +52,9 @@ extern struct windowRec desktop; * Purpose: Create all image coordinate parameters from the beginning * and take care of all that might be affected */ @@ -1617,7 +1617,7 @@ void new_display ( dispnow, clear, load, scale ) int dispnow; /* i: put-display-in-window-now flag */ int clear; /* i: clear img buf before reading flag */ -@@ -61,7 +64,6 @@ +@@ -61,7 +64,6 @@ void new_display ( dispnow, clear, load, void set_disptran(), new_pancursor(), new_scalemap(); void combine_transform(), set_edges(), set_dispoff(), set_magnifier(); void adjust_cursor_coords(), map_dispbox(), disp_dispbox(); @@ -1625,9 +1625,9 @@ /* Set disp to img and disp to file transforms */ set_disptran(&coord); ---- imgtrans.c.orig Fri Apr 20 23:13:46 1990 -+++ imgtrans.c Fri Jun 29 11:55:10 2007 -@@ -26,6 +26,9 @@ +--- imgtrans.c.orig 1990-04-20 15:13:46 UTC ++++ imgtrans.c +@@ -26,6 +26,9 @@ static char SccsId[] = "%W% %G%"; * 4-7 = flip y axis then rotate clockwise by (code - 4) * 90 degrees * Called by: load_image() in ImageRead.c */ @@ -1637,7 +1637,7 @@ void rotate_buf ( buf, flip, rotcode, width, height, buf_squared, buf_doubled ) short *buf; int flip; -@@ -36,7 +39,6 @@ +@@ -36,7 +39,6 @@ void rotate_buf ( buf, flip, rotcode, wi int maxdim; void xflip_buf(), yflip_buf(), zflip_buf(), cwturn_buf(), ccwturn_buf(); void transfer_buf(); @@ -1645,9 +1645,9 @@ if( flip ) rotcode += 4; ---- irafcrd.c.orig Fri Apr 20 23:16:02 1990 -+++ irafcrd.c Fri Jun 29 11:55:49 2007 -@@ -45,13 +45,15 @@ +--- irafcrd.c.orig 1990-04-20 15:16:02 UTC ++++ irafcrd.c +@@ -45,13 +45,15 @@ static char SccsId[] = "%W% %G%"; * If found and parsed, compute new transform for file coord. * Returns: 1 if subsection found and parsed successfully, else 0 */ @@ -1664,7 +1664,7 @@ void set_trans_speed(), combine_transform(), clear_coord_area(); if( parse_iraf_subsection(title, &xoff, &yoff, &block) == 0 ) { -@@ -92,6 +94,10 @@ +@@ -92,6 +94,10 @@ int guess_true_file_coords ( title ) * Purpose: Parse for subsection and blocking from the image name * Returns: 1 if subsection or blocking was used, else 0 */ @@ -1675,7 +1675,7 @@ static int parse_iraf_subsection ( s, xoff, yoff, block ) char *s; /* i: file name */ int *xoff; /* o: x offset */ -@@ -99,8 +105,6 @@ +@@ -99,8 +105,6 @@ static int parse_iraf_subsection ( s, xo int *block; /* o: block */ { char *t, *u; /* temp char pointers */ @@ -1684,7 +1684,7 @@ /* seed the default values */ *xoff = 1; -@@ -139,6 +143,9 @@ +@@ -139,6 +143,9 @@ static int parse_iraf_subsection ( s, xo * Subroutine: get_subsection_offsets * Purpose: parse subsection syntax for x and y offsets of subsection */ @@ -1694,7 +1694,7 @@ static void get_subsection_offsets ( s, xoff, yoff, is_qp ) char *s; int *xoff, *yoff; -@@ -147,7 +154,6 @@ +@@ -147,7 +154,6 @@ static void get_subsection_offsets ( s, int x1, x2; int y1, y2; char *sy, *s2, *st; @@ -1702,9 +1702,9 @@ /* if not qp, grab the initial x offset right after the '[' */ sy = fn_substr(s, ","); ---- irafimtl.c.orig Thu Feb 26 01:52:37 1998 -+++ irafimtl.c Fri Jun 29 11:56:14 2007 -@@ -46,6 +46,9 @@ +--- irafimtl.c.orig 1998-02-25 19:52:37 UTC ++++ irafimtl.c +@@ -46,6 +46,9 @@ static char wcsbuf[SZ_WCSBUF]; * Subroutine: imtool_response * Purpose: Read imtool messages from iraf (return 1 if pipe trouble) */ @@ -1714,7 +1714,7 @@ void imtool_response ( port, imhead, ndatabytes ) struct connectRec *port; /* i: struct of port for IRAF input */ struct imtoolRec *imhead; /* i: packet header, already read in */ -@@ -60,7 +63,6 @@ +@@ -60,7 +63,6 @@ void imtool_response ( port, imhead, nda void set_curpos_to_iraf_trigger(), set_cursor_from_iraf(), imtool_output(); void set_imtool_scale(), set_cursor_to_iraf(), disp_subpiece(); void map_panbox(), disp_panbox(), send_curpos_to_iraf(), flush_connection(); @@ -1722,7 +1722,7 @@ switch( imhead->subunit & 077 ) { case FEEDBACK: -@@ -189,6 +191,9 @@ +@@ -189,6 +191,9 @@ void imtool_response ( port, imhead, nda * Purpose: Reset buffer sizes, coordinate systems and parameters as * needed. */ @@ -1732,7 +1732,7 @@ void imtool_newimage ( is_wcs, imhead ) int is_wcs; struct imtoolRec *imhead; -@@ -199,7 +204,6 @@ +@@ -199,7 +204,6 @@ void imtool_newimage ( is_wcs, imhead ) void set_disptran(), combine_transform(), set_edges(), set_dispoff(); void adjust_cursor_coords(), set_magnifier(), disp_subpiece(), set_tdisp(); void set_imtool_scale(), imtool_reinit(), new_pancursor(); @@ -1740,9 +1740,9 @@ /* set size and frame */ if( is_wcs ) ---- irafio.c.orig Tue Oct 13 00:17:50 1992 -+++ irafio.c Fri Jun 29 11:56:48 2007 -@@ -102,6 +102,9 @@ +--- irafio.c.orig 1992-10-12 17:17:50 UTC ++++ irafio.c +@@ -102,6 +102,9 @@ void rename_imtool_connection ( name, in * Subroutine: imtool_output * Purpose: Write image data back to iraf device channel */ @@ -1752,7 +1752,7 @@ void imtool_output ( imhead, odev, imagebuf, width, height ) struct imtoolRec *imhead; struct connectRec *odev; -@@ -116,7 +119,6 @@ +@@ -116,7 +119,6 @@ void imtool_output ( imhead, odev, image int buferr = 0; char fifobuf[SZ_FIFOBUF + 4]; int write_connection(); @@ -1760,7 +1760,7 @@ ndatabytes = -(int)imhead->thingct; x = imhead->x & 077777; -@@ -153,6 +155,9 @@ +@@ -153,6 +155,9 @@ void imtool_output ( imhead, odev, image * Called by: imtool_response() in RemoteImtool.c * Returns: -1 if read no bytes, 1 if trouble, else 0 */ @@ -1770,7 +1770,7 @@ int imtool_input ( imhead, idev, readbuf, iwdth, owdth, y1, y2, imagebuf, imbufsz ) struct imtoolRec *imhead; -@@ -171,7 +176,6 @@ +@@ -171,7 +176,6 @@ int imtool_input ( imhead, idev, readbuf int got, try, gotten; short *obuf; int read_connection(); @@ -1778,9 +1778,9 @@ /* get data count and packing type */ ndatavals = -(int)imhead->thingct; ---- irafpipe.c.orig Thu Feb 26 01:52:26 1998 -+++ irafpipe.c Fri Jun 29 11:57:01 2007 -@@ -33,6 +33,9 @@ +--- irafpipe.c.orig 1998-02-25 19:52:26 UTC ++++ irafpipe.c +@@ -33,6 +33,9 @@ static char SccsId[] = "%W% %G%"; * Subroutine: read_imtool_packet() * Purpose: event handler for packet input from iraf */ @@ -1790,7 +1790,7 @@ void read_imtool_packet( port ) struct connectRec *port; { -@@ -48,7 +51,6 @@ +@@ -48,7 +51,6 @@ void read_imtool_packet( port ) #endif int read_connection(); void imtool_response(), swap_bytes(); @@ -1798,9 +1798,9 @@ /* read the header */ bytes = read_connection(port, (char *)&imhead, sizeof(struct imtoolRec)); ---- maininit.c.orig Tue Dec 2 05:21:35 2003 -+++ maininit.c Fri Jun 29 11:57:26 2007 -@@ -76,11 +76,13 @@ +--- maininit.c.orig 2003-12-01 23:21:35 UTC ++++ maininit.c +@@ -76,11 +76,13 @@ Display *display; /* display connection * Xlib calls: XSetErrorHandler() * UNIX calls: setrlimit() */ @@ -1815,7 +1815,7 @@ void crash_on_error(), control_event_loop(); void say_goodbye(); -@@ -141,13 +143,15 @@ +@@ -141,13 +143,15 @@ void say_goodbye ( code ) * Purpose: Initialize parameters in the records * Note: Resource or default file not yet used */ @@ -1832,9 +1832,9 @@ int parse_cmdline(), check_image(); void say_goodbye(), init_connections(); ---- mainkey.c.orig Thu Sep 25 05:38:25 2003 -+++ mainkey.c Fri Jun 29 11:58:47 2007 -@@ -87,6 +87,9 @@ +--- mainkey.c.orig 2003-09-24 22:38:25 UTC ++++ mainkey.c +@@ -87,6 +87,9 @@ static double oldypix = 0.0; static double oldxpos, oldypos; @@ -1844,7 +1844,7 @@ void key_response() { -@@ -110,7 +113,6 @@ +@@ -110,7 +113,6 @@ key_response() void print_center(), print_cursor(); void move_pointer(); void get_cursor_pos(); @@ -1852,9 +1852,9 @@ void toggle_region_visibility(), toggle_region_labeling(); double xbuf, ybuf, xfile, yfile; double newxpos, newypos, distance; ---- mgfyctrl.c.orig Fri May 7 02:47:12 1999 -+++ mgfyctrl.c Fri Jun 29 11:59:53 2007 -@@ -45,12 +45,14 @@ +--- mgfyctrl.c.orig 1999-05-06 19:47:12 UTC ++++ mgfyctrl.c +@@ -45,12 +45,14 @@ extern struct magRec magset; * Purpose: Magnify location of a dispbox event * Xlib calls: XCheckWindowEvent(), XSync() */ @@ -1870,7 +1870,7 @@ /* get only the most recent mouse moved event */ XSync(dispbox.display, 0); -@@ -132,6 +134,9 @@ +@@ -132,6 +134,9 @@ void redraw_magnifier ( ) * Purpose: Show pointer coordinates and image value in display window * Xlib calls: XDrawImageString() */ @@ -1880,7 +1880,7 @@ static void label_file_coords ( bufX, bufY ) double bufX, bufY; { -@@ -142,7 +147,6 @@ +@@ -142,7 +147,6 @@ static void label_file_coords ( bufX, bu float fileX, fileY; GC gc, set_edit_gc(); void d_transform(); @@ -1888,7 +1888,7 @@ static int lwcs0 = 0; static int lpix0 = 0; int i; -@@ -289,6 +293,9 @@ +@@ -289,6 +293,9 @@ void clear_coord_area () * but has not been refined for the val section. * Xlib call: XDrawImageString() */ @@ -1898,7 +1898,7 @@ static void label_file_coords_proportional ( bufX, bufY ) double bufX, bufY; { -@@ -297,7 +304,6 @@ +@@ -297,7 +304,6 @@ static void label_file_coords_proportion float fileX, fileY; GC gc, set_edit_gc(); void d_transform(); @@ -1906,9 +1906,9 @@ gc = set_edit_gc(magset.text.font, magset.text.foreground, magset.text.background); ---- mgfytabl.c.orig Thu Jul 9 23:28:28 1998 -+++ mgfytabl.c Fri Jun 29 12:00:33 2007 -@@ -30,6 +30,10 @@ +--- mgfytabl.c.orig 1998-07-09 16:28:28 UTC ++++ mgfytabl.c +@@ -30,6 +30,10 @@ static char SccsId[] = "%W% %G%"; * coordinates * Note: Uses event coords in control struct (control.event.xkey) */ @@ -1919,7 +1919,7 @@ void print_table () { int bufx, bufy; -@@ -39,8 +43,6 @@ +@@ -39,8 +43,6 @@ void print_table () int table_size; int col_width; int rot; @@ -1928,9 +1928,9 @@ /* determine the buffer coordinates of the event */ if( get_key_buf_coords(&control.event.xkey, &bufx, &bufy) == 0 ) { ---- pancrsr.c.orig Wed May 2 14:49:17 1990 -+++ pancrsr.c Fri Jun 29 12:01:31 2007 -@@ -45,13 +45,15 @@ +--- pancrsr.c.orig 1990-05-02 06:49:17 UTC ++++ pancrsr.c +@@ -45,13 +45,15 @@ void draw_pancursor ( ) * Subroutine: new_pancursor * Purpose: Create and draw panbox cursor given image coordinates */ @@ -1947,9 +1947,9 @@ if( pancur_present ) { /* erase the old box if it was visible */ ---- panimage.c.orig Sat Apr 21 00:17:38 1990 -+++ panimage.c Fri Jun 29 12:01:53 2007 -@@ -45,12 +45,14 @@ +--- panimage.c.orig 1990-04-20 16:17:38 UTC ++++ panimage.c +@@ -45,12 +45,14 @@ void disp_panbox ( ) * Subroutine: map_panbox * Purpose: Fill the panbox display buffer, mapping from its short buffer */ @@ -1968,9 +1968,9 @@ void panimage_halftone(); if( color.ncolors <= 1 ) { ---- prntcent.c.orig Sat Aug 21 05:18:40 1999 -+++ prntcent.c Fri Jun 29 12:41:46 2007 -@@ -36,6 +36,11 @@ +--- prntcent.c.orig 1999-08-20 22:18:40 UTC ++++ prntcent.c +@@ -36,6 +36,11 @@ static char SccsId[] = "%W% %G%"; * Returns 1 if successful, else 0 * Note: Uses event coords in control struct (control.event.xkey) */ @@ -1982,7 +1982,7 @@ void print_center ( xc, yc ) -@@ -59,9 +64,6 @@ +@@ -59,9 +64,6 @@ double *xc, *yc; /* Returned centroided int xfile, yfile; char string[64]; int lstr = 48; @@ -1992,9 +1992,9 @@ void d_trans(); int iswcs(); ---- prntcurs.c.orig Thu Jan 17 04:54:18 2002 -+++ prntcurs.c Fri Jun 29 12:41:28 2007 -@@ -31,12 +31,14 @@ +--- prntcurs.c.orig 2002-01-16 22:54:18 UTC ++++ prntcurs.c +@@ -31,12 +31,14 @@ static char SccsId[] = "%W% %G%"; * Subroutine: print_cursor * Purpose: print location of a dispbox event */ @@ -2010,9 +2010,9 @@ (void)get_cursor_pos (event, &bufx, &bufy, &filex, &filey ); (void)print_file_value ( bufx, bufy, filex, filey ); ---- readarr.c.orig Tue Feb 23 20:05:41 1999 -+++ readarr.c Fri Jun 29 12:02:06 2007 -@@ -28,6 +28,9 @@ +--- readarr.c.orig 1999-02-23 14:05:41 UTC ++++ readarr.c +@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%"; * Purpose: Read array data from a file * Note: Assumes file was tested benignly, exits here if trouble */ @@ -2022,7 +2022,7 @@ void read_array ( fd, img, imgbuf, filebuf, width, height, X, Y, block, verbose ) int fd; /* if >=0 handle to open & ready image file */ -@@ -40,7 +43,6 @@ +@@ -40,7 +43,6 @@ void read_array ( fd, img, imgbuf, fileb int verbose; /* whether to print explanatory messages */ { int vals; @@ -2030,9 +2030,9 @@ int image_start; int open_disk(), lseek_disk(); void close_disk(); ---- readfith.c.orig Tue Sep 29 22:40:06 1998 -+++ readfith.c Fri Jun 29 12:02:34 2007 -@@ -46,6 +46,9 @@ +--- readfith.c.orig 1998-09-29 15:40:06 UTC ++++ readfith.c +@@ -46,6 +46,9 @@ static char SccsId[] = "%W% %G%"; * Purpose: Find important FITS parameters in FITS header * Returns: 1 if success, else 0 */ @@ -2042,7 +2042,7 @@ int read_fitsheader ( header, length, bitpix, naxis, naxes, scale, bias ) char *header; int length; -@@ -55,7 +58,6 @@ +@@ -55,7 +58,6 @@ int read_fitsheader ( header, length, bi float *scale; float *bias; { @@ -2050,7 +2050,7 @@ struct WorldCoor *wcsinit(); char *header0; header0 = header; -@@ -144,6 +146,9 @@ +@@ -144,6 +146,9 @@ static int get_keyint ( header, keyword, * Purpose: Return the float value in the data field for a given FITS * header keyword. If key not found, return 0. */ @@ -2060,7 +2060,7 @@ static int get_keyfloat ( header, keyword, length, val, report_error) char *header; /* buffer start */ char *keyword; /* keyword to match */ -@@ -153,7 +158,6 @@ +@@ -153,7 +158,6 @@ static int get_keyfloat ( header, keywor { int key_not_end; int i; @@ -2068,9 +2068,9 @@ void no_fitscomment(); key_not_end = (strncmp(keyword, "END ", 8) != 0); ---- rgnanli.c.orig Sat Apr 21 00:25:03 1990 -+++ rgnanli.c Fri Jun 29 12:02:53 2007 -@@ -89,14 +89,16 @@ +--- rgnanli.c.orig 1990-04-20 16:25:03 UTC ++++ rgnanli.c +@@ -89,14 +89,16 @@ void new_annulus_edge ( cursor ) * Note: "vala valb valc ..." and "val1 val2 n=int" are both * permitted syntax forms */ @@ -2089,9 +2089,9 @@ char *next_token(); i = 0; ---- rgndraw.c.orig Tue Dec 1 03:46:40 1998 -+++ rgndraw.c Fri Jun 29 12:04:06 2007 -@@ -115,12 +115,14 @@ +--- rgndraw.c.orig 1998-11-30 21:46:40 UTC ++++ rgndraw.c +@@ -115,12 +115,14 @@ void disp_regions ( cursor ) * Subroutine: disp_region * Purpose: Draw one saved cursor region and its labels */ @@ -2108,7 +2108,7 @@ if( rgdraw.visible && (region != NULL) ) { gc = set_region_gc(region); -@@ -215,11 +217,13 @@ +@@ -215,11 +217,13 @@ static void draw_region_label ( string, * Purpose: Draw one saved cursor region outline or point index * Note: gc is already set, hence NULL GCspec in draw calls */ @@ -2123,7 +2123,7 @@ void draw_annuli(), draw_cursor(); if( region->type != COP_Point ) { -@@ -246,12 +250,14 @@ +@@ -246,12 +250,14 @@ static void draw_region ( region, gc ) /* * Subroutine: label_annuli */ @@ -2139,7 +2139,7 @@ /* apply label to outer annulus */ annulus = region; -@@ -268,6 +274,10 @@ +@@ -268,6 +274,10 @@ static void label_annuli ( region, gc ) * Purpose: Draw one region's label line and text for center and edge * Xlib calls: XDrawLine() */ @@ -2150,7 +2150,7 @@ static void label_region ( region, gc ) struct cursorRec *region; GC gc; -@@ -277,8 +287,6 @@ +@@ -277,8 +287,6 @@ static void label_region ( region, gc ) char edge_string[132]; int len; int exclude; @@ -2159,9 +2159,9 @@ /* if label not requested or don't know how to label or will another part */ if( (!rgdraw.label) || (region->type == COP_Polygon) ) ---- rgndrop.c.orig Sat Apr 21 00:31:38 1990 -+++ rgndrop.c Fri Jun 29 12:04:34 2007 -@@ -64,14 +64,16 @@ +--- rgndrop.c.orig 1990-04-20 16:31:38 UTC ++++ rgndrop.c +@@ -64,14 +64,16 @@ void unsave_region ( cursor, dead_meat ) * cursors enclose one or two digit label but have 0 area). * In case of equal areas (i.e. points), closer center is used. */ @@ -2180,7 +2180,7 @@ chosen = NULL; region = cursor->next_region; -@@ -115,13 +117,15 @@ +@@ -115,13 +117,15 @@ static int closer_to_center ( challenger * Subroutine: is_inside_region * Purpose: Determine if mouse is within a region */ @@ -2197,9 +2197,9 @@ if( region->type == COP_Polygon ) return( pointer_is_inside_polygon((double)x, (double)y, ---- rgnwpros.c.orig Wed Jan 9 10:57:30 1991 -+++ rgnwpros.c Fri Jun 29 12:29:12 2007 -@@ -45,11 +45,13 @@ +--- rgnwpros.c.orig 1991-01-09 03:57:30 UTC ++++ rgnwpros.c +@@ -45,11 +45,13 @@ static char SccsId[] = "%W% %G%"; * Purpose: Write ROSAT PROS style region description to file * Method: Recurse first to start writing from end of link list */ @@ -2214,7 +2214,7 @@ /* Check for pointer before doing anything */ if( region == NULL ) -@@ -84,13 +86,15 @@ +@@ -84,13 +86,15 @@ void write_region_pros ( fd, region ) /* Subroutine: cat_shape * Purpose: Put simple PROS description of given cursor in line buffer */ @@ -2231,7 +2231,7 @@ switch( region->type ) { case COP_Box: -@@ -205,12 +209,14 @@ +@@ -205,12 +209,14 @@ static void cat_cen ( region, line ) * Subroutine: cat_polypts * Purpose: Add list of point coordinates to line buffer (for polygon) */ @@ -2247,7 +2247,7 @@ cat_pt((double)region->poly[0].fileX, (double)region->poly[0].fileY, line, 0); -@@ -254,12 +260,14 @@ +@@ -254,12 +260,14 @@ static void cat_pt ( x, y, line, comma ) * Purpose: Put a PROS style description of circular annuli on the * line buffer */ @@ -2263,7 +2263,7 @@ (void)strcat(line, "ANNULUS("); cat_cen(region, line); -@@ -275,14 +283,16 @@ +@@ -275,14 +283,16 @@ static void cat_annulus ( region, line ) * Subroutine: write_annuli * Purpose: Write PROS type description to produce annuli of given shapes */ @@ -2282,7 +2282,7 @@ /* annuli start with next_annulus (base region is not one of them) */ if( (annulus = region->next_annulus) != NULL ) { -@@ -309,11 +319,13 @@ +@@ -309,11 +319,13 @@ static void write_annuli ( region, line, * Purpose: Add outer shape anded with not of inner shape to make * an annular ring */ @@ -2297,9 +2297,9 @@ if( region->next_annulus != NULL ) { if( region->exclude_region ) ---- rgnwrite.c.orig Fri Jun 29 12:42:50 2007 -+++ rgnwrite.c Fri Jun 29 12:29:47 2007 -@@ -58,6 +58,9 @@ +--- rgnwrite.c.orig 1995-09-08 22:29:19 UTC ++++ rgnwrite.c +@@ -58,6 +58,9 @@ EditStruct *region_edit; * Subroutine: write_regions * Purpose: Write region info to a file */ @@ -2309,7 +2309,7 @@ void write_regions ( cursor, image, output_type ) struct cursorRec *cursor; struct imageRec *image; -@@ -66,7 +69,6 @@ +@@ -66,7 +69,6 @@ void write_regions ( cursor, image, outp FILE *fd; static int last_output_type = 0; char fname[SZ_FNAME]; @@ -2317,7 +2317,7 @@ int open_output_file(); EditStruct *init_edit_popup(); void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp(); -@@ -146,13 +148,15 @@ +@@ -146,13 +148,15 @@ static void write_region_imtool ( fd, re * Subroutine: timestamp * Purpose: Write date and filename (if known) to region file */ @@ -2334,9 +2334,9 @@ /* timestamp the first entry in the output file. */ set_time_string (line); ---- sclctrl.c.orig Thu Oct 10 22:55:57 1996 -+++ sclctrl.c Fri Jun 29 12:30:24 2007 -@@ -70,6 +70,9 @@ +--- sclctrl.c.orig 1996-10-10 15:55:57 UTC ++++ sclctrl.c +@@ -70,6 +70,9 @@ void select_scalemap () * Subroutine: new_scalemap * Purpose: Scalemap calculation for a new image */ @@ -2346,7 +2346,7 @@ void new_scalemap ( ) { static double cmdMin = 0.0; -@@ -78,7 +81,6 @@ +@@ -78,7 +81,6 @@ void new_scalemap ( ) static int max_given = 0; static int imtool_200 = 0; static int init = 1; /* identify first time called */ @@ -2354,9 +2354,9 @@ void make_scalemap(), color_logo(); #ifdef IMTOOL void set_imtool_colors(); ---- sclmap.c.orig Tue Oct 25 21:25:02 1994 -+++ sclmap.c Fri Jun 29 12:30:47 2007 -@@ -36,11 +36,13 @@ +--- sclmap.c.orig 1994-10-25 15:25:02 UTC ++++ sclmap.c +@@ -36,11 +36,13 @@ static char SccsId[] = "%W% %G%"; * Note: Map goes from image value to hardware value (through ideal * map value using pixels array from XAllocColors) */ @@ -2371,7 +2371,7 @@ /* note the range of data for which mapping is to be calculated */ if( image_max == image_min ) -@@ -105,6 +107,9 @@ +@@ -105,6 +107,9 @@ void make_scalemap ( image_min, image_ma * Subroutine: linear_scale * Purpose: Distribute color levels in the map evenly */ @@ -2381,7 +2381,7 @@ static void linear_scale ( image_min, image_max ) int image_min, image_max; /* i: limits of values in display */ { -@@ -118,7 +123,6 @@ +@@ -118,7 +123,6 @@ static void linear_scale ( image_min, im register int imageval; register int pixval; register int imagelim; @@ -2389,9 +2389,9 @@ range_min = image_min; range_max = image_max; ---- wndwconf.c.orig Sat Jan 21 06:27:13 1995 -+++ wndwconf.c Fri Jun 29 12:40:29 2007 -@@ -55,9 +55,11 @@ +--- wndwconf.c.orig 1995-01-21 00:27:13 UTC ++++ wndwconf.c +@@ -55,9 +55,11 @@ static unsigned int geo_width, geo_heigh * Method: The size can be given or set to norm. If given but less * than min (i.e. 0,0) it becomes the minimum configuration. */ @@ -2404,9 +2404,9 @@ desktop.hints.min_width = (2 * desktop.xzero) + (2 * dispbox.bdrwidth) + dispbox.hints.min_width; ---- wndwinit.c.orig Sat Dec 15 05:19:23 2001 -+++ wndwinit.c Fri Jun 29 12:41:01 2007 -@@ -53,11 +53,13 @@ +--- wndwinit.c.orig 2001-12-14 23:19:23 UTC ++++ wndwinit.c +@@ -53,11 +53,13 @@ static char **cmd_argv; /* i: command l * Uses: create_window() in WndwCreate.c * Xlib calls: DisplayWidth(), DisplayHeight(); */ @@ -2421,7 +2421,7 @@ void init_desktop(), create_window(); /* set display screen parameters for all to see */ -@@ -81,9 +83,11 @@ +@@ -81,9 +83,11 @@ void init_windows1 ( argc, argv ) * Uses: configure_windows() in WndwConfig.c * Uses: get_window_dimensions(), create_window() in WndwCreate.c */ @@ -2434,7 +2434,7 @@ void get_window_dimensions(), configure_windowgroup(), create_window(); /* install runtime environment parameters for all windows */ -@@ -175,11 +179,13 @@ +@@ -175,11 +179,13 @@ void raise_windows ( ) * Subroutine: init_window_basics, set_window_basics * Purpose: Set the runtime environment parameters */ @@ -2449,9 +2449,9 @@ ximage = XCreateImage(desktop.display, color.visual, color.screen_depth, dispbox.image.format, 0, malloc(4), 2, 2, ---- wndwmaus.c.orig Thu Dec 20 04:06:46 2001 -+++ wndwmaus.c Fri Jun 29 12:41:12 2007 -@@ -61,11 +61,13 @@ +--- wndwmaus.c.orig 2001-12-19 22:06:46 UTC ++++ wndwmaus.c +@@ -61,11 +61,13 @@ static Cursor keycursor; * Subroutine: init_mousepointers * Purpose: Set up the various mouse pointer icons for all windows */ diff --git a/astro/saoimage/files/patch-makefile.FreeBSD b/astro/saoimage/files/patch-makefile.FreeBSD index d897bf4e5ea1..b9c3ad9da248 100644 --- a/astro/saoimage/files/patch-makefile.FreeBSD +++ b/astro/saoimage/files/patch-makefile.FreeBSD @@ -1,5 +1,5 @@ ---- makefile.FreeBSD.orig Thu Sep 20 06:27:49 2001 -+++ makefile.FreeBSD Wed Jul 24 01:12:35 2002 +--- makefile.FreeBSD.orig 2003-04-01 17:34:57 UTC ++++ makefile.FreeBSD @@ -36,9 +36,9 @@ # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of # the CFLAGS macro below.) @@ -13,7 +13,7 @@ IMTOOLRC = $(IMTRCDIR)imtoolrc FIFO_I = $(ROOT)/dev/imt1i -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ FIFO_O = $(ROOT)/dev/imt1o FIFO_LN = $(ROOT)/dev/imt1 # Compiler specification. @@ -22,7 +22,7 @@ # 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 @@ +@@ -76,12 +76,12 @@ MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT # OFLAGS: compiler optimization/debug options. #OFLAGS = -g -DDEBUG @@ -37,7 +37,7 @@ # Libraries that move about or may require special specification. # -@@ -89,7 +89,7 @@ +@@ -89,7 +89,7 @@ ADFLAGS = -I/usr/X11R6/include # usual link search path, i.e., it is not in /usr/lib, it may be necessary # to specify its path fully in XLIB. @@ -46,7 +46,7 @@ #XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users... #F77LIB = -lF77 -lI77 -lU77 F77LIB = -lf2c -@@ -307,7 +307,7 @@ +@@ -307,7 +307,7 @@ tape: $(MAKE) ARCFILE=$(TAPEDEV) tar @@ -55,7 +55,7 @@ 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 @@ +@@ -419,8 +419,8 @@ maininit.o : $(XLIBH) $(STRUCT) hfiles/c defs/dispbox.def defs/magnibox.def defs/panbox.def \ defs/btnbox.def defs/colorbox.def defs/graphbox.def \ defs/desktop.def defs/cursor.def diff --git a/astro/saoimage/files/patch-rgnwrite.c b/astro/saoimage/files/patch-rgnwrite.c index 6ea9d650d091..7ec00f613021 100644 --- a/astro/saoimage/files/patch-rgnwrite.c +++ b/astro/saoimage/files/patch-rgnwrite.c @@ -1,6 +1,6 @@ ---- rgnwrite.c.orig Sun Jan 16 23:54:54 2000 -+++ rgnwrite.c Sun Jan 16 23:55:51 2000 -@@ -183,7 +183,7 @@ +--- rgnwrite.c.orig 1995-09-08 22:29:19 UTC ++++ rgnwrite.c +@@ -183,7 +183,7 @@ static void set_time_string ( time_strin #ifdef LONG64 int time(); #else diff --git a/astro/stars/files/patch-main.c b/astro/stars/files/patch-main.c index 96b2fb126efc..104f04f04bac 100644 --- a/astro/stars/files/patch-main.c +++ b/astro/stars/files/patch-main.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- main.c.orig 1996-04-10 10:58:49 UTC ++++ main.c +@@ -48,7 +48,7 @@ void setup(); void events(); void shutdn(); @@ -9,7 +9,7 @@ { setup(); events(); -@@ -241,37 +241,37 @@ +@@ -241,37 +241,37 @@ void events() XQueryKeymap(xgh.display, keys); diff --git a/astro/sunclock/files/patch-readpng.c b/astro/sunclock/files/patch-readpng.c index 1481473bc696..9b3ce86736c2 100644 --- a/astro/sunclock/files/patch-readpng.c +++ b/astro/sunclock/files/patch-readpng.c @@ -1,6 +1,6 @@ ---- readpng.c.orig 2005-10-23 21:36:29.000000000 +0200 -+++ readpng.c 2010-03-29 14:14:22.000000000 +0200 -@@ -57,7 +57,7 @@ +--- readpng.c.orig 2005-10-23 19:36:29 UTC ++++ readpng.c +@@ -57,7 +57,7 @@ TestPNG(char *file) /* gets called a LO fread(header, 1, 8, fp); fclose(fp); diff --git a/astro/sunclock/files/patch-sunclock.c b/astro/sunclock/files/patch-sunclock.c index c3e9135f0983..c103f3cea252 100644 --- a/astro/sunclock/files/patch-sunclock.c +++ b/astro/sunclock/files/patch-sunclock.c @@ -1,4 +1,4 @@ ---- sunclock.c +--- sunclock.c.orig 2008-08-07 12:40:24 UTC +++ sunclock.c @@ -113,7 +113,6 @@ #include <stdlib.h> @@ -16,7 +16,7 @@ #ifdef NEW_CTIME extern char * timezone(); #endif -@@ -2197,8 +2195,8 @@ +@@ -2197,8 +2195,8 @@ struct Sundata * Context; if (!Context->mark1.city) return; @@ -27,7 +27,7 @@ /* Get local time at given location */ setTZ(Context->mark1.city); -@@ -2335,20 +2333,11 @@ +@@ -2335,20 +2333,11 @@ struct Sundata * Context; char s[128]; char slat[20], slon[20], slatp[20], slonp[20]; double dist; @@ -50,7 +50,7 @@ if (!Context->wintype) { char num[80]; -@@ -2696,7 +2685,7 @@ +@@ -2696,7 +2685,7 @@ int build; Context->bits = 0; Context->flags.update = 4; @@ -59,7 +59,7 @@ Context->projtime = -1L; Context->roottime = -1L; Context->animtime = -1L; -@@ -3918,7 +3907,7 @@ +@@ -3918,7 +3907,7 @@ struct Sundata * Context; if (button_pressed) return; @@ -68,7 +68,7 @@ erase_obj = 1; if (Context->flags.colorlevel == MONOCHROME || -@@ -3926,10 +3915,10 @@ +@@ -3926,10 +3915,10 @@ struct Sundata * Context; drawSunAndMoon(Context); erase_obj = 0; @@ -81,7 +81,7 @@ &Context->moondec, &Context->moonlon, &junk, &junk, &junk, &junk, &junk, &junk ); Context->moonlon = fixangle(Context->moonlon+180.0) - 180.0; -@@ -3946,10 +3935,10 @@ +@@ -3946,10 +3935,10 @@ struct Sundata * Context; update the illuminated area on the screen. */ if (Context->projtime < 0 || @@ -94,7 +94,7 @@ Context->noon = noon; Context->fnoon = fnoon; moveNightArea(Context); -@@ -4557,8 +4546,8 @@ +@@ -4557,8 +4546,8 @@ int dy[5] = { 0, 1, -1, 0, 0}; hw = Context->geom.height; if (do_root == 2) hw += Context->hstrip; @@ -105,7 +105,7 @@ else if (do_root == 2 && mode==0 && rootpix) update = 0; -@@ -4569,7 +4558,7 @@ +@@ -4569,7 +4558,7 @@ int dy[5] = { 0, 1, -1, 0, 0}; XSetForeground(dpy, Context->gdata->wingc, Context->gdata->pixel[ROOTCOLOR]); XFillRectangle(dpy, rootpix, Context->gdata->wingc, 0, 0, wr, hr); @@ -114,7 +114,7 @@ if (random_rootpos) { rootdx = (double)(random() % 10001)/10000.0; rootdy = (double)(random() % 10001)/10000.0; -@@ -5542,7 +5531,7 @@ +@@ -5542,7 +5531,7 @@ KeySym keysym; Context->flags.update = 2; break; case XK_w: @@ -123,7 +123,7 @@ if (do_menu) do_menu = -1; if (do_filesel) do_filesel = -1; if (do_zoom) do_zoom = -1; -@@ -5958,9 +5947,9 @@ +@@ -5958,9 +5947,9 @@ struct Sundata * Context; drawImageToRootWindow(Context, 0); XFlush(dpy); if (Context->flags.animate) { diff --git a/astro/sunclock/files/patch-sunclock.h b/astro/sunclock/files/patch-sunclock.h index 5c74ebaf16ea..1136c9a724e0 100644 --- a/astro/sunclock/files/patch-sunclock.h +++ b/astro/sunclock/files/patch-sunclock.h @@ -1,8 +1,8 @@ ---- sunclock.h.orig Sat Jul 21 11:49:41 2001 -+++ sunclock.h Sat Dec 8 21:28:41 2001 -@@ -224,7 +224,7 @@ - unsigned char * daypixel; /* pointer to day pixels */ +--- sunclock.h.orig 2006-10-14 14:25:18 UTC ++++ sunclock.h +@@ -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 footime; /* time - real or fake, see flags */ diff --git a/astro/sunclock/files/patch-tildepath.c b/astro/sunclock/files/patch-tildepath.c index ba98770cd368..4be22d0792b3 100644 --- a/astro/sunclock/files/patch-tildepath.c +++ b/astro/sunclock/files/patch-tildepath.c @@ -1,6 +1,6 @@ ---- tildepath.c.orig Fri Aug 24 07:06:53 2001 -+++ tildepath.c Fri Aug 24 07:06:59 2001 -@@ -38,7 +38,6 @@ +--- tildepath.c.orig 2000-09-01 15:34:51 UTC ++++ tildepath.c +@@ -38,7 +38,6 @@ T* AUTHOR #include <stdio.h> #include <stdlib.h> #include <pwd.h> diff --git a/astro/sunclock/files/patch-widgets.c b/astro/sunclock/files/patch-widgets.c index e15c78a91f13..82bb0345b739 100644 --- a/astro/sunclock/files/patch-widgets.c +++ b/astro/sunclock/files/patch-widgets.c @@ -1,5 +1,5 @@ ---- widgets.c.orig 2011-07-09 18:51:18.000000000 +0900 -+++ widgets.c 2012-08-14 04:13:36.000000000 +0900 +--- widgets.c.orig 2011-07-09 09:51:18 UTC ++++ widgets.c @@ -1,6 +1,5 @@ #include <unistd.h> #include <sys/types.h> diff --git a/astro/wcslib/files/patch-GNUmakefile b/astro/wcslib/files/patch-GNUmakefile index a8e7c2b92dca..4d68d7f7293f 100644 --- a/astro/wcslib/files/patch-GNUmakefile +++ b/astro/wcslib/files/patch-GNUmakefile @@ -1,6 +1,6 @@ ---- GNUmakefile.orig 2012-03-14 13:40:38.000000000 +0600 -+++ GNUmakefile 2012-05-05 17:48:54.102866059 +0600 -@@ -81,26 +81,14 @@ +--- GNUmakefile.orig 2016-04-05 12:55:12 UTC ++++ GNUmakefile +@@ -81,26 +81,14 @@ install : $(MAKE) -k -C $$DIR $@ ; \ done $(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(INCDIR) diff --git a/astro/wmmoonclock/files/patch-Makefile b/astro/wmmoonclock/files/patch-Makefile index 82c272ebcf27..90f3f3c0b3b8 100644 --- a/astro/wmmoonclock/files/patch-Makefile +++ b/astro/wmmoonclock/files/patch-Makefile @@ -1,21 +1,16 @@ -*** Makefile.orig Tue Mar 23 11:20:32 1999 ---- Makefile Sun Nov 28 18:20:02 1999 -*************** -*** 1,8 **** -! CC = gcc -! CFLAGS = -O2 -! INCDIR = -I/usr/X11R6/include/X11 -! DESTDIR= /usr/X11R6 -! LIBDIR = -L/usr/X11R6/lib - - # for Linux - LIBS = -lXpm -lX11 -lXext ---- 1,8 ---- -! CC ?= gcc -! CFLAGS ?= -O2 -! INCDIR = -I${LOCALBASE}/include -! DESTDIR= ${PREFIX} -! LIBDIR = -L${LOCALBASE}/lib - - # for Linux - LIBS = -lXpm -lX11 -lXext +--- Makefile.orig 1999-03-23 02:20:32 UTC ++++ Makefile +@@ -1,8 +1,8 @@ +-CC = gcc +-CFLAGS = -O2 +-INCDIR = -I/usr/X11R6/include/X11 +-DESTDIR= /usr/X11R6 +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS ?= -O2 ++INCDIR = -I${LOCALBASE}/include ++DESTDIR= ${PREFIX} ++LIBDIR = -L${LOCALBASE}/lib + + # for Linux + LIBS = -lXpm -lX11 -lXext diff --git a/astro/wmmoonclock/files/patch-wmMoonClock.c b/astro/wmmoonclock/files/patch-wmMoonClock.c index edec5c503d21..0370a73fd733 100644 --- a/astro/wmmoonclock/files/patch-wmMoonClock.c +++ b/astro/wmmoonclock/files/patch-wmMoonClock.c @@ -1,6 +1,6 @@ ---- wmMoonClock.c.orig Thu Aug 15 18:15:26 2002 -+++ wmMoonClock.c Thu Aug 15 18:15:51 2002 -@@ -162,7 +162,8 @@ +--- wmMoonClock.c.orig 1999-06-07 14:27:18 UTC ++++ wmMoonClock.c +@@ -162,7 +162,8 @@ int main(int argc, char *argv[]) { int i, n, k, j, ImageNumber; int Year, Month, DayOfWeek, DayOfMonth; int Hours, Mins, Secs, OldSecs, digit, xoff, xsize; diff --git a/astro/wmsolar/files/patch-Makefile b/astro/wmsolar/files/patch-Makefile index 4e76bbdfb27b..872ea28528bb 100644 --- a/astro/wmsolar/files/patch-Makefile +++ b/astro/wmsolar/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-06-20 12:40:27 UTC +--- Makefile.orig 2016-07-26 13:20:30 UTC +++ Makefile @@ -1,8 +1,6 @@ -CC = g++ diff --git a/astro/wmsolar/files/patch-Vsop.h b/astro/wmsolar/files/patch-Vsop.h index b43c3e292aa0..91ec3fd03f1c 100644 --- a/astro/wmsolar/files/patch-Vsop.h +++ b/astro/wmsolar/files/patch-Vsop.h @@ -1,4 +1,4 @@ ---- Vsop.h.orig 2016-06-20 12:40:27 UTC +--- Vsop.h.orig 2016-07-26 13:20:30 UTC +++ Vsop.h @@ -12,6 +12,7 @@ #define VSOP__H diff --git a/astro/wmspaceweather/files/patch-GetKp b/astro/wmspaceweather/files/patch-GetKp index 55c2633e1c05..e65e1700318d 100644 --- a/astro/wmspaceweather/files/patch-GetKp +++ b/astro/wmspaceweather/files/patch-GetKp @@ -1,5 +1,5 @@ ---- ./GetKp.orig 1999-02-12 06:42:01.000000000 +0100 -+++ ./GetKp 2014-04-04 21:55:15.059689500 +0200 +--- GetKp.orig 1999-02-12 05:42:01 UTC ++++ GetKp @@ -5,7 +5,7 @@ # diff --git a/astro/wmspaceweather/files/patch-Makefile b/astro/wmspaceweather/files/patch-Makefile index 67dd3990d14d..6a985e4f4eea 100644 --- a/astro/wmspaceweather/files/patch-Makefile +++ b/astro/wmspaceweather/files/patch-Makefile @@ -1,5 +1,5 @@ ---- ./Makefile.orig 1999-01-04 22:20:45.000000000 +0100 -+++ ./Makefile 2014-04-04 21:55:35.196529518 +0200 +--- Makefile.orig 1999-01-04 21:20:45 UTC ++++ Makefile @@ -1,8 +1,7 @@ -CC = gcc -CFLAGS = -O2 -Wall @@ -13,7 +13,7 @@ # for linux LIBS = -lXpm -lX11 -lXext # for Solaris -@@ -12,14 +11,14 @@ +@@ -12,14 +11,14 @@ OBJS = wmSpaceWeather.o \ .c.o: @@ -30,7 +30,7 @@ clean: for i in $(OBJS) ; do \ -@@ -28,7 +27,7 @@ +@@ -28,7 +27,7 @@ clean: rm -f wmSpaceWeather install:: wmSpaceWeather diff --git a/astro/wmspaceweather/files/patch-wmSpaceWeather.c b/astro/wmspaceweather/files/patch-wmSpaceWeather.c index 5834dac43ff8..6f22d3ac4693 100644 --- a/astro/wmspaceweather/files/patch-wmSpaceWeather.c +++ b/astro/wmspaceweather/files/patch-wmSpaceWeather.c @@ -1,6 +1,6 @@ ---- ./wmSpaceWeather.c.orig 1999-02-18 18:57:45.000000000 +0100 -+++ ./wmSpaceWeather.c 2014-04-04 21:55:15.061690087 +0200 -@@ -115,7 +115,7 @@ +--- wmSpaceWeather.c.orig 1999-02-18 17:57:45 UTC ++++ wmSpaceWeather.c +@@ -115,7 +115,7 @@ XEvent event; int i, n, s, k, m, dt1, dt2; int Year, Month, Day, DayOfMonth, OldDayOfMonth; int Hours, Mins, Secs, OldSecs, xoff, D[10], xsize; @@ -9,7 +9,7 @@ int height, UpToDate, LEDOn; double UT, TU, TU2, TU3, T0, gmst, hour24(); -@@ -126,6 +126,7 @@ +@@ -126,6 +126,7 @@ int Kp[8] = { -1, -1, -1, -1, -1, -1, double E1, E2, P1, P2, P3; char Xray[10], digit[2]; FILE *fp; @@ -17,7 +17,7 @@ -@@ -249,13 +250,13 @@ +@@ -249,13 +250,13 @@ FILE *fp; /* @@ -33,7 +33,7 @@ dt2 = 0; -@@ -272,13 +273,13 @@ +@@ -272,13 +273,13 @@ FILE *fp; Secs = Time->tm_sec; UT = (double)Hours + (double)Mins/60.0 + (double)Secs/3600.0; CurrentJD = jd(Year, Month, Day, UT); @@ -49,7 +49,7 @@ for (i=0; i<8; ++i){ fscanf(fp, "%ld %d", &TimeTag[i], &Kp[i]); -@@ -289,7 +290,7 @@ +@@ -289,7 +290,7 @@ FILE *fp; fscanf(fp, "%lf", &P3); fscanf(fp, "%lf", &E1); fscanf(fp, "%lf", &E2); @@ -58,7 +58,7 @@ fclose(fp); } else { -@@ -318,7 +319,7 @@ +@@ -318,7 +319,7 @@ FILE *fp; LatestAvailJD = jd(Year, Month, Day, UT); DeltaT = (CurrentJD - LatestAvailJD)*24.0; @@ -67,7 +67,7 @@ if (!UpToDate){ -@@ -560,7 +561,7 @@ +@@ -560,7 +561,7 @@ void ParseCMDLine(int argc, char *argv[] } else if ((!strcmp(argv[i], "-url"))||(!strcmp(argv[i], "-u"))){ @@ -76,7 +76,7 @@ } else { -@@ -651,7 +652,7 @@ +@@ -651,7 +652,7 @@ void pressEvent(XButtonEvent *xev){ if (GotDoubleClick1) { GotFirstClick1 = 0; GotDoubleClick1 = 0; diff --git a/astro/wmsun/files/patch-Makefile b/astro/wmsun/files/patch-Makefile index 20562229be26..d21e0a79ec8e 100644 --- a/astro/wmsun/files/patch-Makefile +++ b/astro/wmsun/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Jan 6 11:28:39 1999 -+++ Makefile Thu Aug 3 21:28:34 2000 -@@ -18,12 +18,12 @@ +--- Makefile.orig 2015-04-01 21:05:45 UTC ++++ Makefile +@@ -18,12 +18,12 @@ LIBS = -lXpm -lX11 -lXext -lm OBJS = wmSun.o SunRise.o ../wmgeneral/wmgeneral.o .c.o: diff --git a/astro/wmsun/files/patch-wmSun.c b/astro/wmsun/files/patch-wmSun.c index 45b0541943da..7f5293d03e28 100644 --- a/astro/wmsun/files/patch-wmSun.c +++ b/astro/wmsun/files/patch-wmSun.c @@ -1,6 +1,6 @@ ---- wmSun.c.orig Thu Aug 15 18:04:04 2002 -+++ wmSun.c Thu Aug 15 18:06:24 2002 -@@ -76,7 +76,8 @@ +--- wmSun.c.orig 2015-04-01 21:07:58 UTC ++++ wmSun.c +@@ -76,7 +76,8 @@ int main(int argc, char *argv[]) { int LocalDayOfMonth, DayOfMonth; int Hours, Mins, Secs, OldSecs, digit, xoff, xsize; int OldMins; diff --git a/astro/xglobe/files/patch-Makefile b/astro/xglobe/files/patch-Makefile index c408904c8fcb..e1d88a8e4bc2 100644 --- a/astro/xglobe/files/patch-Makefile +++ b/astro/xglobe/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 1999-07-19 05:56:27.000000000 -0700 -+++ Makefile 2011-01-19 09:39:21.000000000 -0800 +--- Makefile.orig 1999-07-19 12:56:27 UTC ++++ Makefile @@ -4,43 +4,44 @@ ####### Installation directory diff --git a/astro/xglobe/files/patch-desktopwidget.cpp b/astro/xglobe/files/patch-desktopwidget.cpp index 9ef3e1498445..b1100d7e911c 100644 --- a/astro/xglobe/files/patch-desktopwidget.cpp +++ b/astro/xglobe/files/patch-desktopwidget.cpp @@ -1,5 +1,5 @@ ---- desktopwidget.cpp.orig 1998-12-09 10:15:52.000000000 -0800 -+++ desktopwidget.cpp 2011-01-18 22:40:26.000000000 -0800 +--- desktopwidget.cpp.orig 1998-12-09 18:15:52 UTC ++++ desktopwidget.cpp @@ -18,10 +18,14 @@ */ @@ -16,7 +16,7 @@ { haveImage = FALSE; currentImage = new QPixmap(width(), height()); -@@ -43,6 +47,7 @@ +@@ -43,6 +47,7 @@ void DesktopWidget::paintEvent(QPaintEve { QPainter p(this); @@ -24,7 +24,7 @@ if(!haveImage) { p.setFont(QFont("helvetica", 35)); -@@ -62,7 +67,8 @@ +@@ -62,7 +67,8 @@ void DesktopWidget::paintEvent(QPaintEve void DesktopWidget::updateDisplay(QImage *image) { diff --git a/astro/xglobe/files/patch-desktopwidget.h b/astro/xglobe/files/patch-desktopwidget.h index 1824d35063a0..10f19eddd27b 100644 --- a/astro/xglobe/files/patch-desktopwidget.h +++ b/astro/xglobe/files/patch-desktopwidget.h @@ -1,5 +1,5 @@ ---- desktopwidget.h.orig 1998-12-09 10:16:54.000000000 -0800 -+++ desktopwidget.h 2011-01-18 14:22:52.000000000 -0800 +--- desktopwidget.h.orig 1998-12-09 18:16:54 UTC ++++ desktopwidget.h @@ -23,6 +23,8 @@ #include <qwidget.h> #include <qpixmap.h> diff --git a/astro/xglobe/files/patch-earthapp.cpp b/astro/xglobe/files/patch-earthapp.cpp index 76941cf6958e..0ada8e01a975 100644 --- a/astro/xglobe/files/patch-earthapp.cpp +++ b/astro/xglobe/files/patch-earthapp.cpp @@ -1,5 +1,5 @@ ---- earthapp.cpp.orig 1999-12-06 08:14:10.000000000 -0800 -+++ earthapp.cpp 2011-01-19 09:28:15.000000000 -0800 +--- earthapp.cpp.orig 1999-12-06 16:14:10 UTC ++++ earthapp.cpp @@ -69,6 +69,12 @@ #include "config.h" #include "earthapp.h" @@ -13,7 +13,7 @@ /* ------------------------------------------------------------------------*/ -@@ -334,7 +340,7 @@ +@@ -334,7 +340,7 @@ EarthApplication::EarthApplication(int & if(use_kde) { dwidget = new DesktopWidget(); @@ -22,7 +22,7 @@ dwidget->update(); } } -@@ -343,9 +349,9 @@ +@@ -343,9 +349,9 @@ EarthApplication::EarthApplication(int & EarthApplication::~EarthApplication(void) { @@ -34,7 +34,7 @@ timer->stop(); delete timer; -@@ -937,8 +943,8 @@ +@@ -937,8 +943,8 @@ void EarthApplication::readOutFileName(i void EarthApplication::randomPosition() { @@ -45,7 +45,7 @@ } /* ------------------------------------------------------------------------*/ -@@ -1233,7 +1239,7 @@ +@@ -1233,7 +1239,7 @@ void EarthApplication::init() r->setRotation(rotation); timer = new QTimer(this); @@ -54,7 +54,7 @@ connect(timer, SIGNAL(timeout()), this, SLOT(recalc())); QTimer::singleShot(1, this, SLOT(recalc())); // this will start rendering -@@ -1307,7 +1313,19 @@ +@@ -1307,7 +1313,19 @@ void EarthApplication::recalc() { QPixmap pm; pm.convertFromImage(*(r->getImage())); diff --git a/astro/xglobe/files/patch-earthapp.h b/astro/xglobe/files/patch-earthapp.h index ad7ba6e0662a..bfbc68eca831 100644 --- a/astro/xglobe/files/patch-earthapp.h +++ b/astro/xglobe/files/patch-earthapp.h @@ -1,5 +1,5 @@ ---- earthapp.h.orig 1999-12-06 08:14:23.000000000 -0800 -+++ earthapp.h 2011-01-18 14:22:52.000000000 -0800 +--- earthapp.h.orig 1999-12-06 16:14:23 UTC ++++ earthapp.h @@ -54,6 +54,8 @@ #define _EARTHAPP_H diff --git a/astro/xglobe/files/patch-main.cpp b/astro/xglobe/files/patch-main.cpp index 505b961f3df7..9e207ebd2d55 100644 --- a/astro/xglobe/files/patch-main.cpp +++ b/astro/xglobe/files/patch-main.cpp @@ -1,5 +1,5 @@ ---- main.cpp.orig 1999-07-13 10:32:55.000000000 -0700 -+++ main.cpp 2011-01-18 14:22:52.000000000 -0800 +--- main.cpp.orig 1999-07-13 17:32:55 UTC ++++ main.cpp @@ -24,6 +24,7 @@ */ @@ -8,7 +8,7 @@ #include <string.h> #include <qstring.h> #include "config.h" -@@ -37,6 +38,8 @@ +@@ -37,6 +38,8 @@ int main(int argc, char **argv) { EarthApplication myApp(argc, argv); diff --git a/astro/xglobe/files/patch-marker.xpm b/astro/xglobe/files/patch-marker.xpm index 4cfec031a041..96bc338cef45 100644 --- a/astro/xglobe/files/patch-marker.xpm +++ b/astro/xglobe/files/patch-marker.xpm @@ -1,5 +1,5 @@ ---- marker.xpm.orig 1998-11-20 09:16:30.000000000 -0800 -+++ marker.xpm 2011-01-19 09:32:52.000000000 -0800 +--- marker.xpm.orig 1998-11-20 17:16:30 UTC ++++ marker.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * marker_xpm[] = { diff --git a/astro/xglobe/files/patch-markerlist.cpp b/astro/xglobe/files/patch-markerlist.cpp index 16e6d3e45e02..574670a0b654 100644 --- a/astro/xglobe/files/patch-markerlist.cpp +++ b/astro/xglobe/files/patch-markerlist.cpp @@ -1,5 +1,5 @@ ---- markerlist.cpp.orig 1999-07-13 11:13:41.000000000 -0700 -+++ markerlist.cpp 2011-01-18 14:22:52.000000000 -0800 +--- markerlist.cpp.orig 1999-07-13 18:13:41 UTC ++++ markerlist.cpp @@ -28,7 +28,7 @@ #include "markerlist.h" @@ -9,7 +9,7 @@ /* ------------------------------------------------------------------------ */ -@@ -94,11 +94,11 @@ +@@ -94,11 +94,11 @@ bool MarkerList::loadMarkerFile(const ch int pos1; int pos2; QFile f(filename); diff --git a/astro/xglobe/files/patch-markerlist.h b/astro/xglobe/files/patch-markerlist.h index 82cb67d79370..8c1c648cdee0 100644 --- a/astro/xglobe/files/patch-markerlist.h +++ b/astro/xglobe/files/patch-markerlist.h @@ -1,6 +1,6 @@ ---- markerlist.h.orig 1999-07-13 11:14:07.000000000 -0700 -+++ markerlist.h 2011-01-18 14:22:52.000000000 -0800 -@@ -56,21 +56,23 @@ +--- markerlist.h.orig 1999-07-13 18:14:07 UTC ++++ markerlist.h +@@ -56,21 +56,23 @@ private: class MarkerList { public: diff --git a/astro/xglobe/files/patch-renderer.cpp b/astro/xglobe/files/patch-renderer.cpp index 49e57136982f..ea7375cae596 100644 --- a/astro/xglobe/files/patch-renderer.cpp +++ b/astro/xglobe/files/patch-renderer.cpp @@ -1,6 +1,6 @@ ---- renderer.cpp.orig 1999-12-06 08:13:35.000000000 -0800 -+++ renderer.cpp 2011-01-18 14:22:52.000000000 -0800 -@@ -123,7 +123,7 @@ +--- renderer.cpp.orig 1999-12-06 16:13:35 UTC ++++ renderer.cpp +@@ -123,7 +123,7 @@ Renderer::Renderer(const QSize &size, co this->ambientGreen = 0.15; this->ambientBlue = 0.15; this->markerpixmap = new QPixmap((const char **)marker_xpm); @@ -9,7 +9,7 @@ this->show_label = TRUE; this->gridtype = NO_GRID; this->d_gridline = 15.0*PI/180.; -@@ -448,7 +448,7 @@ +@@ -448,7 +448,7 @@ double Renderer::getZoom() void Renderer::setMarkerList(MarkerList *l) { @@ -18,7 +18,7 @@ markerlist = l; } -@@ -1136,7 +1136,7 @@ +@@ -1136,7 +1136,7 @@ void Renderer::drawMarkers() Location **visible_locations; visible_locations = new Location*[markerlist->count()]; @@ -27,7 +27,7 @@ // Matrix M of renderFrame, but transposed m11 = cos(rot)*cos(view_long)-sin(view_lat)*sin(view_long)*sin(rot); -@@ -1151,8 +1151,9 @@ +@@ -1151,8 +1151,9 @@ void Renderer::drawMarkers() visible_angle = radius/center_dist; @@ -38,7 +38,7 @@ lon = l->getLongitude()*PI/180.; lat = l->getLatitude()*PI/180.; -@@ -1185,12 +1186,9 @@ +@@ -1185,12 +1186,9 @@ void Renderer::drawMarkers() l->x = screen_x + shift_x; l->y = screen_y + shift_y; @@ -52,7 +52,7 @@ // sort the markers according to depth qsort(visible_locations, num, sizeof(Location *), Renderer::compareLocations); -@@ -1208,8 +1206,8 @@ +@@ -1208,8 +1206,8 @@ int Renderer::compareLocations(const voi { double c1, c2; @@ -63,7 +63,7 @@ if(c1 > c2) return 1; -@@ -1364,7 +1362,7 @@ +@@ -1364,7 +1362,7 @@ QImage *Renderer::getImage() QImage *clonedImage = NULL; clonedImage = new QImage(*renderedImage); @@ -72,7 +72,7 @@ return clonedImage; } -@@ -1391,7 +1389,7 @@ +@@ -1391,7 +1389,7 @@ void Renderer::paintMarker(int x, int y, #if QT_VERSION >= 200 p.setPen(Qt::black); #else @@ -81,7 +81,7 @@ #endif wx = -br.x()+markerpixmap->width()+2; wy = -br.y(); -@@ -1434,7 +1432,7 @@ +@@ -1434,7 +1432,7 @@ void Renderer::paintMarker(int x, int y, for(wx=0 ; wx<visiblerect.width(); wx++) { @@ -90,7 +90,7 @@ { case 0x00000000: *dest++ = 0; -@@ -1483,8 +1481,8 @@ +@@ -1483,8 +1481,8 @@ void Renderer::drawLabel() labelstring.sprintf("%s, %s %d. %d, %d:%02d %s\n" "View pos %2.2f° %c %2.2f° %c\n" "Sun pos %2.2f° %c %2.2f° %c", @@ -101,7 +101,7 @@ dt.date().day(), dt.date().year(), dt.time().hour(), dt.time().minute(), tzname[tm->tm_isdst], -@@ -1499,7 +1497,7 @@ +@@ -1499,7 +1497,7 @@ void Renderer::drawLabel() QRect br = fm.boundingRect(0, 0, 0, 0, Qt::AlignLeft|Qt::AlignTop, labelstring); #else @@ -110,7 +110,7 @@ #endif QPixmap pm(br.width()+10, br.height()+10); -@@ -1512,8 +1510,8 @@ +@@ -1512,8 +1510,8 @@ void Renderer::drawLabel() p.drawText(5, 5, br.width(), br.height(), Qt::AlignLeft|Qt::AlignTop, labelstring); #else @@ -121,7 +121,7 @@ #endif p.end(); -@@ -1562,9 +1560,9 @@ +@@ -1562,9 +1560,9 @@ void Renderer::drawStars() for(int i=0; i<numstars; i++) { diff --git a/astro/xglobe/files/patch-sunpos.cpp b/astro/xglobe/files/patch-sunpos.cpp index f63f28e08013..d8ab21daac11 100644 --- a/astro/xglobe/files/patch-sunpos.cpp +++ b/astro/xglobe/files/patch-sunpos.cpp @@ -1,6 +1,6 @@ ---- sunpos.cpp.orig 1998-12-09 10:51:09.000000000 -0800 -+++ sunpos.cpp 2011-01-18 14:22:52.000000000 -0800 -@@ -203,7 +203,7 @@ +--- sunpos.cpp.orig 1998-12-09 18:51:09 UTC ++++ sunpos.cpp +@@ -203,7 +203,7 @@ double SunPos::julian_date(int y, int m, double JD; /* lazy test to ensure gregorian calendar */ diff --git a/astro/xmoontool/files/patch-Makefile b/astro/xmoontool/files/patch-Makefile index c63f45a762b7..8b105a88c629 100644 --- a/astro/xmoontool/files/patch-Makefile +++ b/astro/xmoontool/files/patch-Makefile @@ -1,8 +1,8 @@ ---- ./Makefile.orig Fri Feb 24 23:00:24 2006 -+++ ./Makefile Fri Mar 24 10:55:01 2006 -@@ -8,9 +8,9 @@ +--- Makefile.orig 2006-02-24 22:00:24 UTC ++++ Makefile +@@ -8,9 +8,9 @@ INSTALL?= install LOCALBASE?= /usr/local - X11BASE?= /usr/local + X11BASE?= /usr/X11R6 -CC= gcc -CFLAGS= -O2 -Wall @@ -11,5 +11,5 @@ +#CFLAGS= -O2 -Wall +LDFLAGS+= -lXm -lXt -lX11 -lm DEFINES?= -DDEFAULT_COLOR - ALL_CFLAGS= $(CFLAGS) $(DEFINES) -I$(LOCALBASE)/include -L$(LOCALBASE)/lib + ALL_CFLAGS= $(CFLAGS) $(DEFINES) -I$(X11BASE)/include -L$(X11BASE)/lib diff --git a/astro/xphoon/files/patch-Imakefile b/astro/xphoon/files/patch-Imakefile index 671c9a868d9f..d607d8420b3c 100644 --- a/astro/xphoon/files/patch-Imakefile +++ b/astro/xphoon/files/patch-Imakefile @@ -1,5 +1,5 @@ ---- ./Imakefile.org Wed Sep 18 12:57:31 1991 -+++ ./Imakefile Tue Feb 14 18:44:28 1995 +--- Imakefile.orig 2000-06-13 21:55:44 UTC ++++ Imakefile @@ -11,7 +11,7 @@ diff --git a/astro/xphoon/files/patch-dtime.c b/astro/xphoon/files/patch-dtime.c index e5e35cd66b77..2841a5514ea0 100644 --- a/astro/xphoon/files/patch-dtime.c +++ b/astro/xphoon/files/patch-dtime.c @@ -1,6 +1,6 @@ ---- dtime.c.orig Sat Sep 14 14:15:25 1991 -+++ dtime.c Sun Jan 3 18:36:48 1999 -@@ -26,13 +26,20 @@ +--- dtime.c.orig 1991-09-14 05:15:25 UTC ++++ dtime.c +@@ -26,13 +26,20 @@ extern long timezone; #include <sys/timeb.h> #endif /*SYS5*/ @@ -22,7 +22,7 @@ (void) time( &clock ); return dlocaltime( &clock ); -@@ -40,7 +47,7 @@ +@@ -40,7 +47,7 @@ dtwstime() struct tws* dlocaltime( clock ) @@ -31,7 +31,7 @@ { register struct tm* tm; #ifndef SYS5 -@@ -48,7 +55,7 @@ +@@ -48,7 +55,7 @@ dlocaltime( clock ) #endif not SYS5 static struct tws tw; diff --git a/astro/xphoon/files/patch-xphoon.c b/astro/xphoon/files/patch-xphoon.c index e09711110328..8d430fa70c00 100644 --- a/astro/xphoon/files/patch-xphoon.c +++ b/astro/xphoon/files/patch-xphoon.c @@ -1,6 +1,6 @@ ---- xphoon.c.orig Thu Sep 19 04:57:37 1991 -+++ xphoon.c Sun Jan 3 18:30:29 1999 -@@ -20,7 +20,6 @@ +--- xphoon.c.orig 2000-06-13 21:50:16 UTC ++++ xphoon.c +@@ -20,7 +20,6 @@ static char rcsid[] = #include "vroot.h" #include <stdio.h> #include <stdlib.h> /* added by David Frey */ @@ -8,8 +8,8 @@ #include <time.h> /* added by David Frey */ #include <math.h> #include <limits.h> /* added by Lalo Martins */ -@@ -65,7 +74,7 @@ - int blackflag, demoflag; +@@ -65,7 +64,7 @@ main( argc, argv ) + int blackflag, demoflag, southflag; int printpid; char* display_name; - long clock; diff --git a/astro/xworld/files/patch-compile_world.c b/astro/xworld/files/patch-compile__world.c index 9c457be19215..9404597d3a7f 100644 --- a/astro/xworld/files/patch-compile_world.c +++ b/astro/xworld/files/patch-compile__world.c @@ -1,5 +1,5 @@ ---- compile_world.c.orig 2009-03-27 17:51:01.000000000 +0100 -+++ compile_world.c 2009-03-27 17:51:15.000000000 +0100 +--- compile_world.c.orig 1999-07-28 13:13:51 UTC ++++ compile_world.c @@ -33,6 +33,7 @@ #include <sys/types.h> #include <sys/mman.h> diff --git a/astro/xworld/files/patch-pad.c b/astro/xworld/files/patch-pad.c index f132d1983ae8..a5d98ea9271b 100644 --- a/astro/xworld/files/patch-pad.c +++ b/astro/xworld/files/patch-pad.c @@ -1,5 +1,5 @@ ---- pad.c.orig 2009-03-27 17:49:37.000000000 +0100 -+++ pad.c 2009-03-27 17:50:01.000000000 +0100 +--- pad.c.orig 1999-07-28 13:31:27 UTC ++++ pad.c @@ -35,6 +35,7 @@ #include <fcntl.h> #include <unistd.h> diff --git a/astro/xworld/files/patch-xworld_c b/astro/xworld/files/patch-xworld.c index 63cc59e8a531..8a81ab6dc5e0 100644 --- a/astro/xworld/files/patch-xworld_c +++ b/astro/xworld/files/patch-xworld.c @@ -1,5 +1,5 @@ ---- xworld.c.orig Wed Jul 28 17:39:11 1999 -+++ xworld.c Sat Aug 11 21:23:01 2001 +--- xworld.c.orig 1999-07-28 15:39:11 UTC ++++ xworld.c @@ -63,6 +63,8 @@ #define BORDER 5 #define SLEEP 120 |