Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21527
Modified Files:
oleo.info oleo.patch
Log Message:
gcc4 fixes. Major dependency and other packaging overhaul
Index: oleo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/oleo.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- oleo.info 28 Mar 2006 23:00:27 -0000 1.2
+++ oleo.info 29 Mar 2006 05:08:55 -0000 1.3
@@ -1,19 +1,23 @@
Package: oleo
Version: 1.99.16
-Revision: 1016
+Revision: 1017
Maintainer: None <[email protected]>
GCC: 4.0
-Source: gnu
+Source: mirror:gnu:%n/%n-%v.tar.gz
Source-MD5: d59801055b8ba6c6980ed1247a603f5f
-Depends: xbae-shlibs, xmhtml-shlibs, xlt-shlibs (>= 9.2.9-3), gsl-shlibs,
plotutils-shlibs (>= 2.4.1-1007), ncurses (>= 5.4-20041023-1006),
libncurses5-shlibs (>= 5.4-20041023-1006)
-BuildDepends: xbae, xmhtml, xlt (>= 9.2.9-3), lesstif, gsl, plotutils-dev (>=
2.4.1-1007), cups-dev, libncurses5 (>= 5.4-20041023-1006)
+Depends: xbae-shlibs, xmhtml-shlibs, xlt-shlibs (>= 9.2.9-3), lesstif-shlibs,
gsl-shlibs, plotutils-shlibs (>= 2.4.1-1007), ncurses (>= 5.4-20041023-1006),
libncurses5-shlibs (>= 5.4-20041023-1006), x11, libgettext3-shlibs,
mysql14-shlibs, libpng3-shlibs, libjpeg-shlibs
+BuildDepends: xbae, xmhtml, xlt (>= 9.2.9-3), lesstif, gsl, plotutils-dev (>=
2.4.1-1007), cups-dev, libncurses5 (>= 5.4-20041023-1006), x11-dev,
libgettext3-dev, gettext-tools, mysql14-dev, libpng3, libjpeg
PatchScript: sed 's|@prefix@|%p|g' <%a/%n.patch | patch -p1
UpdatePoMakefile: true
SetCPPFLAGS: -no-cpp-precomp -Wno-long-double
ConfigureParams: --infodir=%i/share/info --with-motif
-DocFiles: <<
-AUTHORS ChangeLog COPYING FAQ NEWS README README-alpha THANKS TODO
+CompileScript: <<
+ ./configure %c
+ mv intl/po2tbl.sed po
+ mv intl intl_UNUSED
+ make
<<
+DocFiles: AUTHORS ChangeLog COPYING FAQ NEWS README README-alpha THANKS TODO
InfoDocs: oleo.info
Description: The GNU spreadsheet
DescDetail: <<
@@ -36,6 +40,9 @@
Patch so the correct 'doc' directory is selected.
Originally packaged by Matt Stephenson.
+
+ dmacks: use libSystem for getopt instead of lib/; use libgettext3
+ packages instead of intl/ and patch po/ for modern xgettext.
<<
License: GPL
Homepage: http://www.gnu.org/software/oleo/oleo.html
Index: oleo.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/oleo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- oleo.patch 16 Feb 2006 18:51:08 -0000 1.1
+++ oleo.patch 29 Mar 2006 05:08:55 -0000 1.2
@@ -1,6 +1,15 @@
---- oleo-1.99.16/Makefile.in Wed Jan 23 15:52:55 2002
-+++ oleo-1.99.16-patched/Makefile.in Wed Jan 23 15:54:04 2002
-@@ -131,7 +131,7 @@
+diff -Nurd -x'*~' oleo-1.99.16.orig/Makefile.in oleo-1.99.16/Makefile.in
+--- oleo-1.99.16.orig/Makefile.in 2001-03-10 09:32:45.000000000 -0500
++++ oleo-1.99.16/Makefile.in 2006-03-28 22:39:29.000000000 -0500
+@@ -124,14 +124,14 @@
+
+ D = `date +%G%m%d.%H%M%S`
+
+-SUBDIRS = doc lib intl src m4 po Xresources examples afm
++SUBDIRS = doc lib src m4 po Xresources examples afm
+
+ # Remove this file here (it is created via configure), not from within intl.
+ DISTCLEANFILES = intl/libintl.h
EXTRA_DIST = oleobug.in FAQ oleo.spec.in oleo.spec
@@ -9,21 +18,9 @@
doc_DATA = AUTHORS FAQ
# remove all the symlinks that come from automake
-
---- oleo-1.99.16/src/cmd.c Wed Feb 14 20:54:50 2001
-+++ oleo-1.99.16-patched/src/cmd.c Sun Mar 17 23:34:47 2002
-@@ -31,7 +31,7 @@
- #include <stdarg.h>
- #include "sysdef.h"
- #include <termios.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- #ifdef HAVE_MOTIF
- #include "io-motif.h"
-
---- oleo-1.99.16/configure 2001-03-10 14:32:48.000000000 +1100
-+++ oleo-1.99.16-patched/configure 2002-08-15 01:26:49.000000000 +1000
+diff -Nurd -x'*~' oleo-1.99.16.orig/configure oleo-1.99.16/configure
+--- oleo-1.99.16.orig/configure 2001-03-10 09:32:48.000000000 -0500
++++ oleo-1.99.16/configure 2006-03-28 21:22:10.000000000 -0500
@@ -5233,7 +5233,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -42,22 +39,123 @@
cat >> confdefs.h <<\EOF
#define HAVE_GSL 1
EOF
-
-diff -ru oleo-1.99.16/src/global.h oleo-1.99.16-patched/src/global.h
---- oleo-1.99.16/src/global.h Wed Feb 14 20:54:50 2001
-+++ oleo-1.99.16-patched/src/global.h Wed Sep 4 21:19:03 2002
-@@ -208,7 +208,7 @@
- extern char nname[];
+diff -Nurd -x'*~' oleo-1.99.16.orig/lib/Makefile.in
oleo-1.99.16/lib/Makefile.in
+--- oleo-1.99.16.orig/lib/Makefile.in 2001-03-10 09:32:46.000000000 -0500
++++ oleo-1.99.16/lib/Makefile.in 2006-03-28 22:40:32.000000000 -0500
+@@ -124,12 +124,12 @@
+ # configure.in can add mktime.c and obstack.c through the LIBOBJS
+ # mechanism
+ #
+-liboleo_a_SOURCES = getdate.y getopt.c getopt1.c random.c
++liboleo_a_SOURCES = getdate.y random.c
+ liboleo_a_LIBADD = @LIBOBJS@
- extern VOIDSTAR parse_hash;
--extern double __plinf, __neinf, __nan;
-+extern double __plinf, __neinf, int__nan;
+ noinst_HEADERS = getopt.h get_date.h obstack.h
- /* These have two uses. During parsing, these contain the
- * base address of all relative references. During evaluation,
-
---- oleo-1.99.16/src/eval.c Tue Feb 13 23:38:05 2001
-+++ oleo-1.99.16-patched/src/eval.c Thu Sep 5 09:22:04 2002
+-INCLUDES = -I.. -I$(srcdir) -I../intl
++INCLUDES = -I.. -I$(srcdir)
+
+ CLEANFILES = getdate.c
+ MAINTAINERCLEANFILES = Makefile.in
+@@ -148,7 +148,7 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ liboleo_a_DEPENDENCIES = @LIBOBJS@
+-liboleo_a_OBJECTS = getdate.o getopt.o getopt1.o random.o
++liboleo_a_OBJECTS = getdate.o random.o
+ AR = ar
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
+diff -Nurd -x'*~' oleo-1.99.16.orig/po/Makefile.in.in
oleo-1.99.16/po/Makefile.in.in
+--- oleo-1.99.16.orig/po/Makefile.in.in 1998-08-27 17:15:29.000000000
-0400
++++ oleo-1.99.16/po/Makefile.in.in 2006-03-28 23:57:23.000000000 -0500
+@@ -39,7 +39,7 @@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+
+-INCLUDES = -I.. -I$(top_srcdir)/intl
++INCLUDES = -I..
+
+ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+@@ -73,7 +73,7 @@
+ && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+ .po.cat:
+- sed -f ../intl/po2msg.sed < $< > $*.msg \
++ sed -f po2msg.sed < $< > $*.msg \
+ && rm -f $@ && $(GENCAT) $@ $*.msg
+
+
+@@ -85,7 +85,7 @@
+ $(srcdir)/$(PACKAGE).pot: $(POTFILES)
+ $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
+ --add-comments --keyword=_ --keyword=N_ \
+- --files-from=$(srcdir)/POTFILES.in \
++ --files-from=$(srcdir)/POTFILES.in --from-code=UTF-8 \
+ && test ! -f $(PACKAGE).po \
+ || ( rm -f $(srcdir)/$(PACKAGE).pot \
+ && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+@@ -93,7 +93,7 @@
+ $(srcdir)/cat-id-tbl.c: $(srcdir)/stamp-cat-id; @:
+ $(srcdir)/stamp-cat-id: $(srcdir)/$(PACKAGE).pot
+ rm -f cat-id-tbl.tmp
+- sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
++ sed -f po2tbl.sed $(srcdir)/$(PACKAGE).pot \
+ | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
+ if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
+ rm cat-id-tbl.tmp; \
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/Makefile.in
oleo-1.99.16/src/Makefile.in
+--- oleo-1.99.16.orig/src/Makefile.in 2001-03-10 09:32:46.000000000 -0500
++++ oleo-1.99.16/src/Makefile.in 2006-03-28 22:41:16.000000000 -0500
+@@ -161,8 +161,8 @@
+ @[EMAIL PROTECTED] = ${X_CFLAGS}
+ @[EMAIL PROTECTED] = ${X_CFLAGS}
+
+-oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a
../intl/libintl.a ${X_LIBS}
+-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl ${MYINC}
++oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a -lintl
${X_LIBS}
++INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib ${MYINC}
+ CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" ${MYCFL}
-DBUILD_PREFIX='"'${BUILD_PREFIX}'"'
+
+
+@@ -254,8 +254,6 @@
+ @UseMotif_FALSE@@[EMAIL PROTECTED] pcl$U.o epson$U.o \
+ @UseMotif_FALSE@@[EMAIL PROTECTED] afm$U.o mdi$U.o gsl$U.o \
+ @UseMotif_FALSE@@[EMAIL PROTECTED] legend$U.o
[EMAIL PROTECTED]@oleo_DEPENDENCIES = ../lib/liboleo.a ../intl/libintl.a
[EMAIL PROTECTED]@oleo_DEPENDENCIES = ../lib/liboleo.a ../intl/libintl.a
+ oleo_LDFLAGS =
+ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/basic.h oleo-1.99.16/src/basic.h
+--- oleo-1.99.16.orig/src/basic.h 2000-08-10 17:02:49.000000000 -0400
++++ oleo-1.99.16/src/basic.h 2006-03-28 21:24:55.000000000 -0500
+@@ -36,9 +36,6 @@
+
+ extern const int colmagic[9];
+ extern const int rowmagic[9];
+-extern char * motion_name[9];
+-extern enum motion_magic complementary_motion[9];
+-extern enum motion_magic opposite_motion[9];
+
+ extern int run_load_hooks;
+
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/cmd.c oleo-1.99.16/src/cmd.c
+--- oleo-1.99.16.orig/src/cmd.c 2001-02-14 15:54:50.000000000 -0500
++++ oleo-1.99.16/src/cmd.c 2006-03-28 21:22:10.000000000 -0500
+@@ -31,7 +31,7 @@
+ #include <stdarg.h>
+ #include "sysdef.h"
+ #include <termios.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #ifdef HAVE_MOTIF
+ #include "io-motif.h"
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/eval.c oleo-1.99.16/src/eval.c
+--- oleo-1.99.16.orig/src/eval.c 2001-02-13 18:38:05.000000000 -0500
++++ oleo-1.99.16/src/eval.c 2006-03-28 21:22:10.000000000 -0500
@@ -565,7 +565,7 @@
case CONST_NINF:
case CONST_NAN:
@@ -67,9 +165,103 @@
break;
case VAR:
-
---- oleo-1.99.16/src/ref.c Tue Feb 13 23:38:06 2001
-+++ oleo-1.99.16-patched/src/ref.c Thu Sep 5 10:10:15 2002
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/global.h oleo-1.99.16/src/global.h
+--- oleo-1.99.16.orig/src/global.h 2001-02-14 15:54:50.000000000 -0500
++++ oleo-1.99.16/src/global.h 2006-03-28 21:22:10.000000000 -0500
+@@ -208,7 +208,7 @@
+ extern char nname[];
+
+ extern VOIDSTAR parse_hash;
+-extern double __plinf, __neinf, __nan;
++extern double __plinf, __neinf, int__nan;
+
+ /* These have two uses. During parsing, these contain the
+ * base address of all relative references. During evaluation,
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/io-motif.c oleo-1.99.16/src/io-motif.c
+--- oleo-1.99.16.orig/src/io-motif.c 2001-03-09 06:33:29.000000000 -0500
++++ oleo-1.99.16/src/io-motif.c 2006-03-28 21:42:23.000000000 -0500
+@@ -1499,6 +1499,7 @@
+ #if 0
+ fprintf(stderr, "Huh ? TickTypeCB(axis %d type %d) -> sensitive
\n", axis, val);
+ #endif
++ ;
+ }
+ #if 0
+ fprintf(stderr, "SP_TICK_DEFAULT %d\n", SP_TICK_DEFAULT);
+@@ -3296,7 +3297,7 @@
+ #define HELP_FILE_LENGTH 200000
+
+ #ifndef HTMLDIR
+-#define HTMLDIR "/usr/local/share/oleo"
++#define HTMLDIR "@prefix@/share/oleo"
+ #endif
+
+ static void
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/io-term.h oleo-1.99.16/src/io-term.h
+--- oleo-1.99.16.orig/src/io-term.h 2001-02-10 03:27:04.000000000 -0500
++++ oleo-1.99.16/src/io-term.h 2006-03-28 21:22:57.000000000 -0500
+@@ -22,6 +22,7 @@
+
+ #include <setjmp.h>
+ #include "global.h"
++#include "funcs.h"
+
+ extern int using_x;
+ extern int using_curses;
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/io-utils.c oleo-1.99.16/src/io-utils.c
+--- oleo-1.99.16.orig/src/io-utils.c 2001-02-13 18:38:06.000000000 -0500
++++ oleo-1.99.16/src/io-utils.c 2006-03-28 21:22:10.000000000 -0500
+@@ -71,7 +71,7 @@
+
+ double __plinf;
+ double __neinf;
+-double __nan;
++double int__nan;
+
+ char nname[] = "#NOT_A_NUMBER";
+ char iname[] = "#INFINITY";
+@@ -125,7 +125,7 @@
+ __neinf = divide (-1., 0.);
+ (void) signal (SIGFPE, ignore_sig);
+ #endif
+- __nan = __plinf + __neinf;
++ int__nan = __plinf + __neinf;
+ }
+
+
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/plotter.c oleo-1.99.16/src/plotter.c
+--- oleo-1.99.16.orig/src/plotter.c 2000-11-22 14:33:01.000000000 -0500
++++ oleo-1.99.16/src/plotter.c 2006-03-28 22:14:13.000000000 -0500
+@@ -2640,7 +2640,7 @@
+ sp_pie_plot_point(mg, point);
+ break;
+ default:
+- /* ?? */
++ ;
+ }
+ }
+
+@@ -2771,7 +2771,7 @@
+ sp_pie_begin_graph(mg, scale, trans_x, trans_y);
+ break;
+ default:
+- /* ??? */
++ ;
+ }
+
+ sp_first_dataset(mg);
+@@ -2791,7 +2791,7 @@
+ sp_pie_end_graph(mg);
+ break;
+ default:
+- /* ??? */
++ ;
+ }
+ }
+
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/ref.c oleo-1.99.16/src/ref.c
+--- oleo-1.99.16.orig/src/ref.c 2001-02-13 18:38:06.000000000 -0500
++++ oleo-1.99.16/src/ref.c 2006-03-28 21:22:10.000000000 -0500
@@ -263,7 +263,7 @@
read_new_value (CELLREF row, CELLREF col, char *form, char *val)
{
@@ -88,9 +280,9 @@
}
else
{
-
---- oleo-1.99.16/src/utils.c Tue Feb 13 23:38:06 2001
-+++ oleo-1.99.16-patched/src/utils.c Thu Sep 5 10:36:45 2002
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/utils.c oleo-1.99.16/src/utils.c
+--- oleo-1.99.16.orig/src/utils.c 2001-02-13 18:38:06.000000000 -0500
++++ oleo-1.99.16/src/utils.c 2006-03-28 21:22:10.000000000 -0500
@@ -66,7 +66,7 @@
#define _IOSTRG 0
#endif
@@ -100,36 +292,15 @@
struct id
{
-
---- oleo-1.99.16/src/io-utils.c Tue Feb 13 23:38:06 2001
-+++ oleo-1.99.16-patched/src/io-utils.c Thu Sep 26 14:31:19 2002
-@@ -71,7 +71,7 @@
-
- double __plinf;
- double __neinf;
--double __nan;
-+double int__nan;
-
- char nname[] = "#NOT_A_NUMBER";
- char iname[] = "#INFINITY";
-@@ -125,7 +125,7 @@
- __neinf = divide (-1., 0.);
- (void) signal (SIGFPE, ignore_sig);
- #endif
-- __nan = __plinf + __neinf;
-+ int__nan = __plinf + __neinf;
- }
-
-
---- oleo-1.99.16/src/io-motif.c Fri Mar 9 11:33:29 2001
-+++ oleo-1.99.16-patched/src/io-motif.c Thu Feb 7 01:18:02 2002
-@@ -3296,7 +3296,7 @@
- #define HELP_FILE_LENGTH 200000
-
- #ifndef HTMLDIR
--#define HTMLDIR "/usr/local/share/oleo"
-+#define HTMLDIR "@prefix@/share/oleo"
- #endif
-
- static void
-
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/xrdb.c oleo-1.99.16/src/xrdb.c
+--- oleo-1.99.16.orig/src/xrdb.c 2000-08-10 17:02:51.000000000 -0400
++++ oleo-1.99.16/src/xrdb.c 2006-03-28 21:40:47.000000000 -0500
+@@ -57,7 +57,7 @@
+ /* This should be included before the X include files; otherwise, we get
+ warnings about redefining NULL under BSD 4.3. */
+ #include <sys/param.h>
+-#define NeedFunctionPrototypes 0
++//#define NeedFunctionPrototypes 0 // need it defined to get _Xconst for
Xlib.h
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
