diff options
Diffstat (limited to 'sci-astronomy')
| -rw-r--r-- | sci-astronomy/funtools/ChangeLog | 15 | ||||
| -rw-r--r-- | sci-astronomy/funtools/files/funtools-1.4.0-makefiles.patch | 368 | ||||
| -rw-r--r-- | sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch | 292 | ||||
| -rw-r--r-- | sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch | 121 | ||||
| -rw-r--r-- | sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch | 602 | ||||
| -rw-r--r-- | sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch | 77 | ||||
| -rw-r--r-- | sci-astronomy/funtools/funtools-1.4.0.ebuild | 59 | ||||
| -rw-r--r-- | sci-astronomy/funtools/funtools-1.4.4-r1.ebuild | 58 | ||||
| -rw-r--r-- | sci-astronomy/funtools/funtools-1.4.4-r2.ebuild | 59 |
9 files changed, 1138 insertions, 513 deletions
diff --git a/sci-astronomy/funtools/ChangeLog b/sci-astronomy/funtools/ChangeLog index e3b2874df809..fa2e58b1f8d6 100644 --- a/sci-astronomy/funtools/ChangeLog +++ b/sci-astronomy/funtools/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sci-astronomy/funtools -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/ChangeLog,v 1.8 2012/05/04 06:46:12 jdhore Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/ChangeLog,v 1.9 2013/07/08 23:23:33 bicatali Exp $ + +*funtools-1.4.4-r2 (08 Jul 2013) + + 08 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> + +files/funtools-1.4.4-ds9-fixes.patch, + +files/funtools-1.4.4-fix-autoheader.patch, + +files/funtools-1.4.4-fix-includes.patch, +funtools-1.4.4-r2.ebuild, + -files/funtools-1.4.0-makefiles.patch, -funtools-1.4.0.ebuild, + -funtools-1.4.4-r1.ebuild, files/funtools-1.4.4-makefiles.patch: + Switch to EAPI5, add static-libs flag, include some patches from Debian 04 May 2012; Jeff Horelick <jdhore@gentoo.org> funtools-1.4.0.ebuild, funtools-1.4.4-r1.ebuild: @@ -41,4 +51,3 @@ +files/funtools-1.4.0-makefiles.patch, +metadata.xml, +funtools-1.4.0.ebuild: Initial import - diff --git a/sci-astronomy/funtools/files/funtools-1.4.0-makefiles.patch b/sci-astronomy/funtools/files/funtools-1.4.0-makefiles.patch deleted file mode 100644 index 0184c23f7d49..000000000000 --- a/sci-astronomy/funtools/files/funtools-1.4.0-makefiles.patch +++ /dev/null @@ -1,368 +0,0 @@ ---- ./Makefile.in.orig 2008-11-02 20:13:46.000000000 +0000 -+++ ./Makefile.in 2008-11-02 21:20:42.000000000 +0000 -@@ -28,6 +28,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+mandir = @mandir@ -+datadir = @datadir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -37,19 +42,19 @@ - INSTALL_ROOT = - - # Directory in which to install the .a or .so binary for the FUNTOOLS library: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the program wish: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the funtools.h include file: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools - - # Top-level directory for manual entries: --MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) - - # Top-level directory for share entries: --MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools -+MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/funtools - - # util files are in the util subdirectory - UTIL_INC = -I./util -@@ -60,7 +65,7 @@ - # FITSY_LIBS = -L./fitsy -lfitsy - - # wcs files are in the wcs subdirectory --WCS_INC = -I./wcs -+WCS_INC = -I/usr/include/wcs - # WCS_LIBS = -L./wcs -lwcs - - # filter files are in the filter subdirectory -@@ -225,7 +230,7 @@ - echo $(PROGS) | ./mkfunmainlib > funmainlib.c; - - shlib: sublib $(LIBOBJS) -- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ -+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ - (cd $(PACKAGE)tmp && ar x ../$(LIB)); \ - CC='$(CC)' CXX=$(CXX) \ - ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \ -@@ -237,7 +242,7 @@ - $(RANLIB) lib$(PACKAGE)MainLib.a) - - shmainlib: mainlib -- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ -+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ - (cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \ - CC='$(CC)' CXX='$(CXX)' \ - ./mklib -o $(PACKAGE)MainLib -L. -lfuntools $(PACKAGE)tmp/*.o;\ -@@ -248,7 +253,7 @@ - $(RANLIB) libtclfun.a) - - shtclfun: tclfun -- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ -+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ - (cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \ - CC='$(CC)' CXX='$(CXX)' \ - ./mklib -o tclfun $(PACKAGE)tmp/*.o; \ -@@ -422,7 +427,7 @@ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -462,7 +467,7 @@ - install-man: - @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ - echo "Making directory $(MAN_INSTALL_DIR)"; \ -- mkdir $(MAN_INSTALL_DIR); \ -+ mkdir -p $(MAN_INSTALL_DIR); \ - chmod 755 $(MAN_INSTALL_DIR); \ - else true; \ - fi; -@@ -473,7 +478,7 @@ - M="$(MAN_INSTALL_DIR)/man$$E"; \ - if [ ! -d $$M ] ; then \ - echo "Making directory $$M"; \ -- mkdir $$M; \ -+ mkdir -p $$M; \ - chmod 755 $$M; \ - else true; \ - fi; \ ---- ./filter/Makefile.in.orig 2008-11-02 20:43:46.000000000 +0000 -+++ ./filter/Makefile.in 2008-11-03 10:54:33.000000000 +0000 -@@ -29,6 +29,9 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -38,13 +41,13 @@ - INSTALL_ROOT = - - # Directory in which to install the .a, .so, and .o files: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the programs: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include files: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/filter - - # util files are in the util directory at same level - UTIL_INC = -I../util -@@ -55,7 +58,7 @@ - #FITSY_LIBS = -L../fitsy - - # wcs files are in the wcs subdirectory --WCS_INC = -I../wcs -+WCS_INC = -I/usr/include/wcs - #WCS_LIBS = -L../wcs -lwcs - - # extra includes for compiling -@@ -161,7 +164,7 @@ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -211,7 +214,7 @@ - .c.o: - $(CC) -c $(CC_SWITCHES) $< - --filtprog_c.o: filtprog_c.c regions_h.h xalloc_c.h \ -+filtprog_c.o: filtprog_c.c regions_h.h xalloc_c.h swap_c.h \ - events_c.h image_c.h evregions_c.h imregions_c.h filter.h - $(CC) -c $(CC_SWITCHES) -DOBJPATH="$(OBJPATH)" \ - -DFILTER_CC="$(FILTER_CC)" -DFILTER_CFLAGS="$(FILTER_CFLAGS)" \ -@@ -226,6 +229,10 @@ - $(RM) xalloc_c.h - ./inc.sed XALLOC_C < ../util/xalloc.c > xalloc_c.h - -+swap_c.h: swap.c inc.sed -+ $(RM) swap_c.h -+ ./inc.sed SWAP_C < swap.c > swap_c.h -+ - events_c.h: evfilter.c inc.sed - $(RM) events_c.h - ./inc.sed EVENTS_C < evfilter.c > events_c.h -@@ -250,7 +257,7 @@ - $(RM) imregions_c.h - ./inc.sed IMREGIONS_C < imregions.c > imregions_c.h - --headers: regions_h.h xalloc_c.h \ -+headers: regions_h.h xalloc_c.h swap_c.h \ - events_c.h image_c.h evregions_c.h imregions_c.h - - # remake the parser ---- ./fitsy/Makefile.in.orig 2008-11-02 20:50:20.000000000 +0000 -+++ ./fitsy/Makefile.in 2008-11-02 21:21:32.000000000 +0000 -@@ -28,6 +28,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+mandir = @mandir@ -+datadir = @datadir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -37,13 +42,13 @@ - INSTALL_ROOT = - - # Directory in which to install the .a, .so, and .o files: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the programs: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include files: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/fitsy - - # There are just too many different versions of "install" around; - # better to use the install-sh script that comes with the distribution, -@@ -186,7 +191,7 @@ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -200,6 +205,8 @@ - fi; - @echo "Installing fitsy.h" - @$(INSTALL_DATA) fitsy.h $(INCLUDE_INSTALL_DIR)/fitsy.h -+ @echo "Installing xfile.h" -+ @$(INSTALL_DATA) xfile.h $(INCLUDE_INSTALL_DIR)/xfile.h - # @for i in $(PROGS) ; \ - # do \ - # if [ -f $$i ] ; then \ ---- ./util/Makefile.in.orig 2008-11-02 20:55:57.000000000 +0000 -+++ ./util/Makefile.in 2008-11-02 21:22:30.000000000 +0000 -@@ -29,6 +29,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+mandir = @mandir@ -+datadir = @datadir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -38,13 +43,13 @@ - INSTALL_ROOT = - - # Directory in which to install the .a, .so, and .o files: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the programs: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include files: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/util - - # extra includes for compiling - INCLUDES = -@@ -127,7 +132,7 @@ - # the actual library we are building (if this is a subpackage) - LIB = @LIB@ - --TESTPROGS = tparse -+TESTPROGS = tparse tlaunch tlaunch2 - - PROGS = gcat - -@@ -189,12 +194,24 @@ - $(CC) $(LDFLAGS) tparse.o parse.o -o tparse $(LIB) $(LIBS) \ - $(EXTRA_LIBS) - -+tlaunch.o: tlaunch.c -+ -+tlaunch: tlaunch.o launch.o $(LIB) -+ $(CC) $(LDFLAGS) tlaunch.o launch.o -o tlaunch $(LIB) $(LIBS) \ -+ $(EXTRA_LIBS) -+ -+tlaunch2.o: tlaunch2.c -+ -+tlaunch2: tlaunch2.o -+ $(CC) $(LDFLAGS) tlaunch2.o -o tlaunch2 -+ -+ - install-binaries: $(LIB) $(PROGS) - @for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -254,4 +271,11 @@ - configure: configure.in - autoconf configure.in - -+pure: tlaunch.pure -+ -+tlaunch.pure: tlaunch.o launch.o $(LIB) -+ purift $(CC) $(LDFLAGS) tlaunch.o launch.o -o tlaunch \ -+ $(LIB) $(LIBS) $(EXTRA_LIBS) -+ -+ - # DO NOT DELETE THIS LINE -- make depend depends on it. ---- ./gnu/Makefile.in.orig 2008-11-02 20:53:04.000000000 +0000 -+++ ./gnu/Makefile.in 2008-11-02 20:55:46.000000000 +0000 -@@ -21,6 +21,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+mandir = @mandir@ -+datadir = @datadir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -53,13 +58,13 @@ - EXTRA_OBJS = @EXTRA_OBJS@ - - # Directory in which to install the .a, .so, and .o files: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the programs: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include files: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) - - # There are just too many different versions of "install" around; - # better to use the install-sh script that comes with the distribution, -@@ -95,14 +100,14 @@ - - OBJS = sort.o - --PROGS = _sort -+PROGS = _funsort - - TESTPROGS = sorttest - - all: $(PROGS) - --_sort: $(OBJS) -- $(CC) $(LDFLAGS) $(OBJS) -o _sort -+_funsort: $(OBJS) -+ $(CC) $(LDFLAGS) $(OBJS) -o _funsort - - sorttest: sorttest.o - $(CC) $(LDFLAGS) sorttest.o -o sorttest -L.. -lfuntools -@@ -141,10 +146,10 @@ - done; - - --pure: _sort.pure -+pure: _funsort.pure - --_sort.pure: $(FUNLIB) sort.o -- purify $(CC) $(LDFLAGS) sort.o -o _sort.pure \ -+_funsort.pure: $(FUNLIB) sort.o -+ purify $(CC) $(LDFLAGS) sort.o -o _funsort.pure \ - $(FUNLIB) $(LIBS) - - # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch new file mode 100644 index 000000000000..6a089159d4d3 --- /dev/null +++ b/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch @@ -0,0 +1,292 @@ +Origin: http://hea-www.harvard.edu/saord/download/ds9/source/ds9.7.0.tar.gz +Description: Fixes that were applied to the package included in the saods9 + source. Only the patches that affect the Debian distribution are included here. + These patches are not specific for DS9, however. + . + From the changelog: + * Fixed -J funcone, which was not properly outputting all rows. + * Fixed bug in funim.c which broke vcol functionality. + . +--- a/filter/filter.c ++++ b/filter/filter.c +@@ -326,24 +326,31 @@ Filter FilterOpen(header, string, mode) + } + + /* determine which type of process execution we do */ +- filter->ptype = DEFAULT_FILTER_PTYPE; +- *tbuf = '\0'; +- if( (s=(char *)getenv("FILTER_PTYPE")) ){ +- strcpy(tbuf, s); +- } +- if( !*tbuf && (s=xstrdup(filter->mode)) ){ +- keyword(s, "ptype", tbuf, SZ_LINE); +- if( s ) xfree(s); +- } +- if( *tbuf ){ +- if( *tbuf == 'p' ) +- filter->ptype = PTYPE_PROCESS; +- else if( *tbuf == 'c' ) +- filter->ptype = PTYPE_CONTAINED; ++ switch(filter->method){ ++ case METHOD_C: ++ filter->ptype = DEFAULT_FILTER_PTYPE; ++ *tbuf = '\0'; ++ if( (s=(char *)getenv("FILTER_PTYPE")) ){ ++ strcpy(tbuf, s); ++ } ++ if( !*tbuf && (s=xstrdup(filter->mode)) ){ ++ keyword(s, "ptype", tbuf, SZ_LINE); ++ if( s ) xfree(s); ++ } ++ if( *tbuf ){ ++ if( *tbuf == 'p' ) ++ filter->ptype = PTYPE_PROCESS; ++ else if( *tbuf == 'c' ) ++ filter->ptype = PTYPE_CONTAINED; + #ifdef USE_DL +- else if( *tbuf == 'd' ) +- filter->ptype = PTYPE_DYNAMIC; ++ else if( *tbuf == 'd' ) ++ filter->ptype = PTYPE_DYNAMIC; + #endif ++ } ++ break; ++ default: ++ filter->ptype = PTYPE_PROCESS; ++ break; + } + + /* determine region paint mode */ +@@ -470,7 +477,10 @@ Filter FilterOpen(header, string, mode) + if( !FilterProgCompile(filter) ) + goto error; + +- if( filter->debug < 2 ){ ++ if( filter->debug >= 2 ) goto done; ++ ++ switch(filter->method){ ++ case METHOD_C: + switch(filter->ptype){ + case PTYPE_PROCESS: + case PTYPE_CONTAINED: +@@ -478,7 +488,7 @@ Filter FilterOpen(header, string, mode) + case PIPE_WIN32: + #if HAVE_CYGWIN + if( !WinProcessOpen(filter->prog, +- &(filter->ihandle), &(filter->ohandle), &(filter->process)) ) ++ &(filter->ihandle), &(filter->ohandle), &(filter->process)) ) + goto error; + #else + gerror(stderr, "internal error: no WinProcess without Windows"); +@@ -487,20 +497,23 @@ Filter FilterOpen(header, string, mode) + break; + default: + if( !ProcessOpen(filter->prog, +- &(filter->ichan), &(filter->ochan), &(filter->pid)) ) ++ &(filter->ichan), &(filter->ochan), &(filter->pid)) ) + goto error; + break; + } + break; + #ifdef USE_DL + case PTYPE_DYNAMIC: +- if( !(filter->dl=DLOpen(filter->prog)) ) +- goto error; +- break; ++ if( !(filter->dl=DLOpen(filter->prog)) ) ++ goto error; ++ break; + #endif + default: +- goto error; ++ goto error; + } ++ break; ++ default: ++ goto error; + } + + /* return the good news */ +--- a/filter/filt.l ++++ b/filter/filt.l +@@ -871,6 +871,26 @@ compass { BEGIN COMM; } + * + */ + ++ ++#ifdef YY_USE_PROTOS ++static void floatprefix(void) ++#else ++static void floatprefix() ++#endif ++{ ++ if( filt->method == METHOD_C ) ++ _FiltLexCat("(double)"); ++} ++ ++#ifdef YY_USE_PROTOS ++static void floatsuffix(void) ++#else ++static void floatsuffix() ++#endif ++{ ++ return; ++} ++ + #ifdef YY_USE_PROTOS + static void + bin2num(char *d, char *s, int maxlen) +@@ -1414,7 +1434,14 @@ static void _FiltLexRegionStart(docols) + FilterSymbolDefaults(filt, 0); + /* initialize wcs for default image case */ + _FiltLexWcsCols(filt->fhd, filt->xbin, filt->ybin); +- _FiltLexCat(",(double)x,(double)y"); ++ _FiltLexCat(","); ++ floatprefix(); ++ _FiltLexCat("x"); ++ floatsuffix(); ++ _FiltLexCat(","); ++ floatprefix(); ++ _FiltLexCat("y"); ++ floatsuffix(); + break; + case 1: + if( !initbindefs ){ +@@ -1427,16 +1454,24 @@ static void _FiltLexRegionStart(docols) + if( !filt->xbin || !filt->ybin ){ + _filterror("two binning columns are required for regions"); + } +- _FiltLexCat(",(double)"); ++ _FiltLexCat(","); ++ floatprefix(); + _FiltLexCat(filt->xbin); +- _FiltLexCat(",(double)"); ++ floatsuffix(); ++ _FiltLexCat(","); ++ floatprefix(); + _FiltLexCat(filt->ybin); ++ floatsuffix(); + break; + case 2: +- _FiltLexCat(",(double)"); ++ _FiltLexCat(","); ++ floatprefix(); + _FiltLexCat(colnames[0]); +- _FiltLexCat(",(double)"); ++ floatsuffix(); ++ _FiltLexCat(","); ++ floatprefix(); + _FiltLexCat(colnames[1]); ++ floatsuffix(); + break; + } + if( s ) xfree(s); +--- a/filter/filtprog_c.c ++++ b/filter/filtprog_c.c +@@ -198,7 +198,8 @@ static int FilterProgOpen_C(filter) + ccstr = "gcc"; + } + /* make sure we have a compiler */ +- if( !(filter->cc = Find(ccstr, "x", NULL, FilterPath())) && ++ if( !(filter->cc = Access(ccstr, "x")) && ++ !(filter->cc = Find(ccstr, "x", NULL, FilterPath())) && + !(filter->cc = Find("gcc", "x", NULL, FilterPath())) && + !(filter->cc = Find("cc", "x", NULL, FilterPath())) && + !(filter->cc = Find("cc", "x", NULL, ".")) && +@@ -212,6 +213,9 @@ static int FilterProgOpen_C(filter) + #if HAVE_CYGWIN + if( (s=strrchr(filter->cc, '/')) ){ + s++; ++ } ++ else if( (s=strrchr(filter->cc, '\\')) ){ ++ s++; + } else { + s = filter->cc; + } +--- a/funcone.c ++++ b/funcone.c +@@ -1036,6 +1036,9 @@ main(argc, argv) + strncpy(decstr, argv[optind+ioff++], SZ_LINE-1); + strncpy(radstr, argv[optind+ioff++], SZ_LINE-1); + ++ /* dolimfilt does not work with doall */ ++ if( doall ) dolimfilt = 0; ++ + /* process list arguments */ + if( dolist ){ + if( !(list=OpenList(lname, rastr, decstr, radstr)) ){ +@@ -1085,6 +1088,8 @@ main(argc, argv) + if( !(adbuf=xcalloc(nrow+1, sizeof(char))) ){ + gerror(stderr, "can't allocate all (-J|-X) buffer of size %d\n", nrow); + } ++ /* must read one event at a time, or else we can't tell the event num */ ++ maxrow = 1; + } + + /* activate columns specified by user, if necessary */ +@@ -1371,7 +1376,7 @@ done: + while( (ebuf = (Ev)FunTableRowGet(fun, NULL, maxrow, NULL, &got)) ){ + /* if we have a filter, then we don't know the row number til after + we read the event, i.e. now */ +- if( doall & ALL_FILT ) FunInfoGet(fun, FUN_ROW, &irow, 0); ++ FunInfoGet(fun, FUN_ROW, &irow, 0); + /* process all rows */ + for(i=0; i<got; i++){ + /* skip rows that already were written out */ +--- a/funtab.c ++++ b/funtab.c +@@ -1386,7 +1386,7 @@ int FunTableRowPut(fun, rows, nrow, idx, plist) + off_t + FunTableRowSeek(Fun fun, int nrow, char *plist) + #else +-off_t FunTableRowPut(fun, nrow, plist) ++off_t FunTableRowSeek(fun, nrow, plist) + Fun fun; + int nrow; + char *plist; +--- a/funim.c ++++ b/funim.c +@@ -111,9 +111,9 @@ static void *_FunTableBin(fun, buf, plist) + /* optional value column for binning */ + if( fun->vbin >= 0 ){ + dovcol = 1; +- voffset = fun->header->table->col[fun->bin[2]].offset; +- vsize = fun->header->table->col[fun->bin[2]].size; +- vtype = fun->header->table->col[fun->bin[2]].type; ++ voffset = fun->header->table->col[fun->vbin].offset; ++ vsize = fun->header->table->col[fun->vbin].size; ++ vtype = fun->header->table->col[fun->vbin].type; + } + else{ + dovcol = 0; +--- a/calc.l ++++ b/calc.l +@@ -284,7 +284,7 @@ static char *_CalcCB(name, client_data) + { + CalcCols cur; + char tbuf[SZ_LINE]; +- char tbuf2[SZ_LINE]; ++ char tbuf2[SZ_LINE*2]; + char tbuf3[SZ_LINE]; + int i, got, ip; + +--- a/util/gio.c ++++ b/util/gio.c +@@ -2209,7 +2209,7 @@ void gerror(va_alist) va_dcl + vsnprintf(_gerrors, SZ_LINE-1, tbuf, args); + /* if the error flag is positive, we output immediately */ + if( (fd != NULL) && _gerror ){ +- fprintf(fd, _gerrors); ++ fputs(_gerrors, fd); + fflush(fd); + } + /* if the error flag is set high, we exit */ +@@ -2281,7 +2281,7 @@ void gwarning(va_alist) va_dcl + vsnprintf(_gwarnings, SZ_LINE-1, tbuf, args); + /* if the warning flag is positive, we output immediately */ + if( (fd != NULL) && _gwarning ){ +- fprintf(fd, _gwarnings); ++ fputs(_gwarnings, fd); + fflush(fd); + } + } diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch new file mode 100644 index 000000000000..700408057ba9 --- /dev/null +++ b/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch @@ -0,0 +1,121 @@ +Author: Ole Streicher <debian@liska.ath.cx> +Description: Fix the AC_DEFINE lines so that autoheader (and therefore + dh_autoreconf) works +--- a/configure.ac ++++ b/configure.ac +@@ -193,7 +193,7 @@ AC_MSG_RESULT($fun_ok) + + SC_PATH_TCLCONFIG + if test x"${no_tcl}" = x ; then +- AC_DEFINE(HAVE_TCL) ++ AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.]) + fi + + AC_PROG_AWK +@@ -218,7 +218,7 @@ POST="|\& cat" + case $host_os in + *cygwin*|*Cygwin* ) + CFLAGS="$CFLAGS -enable-auto-import" +- AC_DEFINE(HAVE_CYGWIN) ++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) + AC_MSG_RESULT(flagging Cygwin) + PRE="sh -c {" + POST="}" +@@ -226,7 +226,7 @@ case $host_os in + *mingw32*|*Mingw32*) + CFLAGS="$CFLAGS -mconsole" + EXTRA_LIBS="$EXTRA_LIBS -lwsock32" +- AC_DEFINE(HAVE_MINGW32) ++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) + AC_MSG_RESULT(flagging MinGW) + ;; + *osf*|*Osf*) +--- a/filter/configure.ac ++++ b/filter/configure.ac +@@ -150,7 +150,7 @@ PRE="" + POST="|\& cat" + case $host_os in + *cygwin*|*Cygwin* ) +- AC_DEFINE(HAVE_CYGWIN) ++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) + AC_MSG_RESULT(flagging Cygwin) + PRE="sh -c {" + POST="}" +@@ -158,7 +158,7 @@ case $host_os in + *mingw32*|*Mingw32*) + CFLAGS="$CFLAGS -mconsole" + EXTRA_LIBS="$EXTRA_LIBS -lwsock32" +- AC_DEFINE(HAVE_MINGW32) ++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) + AC_MSG_RESULT(flagging MinGW) + ;; + *osf*|*Osf*) +--- a/fitsy/configure.ac ++++ b/fitsy/configure.ac +@@ -121,7 +121,7 @@ PRE="" + POST="|\& cat" + case $host_os in + *cygwin*|*Cygwin* ) +- AC_DEFINE(HAVE_CYGWIN) ++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) + AC_MSG_RESULT(flagging Cygwin) + PRE="sh -c {" + POST="}" +@@ -129,7 +129,7 @@ case $host_os in + *mingw32*|*Mingw32*) + CFLAGS="$CFLAGS -mconsole" + EXTRA_LIBS="$EXTRA_LIBS -lwsock32" +- AC_DEFINE(HAVE_MINGW32) ++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) + AC_MSG_RESULT(flagging MinGW) + ;; + *darwin*|*Darwin*) +--- a/util/configure.ac ++++ b/util/configure.ac +@@ -133,7 +133,7 @@ fi + + SC_PATH_TCLCONFIG + if test x"${no_tcl}" = x ; then +- AC_DEFINE(HAVE_TCL) ++ AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.]) + fi + + AC_MSG_CHECKING(for external zlib) +@@ -146,7 +146,7 @@ PRE="" + POST="|\& cat" + case $host_os in + *cygwin*|*Cygwin* ) +- AC_DEFINE(HAVE_CYGWIN) ++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) + AC_MSG_RESULT(flagging Cygwin) + PRE="sh -c {" + POST="}" +@@ -154,7 +154,7 @@ case $host_os in + *mingw32*|*Mingw32*) + CFLAGS="$CFLAGS -mconsole" + EXTRA_LIBS="$EXTRA_LIBS -lwsock32" +- AC_DEFINE(HAVE_MINGW32) ++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) + AC_MSG_RESULT(flagging MinGW) + ;; + *osf*|*Osf*) +--- a/wcs/configure.ac ++++ b/wcs/configure.ac +@@ -125,7 +125,7 @@ PRE="" + POST="|\& cat" + case $host_os in + *cygwin*|*Cygwin* ) +- AC_DEFINE(HAVE_CYGWIN) ++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) + AC_MSG_RESULT(flagging Cygwin) + PRE="sh -c {" + POST="}" +@@ -133,7 +133,7 @@ case $host_os in + *mingw32*|*Mingw32*) + CFLAGS="$CFLAGS -mconsole" + EXTRA_LIBS="$EXTRA_LIBS -lwsock32" +- AC_DEFINE(HAVE_MINGW32) ++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) + AC_MSG_RESULT(flagging MinGW) + ;; + *osf*|*Osf*) diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch new file mode 100644 index 000000000000..4068ace7f810 --- /dev/null +++ b/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch @@ -0,0 +1,602 @@ +Author: Ole Streicher <debian@liska.ath.cx> +Description: The include files are going to be installed in + /usr/include/funtools. So, they should refer to each other by using "" + instead of <> which also searches in the current directory. +--- a/filter/column.h ++++ b/filter/column.h +@@ -12,14 +12,14 @@ + #define __column_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #ifdef HAVE_STRING_H + #include <string.h> + #endif + +-#include <prsetup.h> ++#include "prsetup.h" + _PRbeg + + void ColumnLoad _PRx((char *ibuf, int size, int n, int convert, void *obuf)); +--- a/filter/dl.h ++++ b/filter/dl.h +@@ -2,14 +2,14 @@ + #define __dl_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #ifdef HAVE_DLFCN_H + #include <dlfcn.h> + #endif + +-#include <prsetup.h> ++#include "prsetup.h" + + _PRbeg + +--- a/filter/filter.h ++++ b/filter/filter.h +@@ -12,7 +12,7 @@ + #define __filter_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + /* avoid use of system -- its not secure */ +@@ -34,28 +34,28 @@ + #include <string.h> + #endif + #include <sys/types.h> +-#include <prsetup.h> +-#include <gio.h> +-#include <file.h> +-#include <find.h> +-#include <macro.h> +-#include <word.h> +-#include <xalloc.h> +-#include <strtod.h> ++#include "prsetup.h" ++#include "gio.h" ++#include "file.h" ++#include "find.h" ++#include "macro.h" ++#include "word.h" ++#include "xalloc.h" ++#include "strtod.h" + #define USE_XFILEIO 1 +-#include <fitsy.h> ++#include "fitsy.h" + #undef USE_XFILEIO +-#include <idx.h> +-#include <wcs.h> +-#include <column.h> +-#include <tl.h> +-#include <dl.h> +-#include <mkrtemp.h> +-#include <zprocess.h> +-#include <winprocess.h> +-#include <parse.h> ++#include "idx.h" ++#include "wcs.h" ++#include "column.h" ++#include "tl.h" ++#include "dl.h" ++#include "mkrtemp.h" ++#include "zprocess.h" ++#include "winprocess.h" ++#include "parse.h" + #ifdef USE_LAUNCH +-#include <xlaunch.h> ++#include "xlaunch.h" + #endif + + #ifndef OBJPATH +--- a/filter/idx.h ++++ b/filter/idx.h +@@ -11,9 +11,9 @@ + #define __idx_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif +-#include <prsetup.h> ++#include "prsetup.h" + #include <stdio.h> + #include <ctype.h> + #ifdef HAVE_UNISTD_H +@@ -22,10 +22,10 @@ + #ifdef HAVE_STRING_H + #include <string.h> + #endif +-#include <fitsy.h> +-#include <gio.h> +-#include <xalloc.h> +-#include <strtod.h> ++#include "fitsy.h" ++#include "gio.h" ++#include "xalloc.h" ++#include "strtod.h" + + /* binary search edge */ + #define IDX_EDGE_LEFT 1 +--- a/filter/tl.h ++++ b/filter/tl.h +@@ -11,7 +11,7 @@ + #ifndef __tl_h + #define __tl_h + +-#include <prsetup.h> ++#include "prsetup.h" + + _PRbeg + +--- a/fitsy/fitsy.h ++++ b/fitsy/fitsy.h +@@ -5,13 +5,13 @@ + #define FITSY_H + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #if USE_XFILEIO +-#include <xfileio.h> ++#include "xfileio.h" + #else +-#include <xfile.h> ++#include "xfile.h" + #endif + + #ifdef __STDC__ +@@ -30,7 +30,7 @@ + + #include <ctype.h> + +-#include <longlong.h> ++#include "longlong.h" + + #ifndef NULL + #define NULL 0 +--- a/funtools.h ++++ b/funtools.h +@@ -27,11 +27,11 @@ + #define FUN_VERSION "1.4.4" + + #ifndef FUNTOOLS_PRIVATE +-#include <prsetup.h> ++#include "prsetup.h" + #define USE_XFILEIO 1 +-#include <fitsy.h> ++#include "fitsy.h" + #undef USE_XFILEIO +-#include <wcs.h> ++#include "wcs.h" + typedef void *Fun; + #endif + +--- a/funtoolsP.h ++++ b/funtoolsP.h +@@ -12,7 +12,7 @@ + #define __funtoolsP_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #include <stdio.h> +@@ -32,20 +32,20 @@ + #include <getopt.h> + #endif + #include <sys/types.h> +-#include <prsetup.h> ++#include "prsetup.h" + #define USE_XFILEIO 1 +-#include <fitsy.h> ++#include "fitsy.h" + #undef USE_XFILEIO +-#include <wcs.h> +-#include <filter.h> +-#include <file.h> +-#include <swap.h> +-#include <word.h> +-#include <parse.h> +-#include <xalloc.h> +-#include <mkrtemp.h> +-#include <NaN.h> +-#include <xlaunch.h> ++#include "wcs.h" ++#include "filter.h" ++#include "file.h" ++#include "swap.h" ++#include "word.h" ++#include "parse.h" ++#include "xalloc.h" ++#include "mkrtemp.h" ++#include "NaN.h" ++#include "xlaunch.h" + + #ifndef MAXINT + #define MAXINT 2147483647 +@@ -338,6 +338,6 @@ int FunView _PRx((Fun fun, char *view, char *vmode, char *fname, int fmax)); + + _PRend + +-#include <funtools.h> ++#include "funtools.h" + + #endif /* __funtoolsP.h */ +--- a/ofuntools.h ++++ b/ofuntools.h +@@ -27,11 +27,11 @@ + #define FUN_VERSION "1.4.4" + + #ifndef FUNTOOLS_PRIVATE +-#include <prsetup.h> ++#include "prsetup.h" + #define USE_XFILEIO 1 +-#include <fitsy.h> ++#include "fitsy.h" + #undef USE_XFILEIO +-#include <wcs.h> ++#include "wcs.h" + typedef void *Fun; + #endif + +--- a/util/NaN.h.in ++++ b/util/NaN.h.in +@@ -20,7 +20,7 @@ + #ifndef __nan_h + #define __nan_h + +-#include <prsetup.h> ++#include "prsetup.h" + + #define BIGENDIAN @BIGENDIAN@ + +--- a/util/file.h ++++ b/util/file.h +@@ -12,7 +12,7 @@ + #define __file_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #include <stdio.h> +@@ -28,9 +28,9 @@ + #endif + #include <sys/types.h> + #include <sys/stat.h> +-#include <prsetup.h> +-#include <macro.h> +-#include <xalloc.h> ++#include "prsetup.h" ++#include "macro.h" ++#include "xalloc.h" + + _PRbeg + int FileExists _PRx((char *filename)); +--- a/util/find.h ++++ b/util/find.h +@@ -12,7 +12,7 @@ + #define __find_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #include <stdio.h> +@@ -25,8 +25,8 @@ + #endif + #include <sys/types.h> + #include <sys/stat.h> +-#include <xalloc.h> +-#include <prsetup.h> ++#include "xalloc.h" ++#include "prsetup.h" + + _PRbeg + +--- a/util/gio.h ++++ b/util/gio.h +@@ -11,10 +11,10 @@ + #ifndef _gio_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + +-#include <xport.h> ++#include "xport.h" + + #include <stdio.h> + #ifdef HAVE_STRING_H +@@ -46,8 +46,8 @@ + #include <sys/stat.h> + #include <sys/time.h> + +-#include <prsetup.h> +-#include <xalloc.h> ++#include "prsetup.h" ++#include "xalloc.h" + + /* use ftello/fseeko (assuming its available) if we are using 64-bit offsets */ + #if _FILE_OFFSET_BITS == 64 +--- a/util/macro.h ++++ b/util/macro.h +@@ -12,7 +12,7 @@ + #define __macro_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #include <stdio.h> +@@ -26,7 +26,7 @@ + #ifdef HAVE_STDLIB_H + #include <stdlib.h> + #endif +-#include <prsetup.h> ++#include "prsetup.h" + + typedef char *(*MacroCall)( + #ifdef ANSI_FUNC +--- a/util/mainlib.h ++++ b/util/mainlib.h +@@ -12,7 +12,7 @@ + #define __mainlib_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + #ifdef HAVE_STRING_H + #include <string.h> +@@ -29,11 +29,11 @@ + #include <stdio.h> + #include <errno.h> + #include <sys/types.h> +-#include <prsetup.h> +-#include <xalloc.h> +-#include <word.h> +-#include <find.h> +-#include <gio.h> ++#include "prsetup.h" ++#include "xalloc.h" ++#include "word.h" ++#include "find.h" ++#include "gio.h" + + /* types of mainlibs we recognize */ + #define MAINLIB_ERROR 0 +--- a/util/mkrtemp.h ++++ b/util/mkrtemp.h +@@ -12,7 +12,7 @@ + #define __mkrtemp_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #include <sys/types.h> +@@ -31,9 +31,9 @@ + #ifdef HAVE_STDLIB_H + #include <stdlib.h> + #endif +-#include <prsetup.h> +-#include <word.h> +-#include <xalloc.h> ++#include "prsetup.h" ++#include "word.h" ++#include "xalloc.h" + + #ifdef __APPLE__ + #define lrand48 random +--- a/util/parse.h ++++ b/util/parse.h +@@ -12,7 +12,7 @@ + #define __parse_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #include <stdio.h> +@@ -33,12 +33,12 @@ + #endif + #include <ctype.h> + +-#include <prsetup.h> +-#include <strtod.h> +-#include <xalloc.h> +-#include <word.h> +-#include <gio.h> +-#include <longlong.h> ++#include "prsetup.h" ++#include "strtod.h" ++#include "xalloc.h" ++#include "word.h" ++#include "gio.h" ++#include "longlong.h" + + #define PARSE_DEBUG 1 + #if PARSE_DEBUG +--- a/util/strtod.h ++++ b/util/strtod.h +@@ -11,7 +11,7 @@ + #ifndef __strtod_h + #define __strtod_h + +-#include <prsetup.h> ++#include "prsetup.h" + + extern int SAOdtype; + +--- a/util/swap.h ++++ b/util/swap.h +@@ -11,7 +11,7 @@ + #ifndef __swap_h + #define __swap_h + +-#include <prsetup.h> ++#include "prsetup.h" + + /* data types */ + #define TY_CHAR 1 +--- a/util/tclmainlib.h ++++ b/util/tclmainlib.h +@@ -1,4 +1,4 @@ +-#include <mainlib.h> ++#include "mainlib.h" + + #if HAVE_TCL + +--- a/util/winprocess.h ++++ b/util/winprocess.h +@@ -13,7 +13,7 @@ + #define __winprocess_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + #include <stdio.h> + #ifdef HAVE_UNISTD_H +@@ -25,7 +25,7 @@ + #ifdef HAVE_STDLIB_H + #include <stdlib.h> + #endif +-#include <prsetup.h> ++#include "prsetup.h" + + #if defined(HAVE_CYGWIN) || defined(WIN32) + +--- a/util/word.h ++++ b/util/word.h +@@ -12,7 +12,7 @@ + #define __word_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + #ifdef HAVE_STRING_H + #include <string.h> +@@ -23,8 +23,8 @@ + #if HAVE_STDLIB_H + #include <stdlib.h> + #endif +-#include <prsetup.h> +-#include <xalloc.h> ++#include "prsetup.h" ++#include "xalloc.h" + + /* defines the types of callback procedure we use */ + typedef char *(*MacroCB)( +--- a/util/xalloc.h ++++ b/util/xalloc.h +@@ -12,7 +12,7 @@ + #define __xalloc_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #include <sys/types.h> +@@ -33,7 +33,7 @@ + #include <setjmp.h> + #endif + +-#include <prsetup.h> ++#include "prsetup.h" + + _PRbeg + +--- a/util/xfileio.h ++++ b/util/xfileio.h +@@ -7,7 +7,7 @@ + #ifndef XFILEIO_H + #define XFILEIO_H + +-#include <gio.h> ++#include "gio.h" + + /* define the basic IO routines */ + typedef GIO File; +--- a/util/xlaunch.h ++++ b/util/xlaunch.h +@@ -12,7 +12,7 @@ + #define __xlaunch_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #include <stdio.h> +@@ -33,10 +33,10 @@ + #if HAVE_POSIX_SPAWN + #include <spawn.h> + #endif +-#include <xport.h> +-#include <word.h> +-#include <xalloc.h> +-#include <prsetup.h> ++#include "xport.h" ++#include "word.h" ++#include "xalloc.h" ++#include "prsetup.h" + + #define LAUNCH_ARGS 1024 + +--- a/util/xport.h ++++ b/util/xport.h +@@ -11,7 +11,7 @@ + #define __xport_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + + #if HAVE_MINGW32 +--- a/util/zprocess.h ++++ b/util/zprocess.h +@@ -14,7 +14,7 @@ + #define __zprocess_h + + #if HAVE_CONFIG_H +-#include <conf.h> ++#include "conf.h" + #endif + #include <stdio.h> + #ifdef HAVE_UNISTD_H +@@ -28,8 +28,8 @@ + #endif + #include <sys/time.h> + #include <signal.h> +-#include <xlaunch.h> +-#include <find.h> ++#include "xlaunch.h" ++#include "find.h" + + _PRbeg + diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch b/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch index 6253752945cd..43306cee355f 100644 --- a/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch +++ b/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch @@ -1,6 +1,6 @@ diff -Nur funtools-1.4.4.orig/filter/Makefile.in funtools-1.4.4/filter/Makefile.in ---- funtools-1.4.4.orig/filter/Makefile.in 2010-01-29 18:19:54.000000000 +0000 -+++ funtools-1.4.4/filter/Makefile.in 2010-01-29 18:20:07.000000000 +0000 +--- funtools-1.4.4.orig/filter/Makefile.in 2013-07-08 14:28:30.169439760 -0700 ++++ funtools-1.4.4/filter/Makefile.in 2013-07-08 14:29:44.026841106 -0700 @@ -29,6 +29,9 @@ prefix = @prefix@ @@ -46,20 +46,20 @@ diff -Nur funtools-1.4.4.orig/filter/Makefile.in funtools-1.4.4/filter/Makefile. chmod 755 $$i; \ else true; \ fi; \ -@@ -230,6 +233,10 @@ - $(RM) swap_c.h - ./inc.sed SWAP_C < swap.c > swap_c.h +@@ -228,6 +231,10 @@ -+swap_c.h: swap.c inc.sed -+ $(RM) swap_c.h + swap_c.h: swap.c inc.sed + $(RM) swap_c.h + ./inc.sed SWAP_C < swap.c > swap_c.h + ++swap_c.h: swap.c inc.sed ++ $(RM) swap_c.h + ./inc.sed SWAP_C < swap.c > swap_c.h + events_c.h: evfilter.c inc.sed - $(RM) events_c.h - ./inc.sed EVENTS_C < evfilter.c > events_c.h diff -Nur funtools-1.4.4.orig/fitsy/Makefile.in funtools-1.4.4/fitsy/Makefile.in ---- funtools-1.4.4.orig/fitsy/Makefile.in 2010-01-29 18:19:54.000000000 +0000 -+++ funtools-1.4.4/fitsy/Makefile.in 2010-01-29 18:20:07.000000000 +0000 +--- funtools-1.4.4.orig/fitsy/Makefile.in 2013-07-08 14:28:30.147439547 -0700 ++++ funtools-1.4.4/fitsy/Makefile.in 2013-07-08 14:29:44.026841106 -0700 @@ -28,6 +28,11 @@ prefix = @prefix@ @@ -99,8 +99,8 @@ diff -Nur funtools-1.4.4.orig/fitsy/Makefile.in funtools-1.4.4/fitsy/Makefile.in else true; \ fi; \ diff -Nur funtools-1.4.4.orig/gnu/Makefile.in funtools-1.4.4/gnu/Makefile.in ---- funtools-1.4.4.orig/gnu/Makefile.in 2010-01-29 18:19:54.000000000 +0000 -+++ funtools-1.4.4/gnu/Makefile.in 2010-01-29 18:20:07.000000000 +0000 +--- funtools-1.4.4.orig/gnu/Makefile.in 2013-07-08 14:28:30.151439619 -0700 ++++ funtools-1.4.4/gnu/Makefile.in 2013-07-08 14:29:44.026841106 -0700 @@ -21,6 +21,11 @@ prefix = @prefix@ @@ -131,9 +131,9 @@ diff -Nur funtools-1.4.4.orig/gnu/Makefile.in funtools-1.4.4/gnu/Makefile.in # There are just too many different versions of "install" around; # better to use the install-sh script that comes with the distribution, diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in ---- funtools-1.4.4.orig/Makefile.in 2010-01-29 18:19:54.000000000 +0000 -+++ funtools-1.4.4/Makefile.in 2010-01-29 18:20:07.000000000 +0000 -@@ -28,6 +28,11 @@ +--- funtools-1.4.4.orig/Makefile.in 2013-07-08 14:28:30.170439766 -0700 ++++ funtools-1.4.4/Makefile.in 2013-07-08 15:49:21.427756907 -0700 +@@ -28,28 +28,33 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -145,8 +145,11 @@ diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in # The following definition can be set to non-null for special systems # like AFS with replication. It allows the pathnames used for installation -@@ -37,19 +42,19 @@ - INSTALL_ROOT = + # to be different than those used for actually reference files at + # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix + # when installing files. +-INSTALL_ROOT = ++INSTALL_ROOT = $(DESTDIR) # Directory in which to install the .a or .so binary for the FUNTOOLS library: -LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib @@ -170,16 +173,36 @@ diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in # util files are in the util subdirectory UTIL_INC = -I./util -@@ -60,7 +65,7 @@ +@@ -60,8 +65,8 @@ # FITSY_LIBS = -L./fitsy -lfitsy # wcs files are in the wcs subdirectory -WCS_INC = -I./wcs -+WCS_INC = -I/usr/include/wcs - # WCS_LIBS = -L./wcs -lwcs +-# WCS_LIBS = -L./wcs -lwcs ++#WCS_INC = -I../wcs ++#WCS_LIBS = -L./wcs -lwcs # filter files are in the filter subdirectory -@@ -225,7 +230,7 @@ + FILTER_INC = -I./filter +@@ -160,7 +165,7 @@ + + # this is used in the link line + # LLIB = $(LIB) +-LLIB = @LLIB@ ++LLIB = -L. -lfuntools + + # libraries containing main as subroutines + MAINLIB = lib$(PACKAGE)MainLib.a +@@ -188,7 +193,7 @@ + + # Subdirectories to run make in for the primary targets. + +-SUBLIBS = util fitsy wcs filter ++SUBLIBS = util fitsy filter + + SUBDIRS = $(SUBLIBS) gnu funtest faq + +@@ -225,10 +230,10 @@ echo $(PROGS) | ./mkfunmainlib > funmainlib.c; shlib: sublib $(LIBOBJS) @@ -187,7 +210,11 @@ diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in + @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ (cd $(PACKAGE)tmp && ar x ../$(LIB)); \ CC='$(CC)' CXX=$(CXX) \ - ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \ +- ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \ ++ ./mklib $(PACKAGE)tmp/*.o $(LIBS) -o $(PACKAGE) ; \ + rm -rf $(PACKAGE)tmp;) + + mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o @@ -237,7 +242,7 @@ $(RANLIB) lib$(PACKAGE)MainLib.a) @@ -234,8 +261,8 @@ diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in else true; \ fi; \ diff -Nur funtools-1.4.4.orig/util/Makefile.in funtools-1.4.4/util/Makefile.in ---- funtools-1.4.4.orig/util/Makefile.in 2010-01-29 18:19:54.000000000 +0000 -+++ funtools-1.4.4/util/Makefile.in 2010-01-29 18:20:07.000000000 +0000 +--- funtools-1.4.4.orig/util/Makefile.in 2013-07-08 14:28:30.160439699 -0700 ++++ funtools-1.4.4/util/Makefile.in 2013-07-08 14:29:44.026841106 -0700 @@ -29,6 +29,11 @@ prefix = @prefix@ diff --git a/sci-astronomy/funtools/funtools-1.4.0.ebuild b/sci-astronomy/funtools/funtools-1.4.0.ebuild deleted file mode 100644 index 7f3c6ee5ccb6..000000000000 --- a/sci-astronomy/funtools/funtools-1.4.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/funtools-1.4.0.ebuild,v 1.6 2012/05/04 06:46:12 jdhore Exp $ - -EAPI=2 -inherit eutils - -DESCRIPTION="FITS library and utlities for astronomical images" -HOMEPAGE="http://www.cfa.harvard.edu/~john/funtools/" -SRC_URI="http://cfa-www.harvard.edu/~john/${PN}/${P}.tar.gz - mirror://gentoo/${P}-ds9-5.4.patch.bz2" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" - -RDEPEND="sys-libs/zlib - >=sci-astronomy/wcstools-3.7.6 - sci-visualization/gnuplot" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${WORKDIR}"/${P}-ds9-5.4.patch - epatch "${FILESDIR}"/${P}-makefiles.patch - sed -i \ - -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \ - mklib || die "sed for ldflags failed" -} - -src_configure() { - econf \ - --enable-shared \ - --enable-dl \ - --enable-mainlib \ - --with-wcslib="$(pkg-config --libs wcstools)" \ - --with-zlib=-lz \ - --with-tcl=-ltcl \ - WCS_INC="$(pkg-config --cflags wcstools)" -} - -src_compile() { - emake || die "emake failed" - emake shtclfun || die "emake tcl functions failed" -} - -src_install () { - emake INSTALL_ROOT="${D}" install || die "emake install failed" - # install missing includes - insinto /usr/include/funtools/fitsy - doins fitsy/*.h || die - if use doc; then - cd doc - insinto /usr/share/doc/${PF} - doins *.pdf || die - insinto /usr/share/doc/${PF}/html - doins *.html *.c || die - fi -} diff --git a/sci-astronomy/funtools/funtools-1.4.4-r1.ebuild b/sci-astronomy/funtools/funtools-1.4.4-r1.ebuild deleted file mode 100644 index 05b98fb43a0b..000000000000 --- a/sci-astronomy/funtools/funtools-1.4.4-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/funtools-1.4.4-r1.ebuild,v 1.2 2012/05/04 06:46:12 jdhore Exp $ - -EAPI=2 -inherit eutils - -DESCRIPTION="FITS library and utlities for astronomical images" -HOMEPAGE="http://www.cfa.harvard.edu/~john/funtools/" -SRC_URI="http://cfa-www.harvard.edu/~john/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" - -RDEPEND="sys-libs/zlib - sci-astronomy/wcstools - sci-visualization/gnuplot" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefiles.patch - sed -i \ - -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \ - mklib || die "sed for ldflags failed" -} - -src_configure() { - econf \ - --enable-shared \ - --enable-dl \ - --enable-mainlib \ - --with-wcslib="$(pkg-config --libs wcstools)" \ - --with-zlib=-lz \ - --with-tcl=-ltcl \ - WCS_INC="$(pkg-config --cflags wcstools)" -} - -src_compile() { - emake || die "emake failed" - emake shtclfun || die "emake tcl functions failed" -} - -src_install () { - emake INSTALL_ROOT="${D}" install || die "emake install failed" - # install missing includes - insinto /usr/include/funtools/fitsy - doins fitsy/*.h || die - if use doc; then - cd doc - insinto /usr/share/doc/${PF} - doins *.pdf || die - insinto /usr/share/doc/${PF}/html - doins *.html *.c || die - fi -} diff --git a/sci-astronomy/funtools/funtools-1.4.4-r2.ebuild b/sci-astronomy/funtools/funtools-1.4.4-r2.ebuild new file mode 100644 index 000000000000..e3e1f9e61023 --- /dev/null +++ b/sci-astronomy/funtools/funtools-1.4.4-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/funtools-1.4.4-r2.ebuild,v 1.1 2013/07/08 23:23:33 bicatali Exp $ + +EAPI=5 +inherit eutils toolchain-funcs multilib autotools + +DESCRIPTION="FITS library and utlities for astronomical images" +HOMEPAGE="http://www.cfa.harvard.edu/~john/funtools/" +SRC_URI="http://cfa-www.harvard.edu/~john/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc static-libs" + +RDEPEND=" + sys-libs/zlib + sci-astronomy/wcstools + sci-visualization/gnuplot" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-ds9-fixes.patch \ + "${FILESDIR}"/${P}-fix-autoheader.patch \ + "${FILESDIR}"/${P}-fix-includes.patch \ + "${FILESDIR}"/${P}-makefiles.patch + sed -i \ + -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \ + mklib || die "sed for ldflags failed" + eautoreconf +} + +src_configure() { + econf \ + --enable-shared \ + --enable-dl \ + --enable-mainlib \ + --with-wcslib="$($(tc-getPKG_CONFIG) --libs wcstools)" \ + --with-zlib="$($(tc-getPKG_CONFIG) --libs zlib)" \ + --with-tcl=-ltcl +} + +src_compile() { + emake WCS_INC="$($(tc-getPKG_CONFIG) --cflags wcstools)" + emake shtclfun +} + +src_install () { + default + # install missing includes + insinto /usr/include/funtools/fitsy + doins fitsy/*.h + use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a + cd doc + use doc && dodoc *.pdf && dohtml *html *c +} |