# ChangeLog for sci-libs/rsl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Andy Spencer <andy753421@gmail.com> -rsl-1.40.ebuild,
+ +rsl-1.41.ebuild, files/rsl-automake.patch, -files/rsl-type_str.patch,
+ -files/rsl-valgrind.patch, -files/rsl-warnings.patch:
+ Version bump for RSL 1.41
+
13 Jul 2009; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
Adding maintainer-wanted as herd
-AUX rsl-automake.patch 9486 RMD160 c8a104957aae8160c2866d6f6f7352fb02e7a6ed SHA1 b087ac07ff33e6d571db24b0645745e225f39afe SHA256 25bbb984a23de470a1d90189365f78e6036eef49cdfcdb515487e1062efa6a58
-AUX rsl-type_str.patch 3582 RMD160 ba3bc9990021c89681eeaeceb41ad3641e86007d SHA1 c2d7b38edef6b3fa6256474d7569bf742641bccf SHA256 b2e6371cb939ff36231842e8370e793e86a364acb8d780c98999f115b6ab48bc
-AUX rsl-valgrind.patch 4278 RMD160 5cef74fedb6cab7381d490ef185e7b4bdc0f203c SHA1 8dd5e4f2cf9560b1624b2a93c0f9f08765ea37c5 SHA256 e968f37fcb64919005754a860d59301dcc6433ec44e4b89a070c7147711adf75
-AUX rsl-warnings.patch 5991 RMD160 88e011a8778aa51dc391a9e98e004f6cc6901482 SHA1 97974cd1ab5a81b0a4e7a10e001bac150e9dd15f SHA256 a9ec0f73096b225162d7f55454b51e47419dc9847a80c42c154c2179d06d1bf7
-DIST rsl-v1.40.tar.gz 772417 RMD160 819573695a20dcef5313900d89df680ca66c3ea4 SHA1 3ef59a3556d3dbc95ec339d5a834c838c1e8aafd SHA256 94ccae61d86e8216cec8b17e50b9a7fb0fefb21cef02e0dd73ad10b0cc60acb7
-EBUILD rsl-1.40.ebuild 595 RMD160 78f46e7dd3dd825122b72ff7dde7101ee8201075 SHA1 f447fbc4b4ef70f3f32bf9be769933141b4ae24d SHA256 df3d747cd94cbbb41ec41fb3e49765c453fcb79b59a737eb0ed00f658cd64173
-MISC ChangeLog 576 RMD160 5eeddc525d03f70e43eba036f562ad0c43c13160 SHA1 f6f287a09e4e073c6e96deb0d5af5f2a3f3708a3 SHA256 afff940e83010487265d57347d6de907643c13c27e83d40bb41fc94e4b98a248
+AUX rsl-automake.patch 8612 RMD160 9ac4e5f7735e38c2668d5ac5759715bbdcf8498e SHA1 37bf07c356148cac785f8ffc5875684028531748 SHA256 3e311f8f3c7c0ee5c06fc3f29203c01b73698f9d7a5f982ed2aa89b07956e579
+DIST rsl-v1.41.tar.gz 803824 RMD160 b238e2cd3357e0db1d659b2061b8aafd5dd9b29a SHA1 144e3e5542b6918210c8bb00d867fadbcf2aae7c SHA256 13fc54ac237e8b228d490ff35fe374e2d08a5f79814b4739865ac5b45b123adf
+EBUILD rsl-1.41.ebuild 562 RMD160 bca5fb1221e7ef0e378ee501d9fc2e1135937a60 SHA1 fc7c5e04c6fb7ee2026ebeff4e1bd058d69195ff SHA256 8b94d1a64d5854883b491558acdeaeaf1b3098248edfdd49203bb6bf888074aa
+MISC ChangeLog 803 RMD160 1cd0cbbf0ceef1c91d51e70b87b5f610c486c5bc SHA1 042f63fec7858d3970aa87cb10630b5f9fb50812 SHA256 ee249c7e88ae4a368bfa8d2da6e63f9b5adc174091837fa55235dd325d868d22
MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
-diff -ru rsl-v1.40/colors/Makefile.am rsl-v1.40.new/colors/Makefile.am
---- rsl-v1.40/colors/Makefile.am 1999-12-10 03:28:38.000000000 +0000
-+++ rsl-v1.40.new/colors/Makefile.am 2008-12-27 11:26:01.000000000 +0000
+diff --git a/colors/Makefile.am b/colors/Makefile.am
+index 709a367..b043f7f 100644
+--- a/colors/Makefile.am
++++ b/colors/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
color_DATA = *.???
EXTRA_DIST = $(color_DATA)
-diff -ru rsl-v1.40/colors/Makefile.in rsl-v1.40.new/colors/Makefile.in
---- rsl-v1.40/colors/Makefile.in 2008-12-27 11:30:45.000000000 +0000
-+++ rsl-v1.40.new/colors/Makefile.in 2008-12-27 11:26:07.000000000 +0000
-@@ -166,7 +166,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
--colordir = $(prefix)/lib/colors
-+colordir = $(datadir)/rsl/colors
- color_DATA = *.???
- EXTRA_DIST = $(color_DATA)
- all: all-am
-diff -ru rsl-v1.40/Makefile.am rsl-v1.40.new/Makefile.am
---- rsl-v1.40/Makefile.am 2008-10-10 20:06:57.000000000 +0000
-+++ rsl-v1.40.new/Makefile.am 2008-12-27 11:25:59.000000000 +0000
+diff --git a/Makefile.am b/Makefile.am
+index 3c106a8..6aca2ec 100644
+--- a/Makefile.am
++++ b/Makefile.am
@@ -1,73 +1,49 @@
## Process w/ automake. Or, autoreconf; make ##
+AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl\""
-
lib_LTLIBRARIES = librsl.la
--librsl_la_LDFLAGS = -version-info 1:40
+-librsl_la_LDFLAGS = -version-info 1:41
-librsl_la_SOURCES = \
-$(rapic_c) $(radtec_c)\
-dorade.c dorade_print.c dorade_to_radar.c\
+ wsr88d.h \
+ $(include_HEADERS)
+
-+librsl_la_LDFLAGS = -version-info 1:40
++librsl_la_LDFLAGS = -version-info 1:41
+librsl_la_SOURCES = \
+ $(rapic_c) $(radtec_c) \
+ dorade.c dorade_print.c dorade_to_radar.c \
- $(INSTALL) -m 644 toolkit_1BC-51_appl.h $(includedir)
- $(INSTALL) -m 644 wsr88d_locations.dat $(libdir)
-
- EXTRA_DIST = CHANGES CHECK_LIST Copyright GPL LGPL wsr88d_locations.dat rapic.h
+ EXTRA_DIST = CHANGES Copyright GPL LGPL wsr88d_locations.dat rapic.h
DISTCLEANFILES = rapic.c rapic-lex.c
-diff -ru rsl-v1.40/radar.c rsl-v1.40.new/radar.c
---- rsl-v1.40/radar.c 2006-08-09 19:35:53.000000000 +0000
-+++ rsl-v1.40.new/radar.c 2008-12-27 11:13:43.000000000 +0000
+diff --git a/radar.c b/radar.c
+index 4078f17..7c07d01 100644
+--- a/radar.c
++++ b/radar.c
@@ -60,7 +60,7 @@
void RSL_print_version()
}
/* Debug printing global variable: radar_verbose_flag */
-diff -ru rsl-v1.40/radar_to_uf.c rsl-v1.40.new/radar_to_uf.c
---- rsl-v1.40/radar_to_uf.c 2008-04-16 19:34:41.000000000 +0000
-+++ rsl-v1.40.new/radar_to_uf.c 2008-12-27 11:13:58.000000000 +0000
-@@ -316,7 +316,7 @@
- uf_ma[37] = tm->tm_year % 100; /* Same format as data year */
- uf_ma[38] = tm->tm_mon+1;
- uf_ma[39] = tm->tm_mday;
-- memcpy(&uf_ma[40], "RSL" RSL_VERSION_STR, 8);
-+ memcpy(&uf_ma[40], "RSL" VERSION, 8);
- if (little_endian()) swap2(&uf_ma[40], 8/2);
- uf_ma[44] = (signed short)UF_NO_DATA;
- len_ma = 45;
-diff -ru rsl-v1.40/read_write.c rsl-v1.40.new/read_write.c
---- rsl-v1.40/read_write.c 2008-10-07 22:30:06.000000000 +0000
-+++ rsl-v1.40.new/read_write.c 2008-12-27 11:14:05.000000000 +0000
-@@ -314,7 +314,7 @@
+diff --git a/radar_to_uf.c b/radar_to_uf.c
+index 0d3af56..53d2d8d 100644
+--- a/radar_to_uf.c
++++ b/radar_to_uf.c
+@@ -321,7 +321,7 @@ void RSL_radar_to_uf_fp(Radar *r, FILE *fp)
+ uf_ma[37] = tm->tm_year % 100; /* Same format as data year */
+ uf_ma[38] = tm->tm_mon+1;
+ uf_ma[39] = tm->tm_mday;
+- memcpy(&uf_ma[40], "RSL" RSL_VERSION_STR, 8);
++ memcpy(&uf_ma[40], "RSL" VERSION, 8);
+ if (little_endian()) swap2(&uf_ma[40], 8/2);
+ uf_ma[44] = (signed short)UF_NO_DATA;
+ len_ma = 45;
+diff --git a/read_write.c b/read_write.c
+index 644a7b2..1e5f319 100644
+--- a/read_write.c
++++ b/read_write.c
+@@ -314,7 +314,7 @@ int RSL_write_radar_fp(Radar *radar, FILE *fp)
if (radar == NULL) return 0;
memset(title, 0, sizeof(title));
n += fwrite(title, sizeof(char), sizeof(title), fp);
memset(header_buf, 0, sizeof(header_buf));
-diff -ru rsl-v1.40/rsl.h rsl-v1.40.new/rsl.h
---- rsl-v1.40/rsl.h 2008-10-10 20:09:36.000000000 +0000
-+++ rsl-v1.40.new/rsl.h 2008-12-27 11:15:24.000000000 +0000
+diff --git a/rsl.h b/rsl.h
+index a821765..597069c 100644
+--- a/rsl.h
++++ b/rsl.h
@@ -27,8 +27,6 @@
#include "config.h"
#endif
--#define RSL_VERSION_STR "v1.40"
+-#define RSL_VERSION_STR "v1.41"
-
/**********************************************************************/
/* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/
#define RAINFALL_RED_FILE COLORDIR "/red_rainfall.clr"
#define RAINFALL_GREEN_FILE COLORDIR "/grn_rainfall.clr"
#define RAINFALL_BLUE_FILE COLORDIR "/blu_rainfall.clr"
-diff -ru rsl-v1.40/wsr88d.h rsl-v1.40.new/wsr88d.h
---- rsl-v1.40/wsr88d.h 2004-03-12 17:12:09.000000000 +0000
-+++ rsl-v1.40.new/wsr88d.h 2008-12-27 11:16:01.000000000 +0000
+diff --git a/wsr88d.h b/wsr88d.h
+index ecad620..7d22427 100644
+--- a/wsr88d.h
++++ b/wsr88d.h
@@ -7,7 +7,7 @@
* The directory should be the same as the LIBDIR in the makefile.
*/
#endif
/*===============================================================*/
typedef struct {
-diff -ru rsl-v1.40/doc/Makefile.am rsl-v1.40.new/doc/Makefile.am
---- rsl-v1.40/doc/Makefile.am
-+++ rsl-v1.40.new/doc/Makefile.am
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 6acc059..d4fc3fd 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
@@ -1,12 +1,3 @@
AUTOMAKE_OPTIONS = foreign
- $(INSTALL) -m 444 ../README $(docdir)
- $(INSTALL) -m 444 ../CHANGES $(docdir)
+dist_doc_DATA = *.html *.gif *.jpg *.fig ../README ../CHANGES
+--
+1.7.3.4
+
+++ /dev/null
---- rsl-v1.40/wsr88d_m31.c 2008-10-08 23:43:03.000000000 +0000
-+++ rsl-mine/wsr88d_m31.c 2009-05-10 12:58:17.000000000 +0000
-@@ -546,6 +548,7 @@
- Range (*invf)(float x);
- float (*f)(Range x);
- int vol_index, waveform;
-+ char *type_str;
-
- enum waveforms {surveillance=1, doppler_ambres, doppler_no_ambres, batch};
-
-@@ -572,10 +575,10 @@
- if (wsr88d_ray.ray_hdr.dbptr_ref > 0) {
- vol_index = wsr88d_get_vol_index(wsr88d_ray.ref->data_hdr.dataname);
- switch (vol_index) {
-- case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
-- case VR_INDEX: f = VR_F; invf = VR_INVF; break;
-- case SW_INDEX: f = SW_F; invf = SW_INVF; break;
-- default: f = DZ_F; invf = DZ_INVF; break;
-+ case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
-+ case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
-+ case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
-+ default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
- }
- /* If this is reflectivity, check the waveform type to make sure
- * it isn't from a Doppler split cut.
-@@ -591,6 +594,7 @@
- radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
- radar->v[vol_index]->h.f = f;
- radar->v[vol_index]->h.invf = invf;
-+ radar->v[vol_index]->h.type_str = type_str;
- }
- if (radar->v[vol_index]->sweep[isweep] == NULL) {
- radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);
-@@ -608,15 +612,16 @@
- if (wsr88d_ray.ray_hdr.dbptr_vel > 0) {
- vol_index = wsr88d_get_vol_index(wsr88d_ray.vel->data_hdr.dataname);
- switch (vol_index) {
-- case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
-- case VR_INDEX: f = VR_F; invf = VR_INVF; break;
-- case SW_INDEX: f = SW_F; invf = SW_INVF; break;
-- default: f = DZ_F; invf = DZ_INVF; break;
-+ case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
-+ case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
-+ case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
-+ default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
- }
- if (radar->v[vol_index] == NULL) {
- radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
- radar->v[vol_index]->h.f = f;
- radar->v[vol_index]->h.invf = invf;
-+ radar->v[vol_index]->h.type_str = type_str;
- }
- if (radar->v[vol_index]->sweep[isweep] == NULL) {
- radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);
-@@ -633,15 +638,16 @@
- if (wsr88d_ray.ray_hdr.dbptr_sw > 0) {
- vol_index = wsr88d_get_vol_index(wsr88d_ray.sw->data_hdr.dataname);
- switch (vol_index) {
-- case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
-- case VR_INDEX: f = VR_F; invf = VR_INVF; break;
-- case SW_INDEX: f = SW_F; invf = SW_INVF; break;
-- default: f = DZ_F; invf = DZ_INVF; break;
-+ case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
-+ case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
-+ case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
-+ default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
- }
- if (radar->v[vol_index] == NULL) {
- radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
- radar->v[vol_index]->h.f = f;
- radar->v[vol_index]->h.invf = invf;
-+ radar->v[vol_index]->h.type_str = type_str;
- }
- if (radar->v[vol_index]->sweep[isweep] == NULL) {
- radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);
+++ /dev/null
-diff -w -ru rsl-v1.40/wsr88d_m31.c rsl-v1.40.test/wsr88d_m31.c
---- rsl-v1.40/wsr88d_m31.c 2008-10-08 23:43:03.000000000 +0000
-+++ rsl-v1.40.test/wsr88d_m31.c 2009-05-14 10:06:23.000000000 +0000
-@@ -515,6 +515,7 @@
- m1_ray.vol_cpat = vcp_data.vcp;
- m1_ray.elev_num = ray_hdr.elev_num;
- m1_ray.unam_rng = wsr88d_ray.unamb_rng;
-+ m1_ray.nyq_vel = wsr88d_ray.nyq_vel; // TODO: is this correct?
- if (ray_hdr.azm_res != 1)
- ray->h.beam_width = 1.0;
- else ray->h.beam_width = 0.5;
-@@ -603,6 +604,8 @@
- radar->v[vol_index]->sweep[isweep]->ray[iray] = ray;
- radar->v[vol_index]->sweep[isweep]->h.nrays = iray+1;
- }
-+ free(wsr88d_ray.ref->data);
-+ free(wsr88d_ray.ref);
- }
-
- if (wsr88d_ray.ray_hdr.dbptr_vel > 0) {
-@@ -628,6 +631,8 @@
- wsr88d_load_ray_hdr(wsr88d_ray, ray);
- radar->v[vol_index]->sweep[isweep]->ray[iray] = ray;
- radar->v[vol_index]->sweep[isweep]->h.nrays = iray+1;
-+ free(wsr88d_ray.vel->data);
-+ free(wsr88d_ray.vel);
- }
-
- if (wsr88d_ray.ray_hdr.dbptr_sw > 0) {
-@@ -653,6 +658,8 @@
- wsr88d_load_ray_hdr(wsr88d_ray, ray);
- radar->v[vol_index]->sweep[isweep]->ray[iray] = ray;
- radar->v[vol_index]->sweep[isweep]->h.nrays = iray+1;
-+ free(wsr88d_ray.sw->data);
-+ free(wsr88d_ray.sw);
- }
-
- }
-@@ -706,15 +713,27 @@
- * at the WSR-88D Radar Operations Center web site.
- */
-
-- n = fread(&msghdr, sizeof(Wsr88d_msg_hdr), 1, wf->fptr);
--
-- /* printf("msgtype = %d\n", msghdr.msg_type); */
-- msg_hdr_size = sizeof(Wsr88d_msg_hdr) - sizeof(msghdr.rpg);
-
-
- radar = RSL_new_radar(MAX_RADAR_VOLUMES);
-
- while (! end_of_vos) {
-+ /* Read current header */
-+ n = fread(&msghdr, sizeof(Wsr88d_msg_hdr), 1, wf->fptr);
-+ if (n < 1) {
-+ fprintf(stderr,"Warning: load_wsr88d_m31_into_radar: ");
-+ if (feof(wf->fptr) != 0) fprintf(stderr,
-+ "Unexpected end of file.\n");
-+ else fprintf(stderr,"Failed reading msghdr.\n");
-+ fprintf(stderr,"Current sweep number: %d\n"
-+ "Last ray read: %d\n", isweep+1, iray);
-+ wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-+ return radar;
-+ }
-+
-+ /* printf("msgtype = %d\n", msghdr.msg_type); */
-+ msg_hdr_size = sizeof(Wsr88d_msg_hdr) - sizeof(msghdr.rpg);
-+
- if (msghdr.msg_type == 31) {
- if (little_endian()) wsr88d_swap_m31_hdr(&msghdr);
-
-@@ -729,6 +748,18 @@
- /* Load this ray into radar structure ray. */
- wsr88d_load_ray_into_radar(wsr88d_ray, isweep, iray, radar);
- iray++;
-+
-+ /* Check for end of sweep */
-+ if (wsr88d_ray.ray_hdr.radial_status == END_OF_ELEV) {
-+ wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-+ isweep++;
-+ iray = 0;
-+ }
-+
-+ if (wsr88d_ray.ray_hdr.radial_status == END_VOS) {
-+ //wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-+ end_of_vos = 1;
-+ }
- }
- else { /* msg_type not 31 */
- n = fread(&non31_seg_remainder, sizeof(non31_seg_remainder), 1,
-@@ -748,33 +779,11 @@
- radar->h.vcp = vcp_data.vcp;
- /* printf("VCP = %d\n", vcp_data.vcp); */
- }
-+ /* TODO: check for end of sweep/volume */
- }
-
-- /* Check for end of sweep */
-- if (wsr88d_ray.ray_hdr.radial_status == END_OF_ELEV) {
-- wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-- isweep++;
-- iray = 0;
-- }
--
-- if (wsr88d_ray.ray_hdr.radial_status != END_VOS) {
-- n = fread(&msghdr, sizeof(Wsr88d_msg_hdr), 1, wf->fptr);
-- if (n < 1) {
-- fprintf(stderr,"Warning: load_wsr88d_m31_into_radar: ");
-- if (feof(wf->fptr) != 0) fprintf(stderr,
-- "Unexpected end of file.\n");
-- else fprintf(stderr,"Failed reading msghdr.\n");
-- fprintf(stderr,"Current sweep number: %d\n"
-- "Last ray read: %d\n", isweep+1, iray);
-- wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-- return radar;
-- }
-- }
-- else {
-+ if (feof(wf->fptr) != 0)
- end_of_vos = 1;
-- wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-- }
-- if (feof(wf->fptr) != 0) end_of_vos = 1;
- }
-
- return radar;
-diff -w -ru rsl-v1.40/wsr88d_to_radar.c rsl-v1.40.test/wsr88d_to_radar.c
---- rsl-v1.40/wsr88d_to_radar.c 2008-07-30 22:41:20.000000000 +0000
-+++ rsl-v1.40.test/wsr88d_to_radar.c 2009-05-14 10:07:09.000000000 +0000
-@@ -429,5 +429,6 @@
- radar->h.lpulse = sitep->lpulse;
-
- radar = RSL_prune_radar(radar);
-+ free(sitep);
- return radar;
- }
+++ /dev/null
-diff -ru rsl-v1.40/africa.c warnings/africa.c
---- rsl-v1.40/africa.c 1999-12-01 03:48:29.000000000 +0000
-+++ warnings/africa.c 2008-12-27 11:53:44.000000000 +0000
-@@ -22,6 +22,7 @@
- */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "africa.h"
-
- int africa_read_buffer(FILE *fp, Africa_buffer *buffer)
-diff -ru rsl-v1.40/dorade_to_radar.c warnings/dorade_to_radar.c
---- rsl-v1.40/dorade_to_radar.c 1999-12-01 03:48:29.000000000 +0000
-+++ warnings/dorade_to_radar.c 2008-12-27 11:53:44.000000000 +0000
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
--#include <strings.h>
-+#include <string.h>
- #define USE_RSL_VARS
- #include "rsl.h"
- #include "dorade.h"
-diff -ru rsl-v1.40/examples/any_to_gif.c warnings/examples/any_to_gif.c
---- rsl-v1.40/examples/any_to_gif.c 1999-01-26 16:20:25.000000000 +0000
-+++ warnings/examples/any_to_gif.c 2008-12-27 11:53:44.000000000 +0000
-@@ -73,7 +73,7 @@
- }
-
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sweep;
-diff -ru rsl-v1.40/examples/any_to_ppm.c warnings/examples/any_to_ppm.c
---- rsl-v1.40/examples/any_to_ppm.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/any_to_ppm.c 2008-12-27 11:53:44.000000000 +0000
-@@ -9,11 +9,12 @@
- * the RSL.
- *
- */
-+#include <stdlib.h>
-
- #define USE_RSL_VARS
- #include "rsl.h"
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sweep;
-diff -ru rsl-v1.40/examples/cappi_image.c warnings/examples/cappi_image.c
---- rsl-v1.40/examples/cappi_image.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/cappi_image.c 2008-12-27 11:53:44.000000000 +0000
-@@ -7,6 +7,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "rsl.h"
-
-diff -ru rsl-v1.40/examples/dorade_main.c warnings/examples/dorade_main.c
---- rsl-v1.40/examples/dorade_main.c 1999-08-12 20:44:30.000000000 +0000
-+++ warnings/examples/dorade_main.c 2008-12-27 11:53:44.000000000 +0000
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include "rsl.h"
-
- int main(int argc, char **argv)
-diff -ru rsl-v1.40/examples/killer_sweep.c warnings/examples/killer_sweep.c
---- rsl-v1.40/examples/killer_sweep.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/killer_sweep.c 2008-12-27 11:53:44.000000000 +0000
-@@ -146,7 +146,7 @@
- }
- }
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sweep;
-diff -ru rsl-v1.40/examples/kwaj_subtract_one_day.c warnings/examples/kwaj_subtract_one_day.c
---- rsl-v1.40/examples/kwaj_subtract_one_day.c 1999-08-13 14:26:40.000000000 +0000
-+++ warnings/examples/kwaj_subtract_one_day.c 2008-12-27 11:53:44.000000000 +0000
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #include "rsl.h"
-
- /**********************************************************************/
-diff -ru rsl-v1.40/examples/lassen_to_gif.c warnings/examples/lassen_to_gif.c
---- rsl-v1.40/examples/lassen_to_gif.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/lassen_to_gif.c 2008-12-27 11:53:44.000000000 +0000
-@@ -4,9 +4,10 @@
- * This program can read the file from stdin.
- */
-
-+#include <stdlib.h>
- #include "rsl.h"
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
-
-diff -ru rsl-v1.40/examples/print_hash_table.c warnings/examples/print_hash_table.c
---- rsl-v1.40/examples/print_hash_table.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/print_hash_table.c 2008-12-27 11:53:44.000000000 +0000
-@@ -9,6 +9,7 @@
- *
- */
-
-+#include <stdlib.h>
- #include "rsl.h"
-
- void print_link_list(Azimuth_hash *list)
-@@ -87,7 +88,7 @@
- }
-
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sweep;
-diff -ru rsl-v1.40/examples/sector.c warnings/examples/sector.c
---- rsl-v1.40/examples/sector.c 1998-09-16 18:35:57.000000000 +0000
-+++ warnings/examples/sector.c 2008-12-27 11:53:44.000000000 +0000
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include "rsl.h"
-
- /*
-@@ -84,7 +85,7 @@
- }
-
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sector;
-diff -ru rsl-v1.40/examples/wsr88d_to_gif.c warnings/examples/wsr88d_to_gif.c
---- rsl-v1.40/examples/wsr88d_to_gif.c 1998-09-16 18:35:57.000000000 +0000
-+++ warnings/examples/wsr88d_to_gif.c 2008-12-27 11:53:44.000000000 +0000
-@@ -14,9 +14,10 @@
- * wsr88d_to_gif file [tape_header_file]
- */
-
-+#include <stdlib.h>
- #include "rsl.h"
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
-
-diff -ru rsl-v1.40/lassen_to_radar.c warnings/lassen_to_radar.c
---- rsl-v1.40/lassen_to_radar.c 2008-07-24 13:40:50.000000000 +0000
-+++ warnings/lassen_to_radar.c 2008-12-27 11:53:44.000000000 +0000
-@@ -31,6 +31,7 @@
-
- */
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
- #include <math.h>
-diff -ru rsl-v1.40/rainbow.c warnings/rainbow.c
---- rsl-v1.40/rainbow.c 2004-02-10 17:10:28.000000000 +0000
-+++ warnings/rainbow.c 2008-12-27 11:53:44.000000000 +0000
-@@ -22,6 +22,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "rsl.h"
- #include "rainbow.h"
-diff -ru rsl-v1.40/rainbow_to_radar.c warnings/rainbow_to_radar.c
---- rsl-v1.40/rainbow_to_radar.c 2004-02-11 16:54:37.000000000 +0000
-+++ warnings/rainbow_to_radar.c 2008-12-27 11:53:44.000000000 +0000
-@@ -22,6 +22,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "rsl.h"
- #include "rainbow.h"
-diff -ru rsl-v1.40/wsr88d_m31.c warnings/wsr88d_m31.c
---- rsl-v1.40/wsr88d_m31.c 2008-10-08 23:43:03.000000000 +0000
-+++ warnings/wsr88d_m31.c 2008-12-27 11:53:44.000000000 +0000
-@@ -25,6 +25,8 @@
- * This file contains routines for processing Message Type 31, the digital
- * radar message type introduced in WSR-88D Level II Build 10.
- */
-+#include <stdlib.h>
-+#include <string.h>
-
- #include "rsl.h"
- #include "wsr88d.h"
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="
- sci-libs/hdf
+RDEPEND="sci-libs/hdf
virtual/jpeg"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
src_prepare() {
- epatch "${FILESDIR}/${PN}-"{warnings,automake,type_str,valgrind}".patch"
+ epatch "${FILESDIR}/${PN}-automake.patch"
eautoreconf
}
projects / ~andy / sunrise / commitdiff