Date: Mon, 28 Jul 2014 23:33:48 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363276 - in head/math: abs/files apc apc/files asir2000/files calctool/files eispack eispack/files eval/files geg geg/files ngraph/files oleo/files pari/files physcalc/files topaz/file... Message-ID: <201407282333.s6SNXm69083392@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 23:33:47 2014 New Revision: 363276 URL: http://svnweb.freebsd.org/changeset/ports/363276 QAT: https://qat.redports.org/buildarchive/r363276/ Log: Rename math/ patch-xy patches to reflect the files they modify. Added: head/math/abs/files/patch-Makefile - copied unchanged from r363257, head/math/abs/files/patch-aa head/math/abs/files/patch-X11_button.h - copied unchanged from r363257, head/math/abs/files/patch-ad head/math/abs/files/patch-X11_popnindex.h - copied unchanged from r363257, head/math/abs/files/patch-ae head/math/apc/files/patch-Makefile - copied unchanged from r363257, head/math/apc/files/patch-aa head/math/asir2000/files/patch-Makefile.am - copied unchanged from r363257, head/math/asir2000/files/patch-ba head/math/asir2000/files/patch-asm_Makefile.am - copied unchanged from r363257, head/math/asir2000/files/patch-bb head/math/asir2000/files/patch-builtin_Makefile.am - copied unchanged from r363257, head/math/asir2000/files/patch-bc head/math/asir2000/files/patch-engine_Makefile.am - copied unchanged from r363257, head/math/asir2000/files/patch-bd head/math/asir2000/files/patch-fft_Makefile.am - copied unchanged from r363257, head/math/asir2000/files/patch-be head/math/asir2000/files/patch-include_version.h - copied unchanged from r363257, head/math/asir2000/files/patch-ac head/math/asir2000/files/patch-io_Makefile.am - copied unchanged from r363257, head/math/asir2000/files/patch-bf head/math/asir2000/files/patch-lib_Makefile.am - copied unchanged from r363257, head/math/asir2000/files/patch-bk head/math/asir2000/files/patch-plot_Makefile.am - copied unchanged from r363257, head/math/asir2000/files/patch-bh head/math/calctool/files/patch-Makefile - copied unchanged from r363257, head/math/calctool/files/patch-ab head/math/eispack/files/patch-radix_fix - copied unchanged from r363257, head/math/eispack/files/patch-aa head/math/eval/files/patch-Makefile - copied unchanged from r363257, head/math/eval/files/patch-aa head/math/eval/files/patch-eval.c - copied unchanged from r363257, head/math/eval/files/patch-ac head/math/eval/files/patch-eval.h - copied unchanged from r363257, head/math/eval/files/patch-ab head/math/eval/files/patch-funcs.c - copied unchanged from r363257, head/math/eval/files/patch-ad head/math/geg/files/patch-configure.in - copied unchanged from r363257, head/math/geg/files/patch-ac head/math/geg/files/patch-src_main.c - copied unchanged from r363257, head/math/geg/files/patch-ab head/math/ngraph/files/patch-Makefile - copied unchanged from r363257, head/math/ngraph/files/patch-aa head/math/oleo/files/patch-Makefile.in - copied unchanged from r363257, head/math/oleo/files/patch-ad head/math/oleo/files/patch-aclocal.m4 - copied unchanged from r363257, head/math/oleo/files/patch-ag head/math/oleo/files/patch-configure.in - copied unchanged from r363257, head/math/oleo/files/patch-ah head/math/oleo/files/patch-doc_Makefile.in - copied unchanged from r363257, head/math/oleo/files/patch-ai head/math/oleo/files/patch-doc_oleo.texi - copied unchanged from r363257, head/math/oleo/files/patch-af head/math/oleo/files/patch-src_Makefile.in - copied unchanged from r363257, head/math/oleo/files/patch-ak head/math/oleo/files/patch-src_eval.c - copied unchanged from r363257, head/math/oleo/files/patch-src::eval.c head/math/oleo/files/patch-src_global.h - copied unchanged from r363257, head/math/oleo/files/patch-src::global.h head/math/oleo/files/patch-src_io-motif.c - copied unchanged from r363257, head/math/oleo/files/patch-al head/math/oleo/files/patch-src_io-utils.c - copied unchanged from r363257, head/math/oleo/files/patch-src::io-utils.c head/math/oleo/files/patch-src_io-x11.c - copied unchanged from r363257, head/math/oleo/files/patch-src::io-x11.c head/math/oleo/files/patch-src_plotter.c - copied unchanged from r363257, head/math/oleo/files/patch-src::plotter.c head/math/oleo/files/patch-src_posixtm.y - copied unchanged from r363257, head/math/oleo/files/patch-src::posixtm.y head/math/oleo/files/patch-src_ref.c - copied unchanged from r363257, head/math/oleo/files/patch-src::ref.c head/math/oleo/files/patch-src_sysdef.h - copied unchanged from r363257, head/math/oleo/files/patch-src::sysdef.h head/math/oleo/files/patch-src_utils.c - copied unchanged from r363257, head/math/oleo/files/patch-src::utils.c head/math/oleo/files/patch-src_xrdb.c - copied unchanged from r363257, head/math/oleo/files/patch-src::xrdb.c head/math/pari/files/patch-config_Makefile.SH - copied unchanged from r363257, head/math/pari/files/patch-af head/math/physcalc/files/patch-physcalc.h - copied unchanged from r363257, head/math/physcalc/files/patch-aa head/math/physcalc/files/patch-physconv.c - copied unchanged from r363257, head/math/physcalc/files/patch-ab head/math/physcalc/files/patch-physmain.c - copied unchanged from r363257, head/math/physcalc/files/patch-ac head/math/topaz/files/patch-Makefile.freebsd - copied unchanged from r363257, head/math/topaz/files/patch-ab head/math/topaz/files/patch-topaz_Makefile.freebsd - copied unchanged from r363257, head/math/topaz/files/patch-aa head/math/topaz/files/patch-topaz_topaz.cc - copied unchanged from r363257, head/math/topaz/files/patch-topaz::topaz.cc head/math/topaz/files/patch-topaz_tpv2ps.cc - copied unchanged from r363257, head/math/topaz/files/patch-topaz::tpv2ps.cc head/math/xgraph/files/patch-hpgl.c - copied unchanged from r363257, head/math/xgraph/files/patch-ad head/math/xgraph/files/patch-ps.c - copied unchanged from r363257, head/math/xgraph/files/patch-ag head/math/xgraph/files/patch-xgraph.c - copied unchanged from r363257, head/math/xgraph/files/patch-ab head/math/xgraph/files/patch-xgraph.h - copied unchanged from r363257, head/math/xgraph/files/patch-ae head/math/xgraph/files/patch-xtb.c - copied unchanged from r363257, head/math/xgraph/files/patch-ac head/math/xldlas/files/patch-Makefile - copied unchanged from r363257, head/math/xldlas/files/patch-aa head/math/xldlas/files/patch-setstate.c - copied unchanged from r363257, head/math/xldlas/files/patch-ab head/math/xldlas/files/patch-xldlas.h - copied unchanged from r363257, head/math/xldlas/files/patch-ac head/math/xspread/files/patch-Makefile.in - copied unchanged from r363257, head/math/xspread/files/patch-ab head/math/xspread/files/patch-config_h.in - copied unchanged from r363257, head/math/xspread/files/patch-ac head/math/xspread/files/patch-interp.c - copied unchanged from r363257, head/math/xspread/files/patch-ad Deleted: head/math/abs/files/patch-aa head/math/abs/files/patch-ad head/math/abs/files/patch-ae head/math/apc/files/patch-aa head/math/asir2000/files/patch-ac head/math/asir2000/files/patch-ba head/math/asir2000/files/patch-bb head/math/asir2000/files/patch-bc head/math/asir2000/files/patch-bd head/math/asir2000/files/patch-be head/math/asir2000/files/patch-bf head/math/asir2000/files/patch-bh head/math/asir2000/files/patch-bk head/math/calctool/files/patch-ab head/math/eispack/files/patch-aa head/math/eval/files/patch-aa head/math/eval/files/patch-ab head/math/eval/files/patch-ac head/math/eval/files/patch-ad head/math/geg/files/patch-ab head/math/geg/files/patch-ac head/math/ngraph/files/patch-aa head/math/oleo/files/patch-ad head/math/oleo/files/patch-af head/math/oleo/files/patch-ag head/math/oleo/files/patch-ah head/math/oleo/files/patch-ai head/math/oleo/files/patch-ak head/math/oleo/files/patch-al head/math/oleo/files/patch-src::eval.c head/math/oleo/files/patch-src::global.h head/math/oleo/files/patch-src::io-utils.c head/math/oleo/files/patch-src::io-x11.c head/math/oleo/files/patch-src::plotter.c head/math/oleo/files/patch-src::posixtm.y head/math/oleo/files/patch-src::ref.c head/math/oleo/files/patch-src::sysdef.h head/math/oleo/files/patch-src::utils.c head/math/oleo/files/patch-src::xrdb.c head/math/pari/files/patch-af head/math/physcalc/files/patch-aa head/math/physcalc/files/patch-ab head/math/physcalc/files/patch-ac head/math/topaz/files/patch-aa head/math/topaz/files/patch-ab head/math/topaz/files/patch-topaz::topaz.cc head/math/topaz/files/patch-topaz::tpv2ps.cc head/math/xgraph/files/patch-ab head/math/xgraph/files/patch-ac head/math/xgraph/files/patch-ad head/math/xgraph/files/patch-ae head/math/xgraph/files/patch-ag head/math/xldlas/files/patch-aa head/math/xldlas/files/patch-ab head/math/xldlas/files/patch-ac head/math/xspread/files/patch-ab head/math/xspread/files/patch-ac head/math/xspread/files/patch-ad Modified: head/math/apc/Makefile head/math/eispack/Makefile head/math/geg/Makefile head/math/xgraph/Makefile Copied: head/math/abs/files/patch-Makefile (from r363257, head/math/abs/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/abs/files/patch-Makefile Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/abs/files/patch-aa) @@ -0,0 +1,55 @@ +--- Makefile.orig Sun Nov 11 20:24:35 2001 ++++ Makefile Sun Feb 9 17:46:02 2003 +@@ -1,29 +1,28 @@ + CURRENT_DIR = . + + +-SUBDIRS = Xpm ABV X11 Kernel Plot Database Fig Interface X11/xedit ++SUBDIRS = ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF + +-SUBDIRS2 = ABV X11 Kernel Plot Database Fig Interface +-MAKE = make ++SUBDIRS2 = ABV X11 Kernel Plot Database Fig Interface ++MAKE ?= make + + #for linux and aix LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext + #for silicon: LIBS = -lXaw -lX11 -lm -lXt -lXmu -lXext + #for hp LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext + #for netBSD LIBS = -L /usr/lib -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext +-LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext ++LIBS = -L${LOCALBASE}/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm + + #for hp DEFINE = -D_HPUX_SOURCE +-#for AIX DEFINE = -D_AIX_SOURCE + DEFINE = + +-CFLAGS = '-O2 -Wall ' ++CFLAGS ?= -O2 + + #for hp IncludeDir = /usr/contrib/X11R6/include + #for net-BSD IncludeDir = /usr/X11R6/include +-IncludeDir = . ++IncludeDir = ${LOCALBASE}/include + + #for hp Ccompiler = c89 +-Ccompiler = cc ++Ccompiler = ${CC} + + all:: + rm -f ./abs;\ +@@ -32,12 +31,12 @@ + if [ -d $$i ] ; \ + then \ + (cd $$i ; echo "making" all "in $(CURRENT_DIR)/$$i..."; \ +- $(MAKE) TOPCFLAGS=$(CFLAGS) IncludeDir=$(IncludeDir) Ccompiler=$(Ccompiler) DEFINE=$(DEFINE) ); \ ++ $(MAKE) TOPCFLAGS="$(CFLAGS)" IncludeDir="$(IncludeDir)" Ccompiler="$(Ccompiler)" DEFINE="$(DEFINE)" all); \ + fi \ + done +- cc -o abs ./Plot/*.o ./ABV/*.o \ ++ ${CC} -o abs ./Plot/*.o ./ABV/*.o \ + Fig/*.o Interface/*.o X11/xedit/*.o \ +- ./Kernel/*.o ./X11/*.o ./Database/*.o ./Xpm/libxpm.a \ ++ ./Kernel/*.o ./X11/*.o ./Database/*.o\ + $(LIBS) $(DEFINE) + + Copied: head/math/abs/files/patch-X11_button.h (from r363257, head/math/abs/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/abs/files/patch-X11_button.h Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/abs/files/patch-ad) @@ -0,0 +1,11 @@ +--- X11/button.h.orig Sun Nov 11 20:24:37 2001 ++++ X11/button.h Sun Feb 9 15:05:21 2003 +@@ -52,7 +52,7 @@ + #define WIDGET_BUTTON_H + + #include "param.h" +-#include "xpm.h" ++#include <X11/xpm.h> + extern int make_pixmap_from_data (Widget parent, char **bits, Pixmap * bm); + + extern Widget Copied: head/math/abs/files/patch-X11_popnindex.h (from r363257, head/math/abs/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/abs/files/patch-X11_popnindex.h Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/abs/files/patch-ae) @@ -0,0 +1,11 @@ +--- X11/popnindex.h.orig Sun Nov 11 20:24:37 2001 ++++ X11/popnindex.h Sun Feb 9 15:05:54 2003 +@@ -53,7 +53,7 @@ + + #include <stdio.h> + #include "param.h" +-#include "xpm.h" ++#include <X11/xpm.h> + + extern void m_paste (); + extern void m_cut (); Modified: head/math/apc/Makefile ============================================================================== --- head/math/apc/Makefile Mon Jul 28 23:20:38 2014 (r363275) +++ head/math/apc/Makefile Mon Jul 28 23:33:47 2014 (r363276) @@ -19,7 +19,7 @@ USE_XORG= x11 xpm PLIST_FILES= bin/apc man/man1/apc.1.gz do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/apc ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/apc.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/apc ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/apc.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1 .include <bsd.port.mk> Copied: head/math/apc/files/patch-Makefile (from r363257, head/math/apc/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/apc/files/patch-Makefile Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/apc/files/patch-aa) @@ -0,0 +1,21 @@ +--- ./Makefile.orig 1997-10-13 21:25:38.000000000 +0200 ++++ ./Makefile 2008-04-13 18:59:23.000000000 +0200 +@@ -1,10 +1,13 @@ + # New Makefile for apc (13 October 1997) + # +-CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include +-LDFLAGS+=-L${X11BASE}/lib +-LDADD+=-lxforms -lX11 -lm +-BINDIR=${X11BASE}/bin +-MANDIR=${X11BASE}/man/man ++.if exists(${LOCALBASE}/include/X11/forms.h) ++XFORMSINC=-I${LOCALBASE}/include/X11 ++.endif ++CFLAGS+=-DOS=\"$(OSTYPE)\" -I${LOCALBASE}/include ${XFORMSINC} ++LDFLAGS+=-L${LOCALBASE}/lib ++LDADD+=-lforms -lX11 -lm -lXpm ++BINDIR=${LOCALBASE}/bin ++MANDIR=${LOCALBASE}/man/man + PROG= apc + SRCS= about.c apc.c calculate.c main.c mathfun.c setfns.c + Copied: head/math/asir2000/files/patch-Makefile.am (from r363257, head/math/asir2000/files/patch-ba) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-Makefile.am Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-ba) @@ -0,0 +1,72 @@ +--- Makefile.am.orig 2009-03-04 18:15:36.000000000 +0900 ++++ Makefile.am 2011-08-08 15:35:03.000000000 +0900 +@@ -9,7 +9,8 @@ + + SUBDIRS = asm builtin engine fft include io lib parse ${PLOTDIR} + +-asirdir = ${libdir}/asir ++bindir = ${prefix}/bin ++asirdir = ${bindir} + asir_PROGRAMS = asir + asir_SOURCES = parse/main.c + asir_LDADD = libasir.a @ASIR_GCLIB@ +@@ -90,33 +91,34 @@ + ${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir-gc.a + + install-openxm: asir${EXEEXT} install-libasir install-libasir-gc +- -mkdir -p ${DESTDIR}${bindir} +- ${INSTALL_PROGRAM} asir ${DESTDIR}${bindir} +- -mkdir -p ${DESTDIR}${asirdir} +- (cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib) +- -rm -f ${DESTDIR}${bindir}/ox_asir${EXEEXT} +- (cd ${DESTDIR}${bindir} ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT}) +- -(cd ${DESTDIR}${asirdir}; \ +- rm -f asir${EXEEXT} ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT}) +- (cd ${DESTDIR}${asirdir} ; \ +- ${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \ +- ${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \ +- ${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \ +- ${LN_S} asir${EXEEXT} ox_plot${EXEEXT}) +- (cd ${top_srcdir}/include; ${MAKE} install) +- (cd ${top_srcdir}/parse; ${MAKE} install) ++ ${INSTALL_PROGRAM} ${asir_PROGRAMS} /usr/local/bin ++# -mkdir -p ${DESTDIR}${bindir} ++# ${INSTALL_PROGRAM} asir /usr/local/bin ++# -mkdir -p ${DESTDIR}${asirdir} ++# (cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib) ++# -rm -f ${DESTDIR}${bindir}/ox_asir${EXEEXT} ++# (cd ${DESTDIR}${bindir} ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT}) ++# -(cd ${DESTDIR}${asirdir}; \ ++# rm -f asir${EXEEXT} ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT}) ++# (cd ${DESTDIR}${asirdir} ; \ ++# ${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \ ++# ${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \ ++# ${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \ ++# ${LN_S} asir${EXEEXT} ox_plot${EXEEXT}) ++# (cd ${top_srcdir}/include; ${MAKE} install) ++# (cd ${top_srcdir}/parse; ${MAKE} install) + + install-lib: +- (cd ${top_srcdir}/lib; ${MAKE} install-lib) +- -(cd ${DESTDIR}${asirdir}; \ +- rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT}) +- (cd ${DESTDIR}${asirdir} ; \ +- ${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \ +- ${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \ +- ${LN_S} asir${EXEEXT} ox_plot${EXEEXT}) +- -mkdir -p ${DESTDIR}${bindir} +- -rm -f ${DESTDIR}${bindir}/asir${EXEEXT} +- (cd ${DESTDIR}${bindir} ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT}) ++# (cd ${top_srcdir}/lib; ${MAKE} install-lib) ++# -(cd ${DESTDIR}${asirdir}; \ ++# rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT}) ++# (cd ${DESTDIR}${asirdir} ; \ ++# ${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \ ++# ${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \ ++# ${LN_S} asir${EXEEXT} ox_plot${EXEEXT}) ++# -mkdir -p ${DESTDIR}${bindir} ++# -rm -f ${DESTDIR}${bindir}/asir${EXEEXT} ++# (cd ${DESTDIR}${bindir} ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT}) + + install-doc: + (cd ${top_srcdir}/lib; ${MAKE} install-doc) Copied: head/math/asir2000/files/patch-asm_Makefile.am (from r363257, head/math/asir2000/files/patch-bb) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-asm_Makefile.am Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-bb) @@ -0,0 +1,10 @@ +--- asm/Makefile.am.orig 2009-02-13 22:21:19.000000000 +0900 ++++ asm/Makefile.am 2011-08-08 14:23:31.000000000 +0900 +@@ -1,6 +1,6 @@ + ## $OpenXM: OpenXM_contrib2/asir2000/asm/Makefile.am,v 1.4 2009/02/13 13:21:19 ohara Exp $ + +-asirdir = ${prefix}/lib/asir ++asirdir = ${prefix}/share/asir + DEFS = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\" + INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \ + -I${top_srcdir}/gc/include \ Copied: head/math/asir2000/files/patch-builtin_Makefile.am (from r363257, head/math/asir2000/files/patch-bc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-builtin_Makefile.am Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-bc) @@ -0,0 +1,10 @@ +--- builtin/Makefile.am.orig 2011-08-08 14:24:27.000000000 +0900 ++++ builtin/Makefile.am 2011-08-08 14:24:41.000000000 +0900 +@@ -1,6 +1,6 @@ + ## $OpenXM: OpenXM_contrib2/asir2000/builtin/Makefile.am,v 1.9 2009/02/13 13:21:19 ohara Exp $ + +-asirdir = ${prefix}/lib/asir ++asirdir = ${prefix}/share/asir + DEFS = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\" + INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \ + -I${top_srcdir}/gc/include \ Copied: head/math/asir2000/files/patch-engine_Makefile.am (from r363257, head/math/asir2000/files/patch-bd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-engine_Makefile.am Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-bd) @@ -0,0 +1,10 @@ +--- engine/Makefile.am.orig 2011-08-08 14:25:27.000000000 +0900 ++++ engine/Makefile.am 2011-08-08 14:25:38.000000000 +0900 +@@ -1,6 +1,6 @@ + ## $OpenXM: OpenXM_contrib2/asir2000/engine/Makefile.am,v 1.9 2009/02/13 13:21:19 ohara Exp $ + +-asirdir = ${prefix}/lib/asir ++asirdir = ${prefix}/share/asir + DEFS = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\" + INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \ + -I${top_srcdir}/gc/include \ Copied: head/math/asir2000/files/patch-fft_Makefile.am (from r363257, head/math/asir2000/files/patch-be) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-fft_Makefile.am Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-be) @@ -0,0 +1,10 @@ +--- fft/Makefile.am.orig 2011-08-08 14:26:18.000000000 +0900 ++++ fft/Makefile.am 2011-08-08 14:26:27.000000000 +0900 +@@ -1,6 +1,6 @@ + ## $OpenXM: OpenXM_contrib2/asir2000/fft/Makefile.am,v 1.4 2009/02/13 13:21:19 ohara Exp $ + +-asirdir = ${prefix}/lib/asir ++asirdir = ${prefix}/share/asir + DEFS = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\" + INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \ + -I${top_srcdir}/gc/include \ Copied: head/math/asir2000/files/patch-include_version.h (from r363257, head/math/asir2000/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-include_version.h Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-ac) @@ -0,0 +1,8 @@ +--- include/version.h.orig 2011-08-08 14:41:05.000000000 +0900 ++++ include/version.h 2011-08-08 14:41:28.000000000 +0900 +@@ -48,4 +48,4 @@ + * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.331 2011/07/21 04:43:26 noro Exp $ + */ + #define ASIR_VERSION 20110721 +-#define ASIR_DISTRIBUTION "Kobe" ++#define ASIR_DISTRIBUTION "Plotting Group" Copied: head/math/asir2000/files/patch-io_Makefile.am (from r363257, head/math/asir2000/files/patch-bf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-io_Makefile.am Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-bf) @@ -0,0 +1,10 @@ +--- io/Makefile.am.orig 2011-08-08 14:26:59.000000000 +0900 ++++ io/Makefile.am 2011-08-08 14:27:11.000000000 +0900 +@@ -1,6 +1,6 @@ + ## $OpenXM: OpenXM_contrib2/asir2000/io/Makefile.am,v 1.4 2009/02/13 13:21:20 ohara Exp $ + +-asirdir = ${prefix}/lib/asir ++asirdir = ${prefix}/share/asir + DEFS = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\" + INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \ + -I${top_srcdir}/gc/include \ Copied: head/math/asir2000/files/patch-lib_Makefile.am (from r363257, head/math/asir2000/files/patch-bk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-lib_Makefile.am Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-bk) @@ -0,0 +1,10 @@ +--- lib/Makefile.am.orig 2011-08-08 14:38:10.000000000 +0900 ++++ lib/Makefile.am 2011-08-08 14:38:35.000000000 +0900 +@@ -1,6 +1,6 @@ + ## $OpenXM: OpenXM_contrib2/asir2000/lib/Makefile.am,v 1.12 2009/02/22 16:51:36 ohara Exp $ + +-asirdir = ${libdir}/asir ++asirdir = ${datadir}/asir + RR = alpi bfct bgk const cyclic defs.h dfff dmul dmul102 fctrdata fctrtest \ + fff glib gr ifplot katsura mat nf num primdec primdec_lex \ + ratint robot solve sp sturm sym xm primdec_mod weight Copied: head/math/asir2000/files/patch-plot_Makefile.am (from r363257, head/math/asir2000/files/patch-bh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asir2000/files/patch-plot_Makefile.am Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/asir2000/files/patch-bh) @@ -0,0 +1,10 @@ +--- plot/Makefile.am.orig 2009-02-13 22:21:20.000000000 +0900 ++++ plot/Makefile.am 2011-08-08 14:21:28.000000000 +0900 +@@ -1,6 +1,6 @@ + ## $OpenXM: OpenXM_contrib2/asir2000/plot/Makefile.am,v 1.4 2009/02/13 13:21:20 ohara Exp $ + +-asirdir = ${prefix}/lib/asir ++asirdir = ${prefix}/share/asir + DEFS = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\" + INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \ + -I${top_srcdir}/gc/include \ Copied: head/math/calctool/files/patch-Makefile (from r363257, head/math/calctool/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/calctool/files/patch-Makefile Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/calctool/files/patch-ab) @@ -0,0 +1,115 @@ +--- Makefile.orig Sat May 29 20:35:43 1993 ++++ Makefile Thu Jul 13 12:05:36 2006 +@@ -28,7 +28,7 @@ + # It can also be specified here by uncommenting the following + # macro definition and setting appropriately. + # +-HELPNAME = -DHELPNAME=\"$(LIBDIR)/calctool.help\" ++HELPNAME = -DHELPNAME=\"%%DATADIR%%/calctool.help\" + #----------------------------------------------------------------------- + # An attempt is now made at using a portable math library. You should + # carefully setup the following three definitions. +@@ -85,13 +85,13 @@ + # uncomment the other three definitions below, commented out the initial + # two. + # +-LIBNAME = libcalctool.a +-CALCLIB = $(LIBNAME) ++#LIBNAME = libcalctool.a ++#CALCLIB = $(LIBNAME) + # + # Shared library definitions. Uncomment if required. +-#LIBNAME = libcalctool.so.1.1 +-#CALCLIB = -L. -lcalctool +-#SHLIB = -pic ++LIBNAME = libcalctool.so.1 ++CALCLIB = -L . -lcalctool ++SHLIB = %%FPIC%% + #----------------------------------------------------------------------- + # If you are not running under a BSD4.3 derived system, then the + # second parameter to a select call is a pointer to an integer function, +@@ -116,38 +116,37 @@ + # library files are not in a standard place, then the following + # two lines should be uncommented, and set appropriately. + # +-#X11INCDIR = -I$(OPENWINHOME)/include +-#X11LIBDIR = -L$(OPENWINHOME)/lib ++X11INCDIR = -I%%LOCALBASE%%/include ++X11LIBDIR = -L%%LOCALBASE%%/lib + #------------------------------------------------------------------------- + # If you are compiling the XView version, then the following two lines + # should be uncommented. + # +-XVIEWINCDIR = -I$(OPENWINHOME)/include +-XVIEWLIBDIR = -L$(OPENWINHOME)/lib ++XVIEWINCDIR = -I%%LOCALBASE%%/include ++XVIEWLIBDIR = -L%%LOCALBASE%%/lib + # + #========================================================================= + # + # Default locations where calctool files will be installed. + # You might wish to alter these values. + # +-BINDIR = /usr/local/bin +-LIBDIR = /usr/local/lib +-MANDIR = /usr/man/man$(MANSECT) +-MANSECT = l ++BINDIR = $(PREFIX)/bin ++LIBDIR = $(PREFIX)/lib ++MANDIR = $(PREFIX)/man/man$(MANSECT) ++MANSECT = 1 + # + # Compilation flags and standard macro definitions. + # +-CFLAGS = -g $(HELPNAME) $(NEWSFILE) $(STUPID_FPE) $(NOIEEE) \ ++CFLAGS += $(HELPNAME) $(NEWSFILE) $(STUPID_FPE) $(NOIEEE) \ + $(NOINDEX) $(RCNAME) $(SELTYPE) $(SHLIB) $(SIGRET) \ + $(SUN4_KEYBOARD) $(TTEXT) $(MGRPARAM) $(MGRINCDIR) \ + $(X11INCDIR) $(XVIEWINCDIR) + # + #========================================================================= + +-BINARIES = mgr_calctool ps_calctool sv_calctool \ +- tty_calctool xcalctool xv_calctool ++BINARIES = %%BINARIES%% + +-CC = cc ++#CC = cc + + LIBSRCS = graphics.c display.c functions.c get.c + LIBOBJS = graphics.o display.o functions.o get.o +@@ -208,19 +207,16 @@ + $(CC) -o sv_calctool $(CFLAGS) $(STDOBJS) sunview.o $(SVIEWLIBS) + -cp sv_calctool calctool + +-tty: $(OBJS) tty.o ++tty_calctool: $(OBJS) tty.o + $(CC) -o tty_calctool $(CFLAGS) $(STDOBJS) tty.o $(TTYLIBS) +- -cp tty_calctool calctool + +-x11: $(OBJS) x11.o ++xcalctool: $(OBJS) x11.o + $(CC) -o xcalctool $(X11LIBDIR) $(CFLAGS) $(STDOBJS) x11.o \ + $(X11LIBS) +- -cp xcalctool calctool + +-xview: $(OBJS) xview.o ++xv_calctool: $(OBJS) xview.o + $(CC) -o xv_calctool $(XVIEWLIBDIR) $(CFLAGS) $(STDOBJS) \ + xview.o $(XVIEWLIBS) +- -cp xv_calctool calctool + + libcalctool.a: $(LIBOBJS) + ar rv $@ $? +@@ -229,8 +225,9 @@ + # These are the library creation rules for making the shared calctool + # library (available with SunOS v4.x). + +-libcalctool.so.1.1: $(LIBOBJS) +- ld -o libcalctool.so.1.1 -assert pure-text $? ++libcalctool.so.1: $(LIBOBJS) ++ $(CC) -shared -o ${LIBNAME} $? ++ ln -sf ${LIBNAME} libcalctool.so + + install: + install -c -m 644 $(LIBNAME) $(LIBDIR) Modified: head/math/eispack/Makefile ============================================================================== --- head/math/eispack/Makefile Mon Jul 28 23:20:38 2014 (r363275) +++ head/math/eispack/Makefile Mon Jul 28 23:33:47 2014 (r363276) @@ -32,10 +32,10 @@ OPTIONS_DEFINE= PROFILE .if ${PORT_OPTIONS:MPROFILE} .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE) -IGNORE = you have defined WITH_PROFILE, but have also defined\ +IGNORE= you have defined WITH_PROFILE, but have also defined\ WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE .elif !exists(/usr/lib/libc_p.a) -IGNORE = you have chosen WITH_PROFILE, but have not installed the\ +IGNORE = you have chosen WITH_PROFILE, but have not installed the\ base system profiling libraries .endif PLIST_FILES+= lib/libeispack_p.a @@ -43,7 +43,7 @@ PLIST_FILES+= lib/libeispack_p.a MAKE_ENV+= NO_PROFILE=yes .endif -SRCS = csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \ +SRCS= csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \ bandv.f bisect.f bqr.f cbabk2.f cbal.f cg.f ch.f cinvit.f combak.f \ comhes.f comlr.f comlr2.f comqr.f comqr2.f cortb.f corth.f elmbak.f \ elmhes.f eltran.f figi.f figi2.f hqr.f hqr2.f htrib3.f htribk.f \ Copied: head/math/eispack/files/patch-radix_fix (from r363257, head/math/eispack/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/eispack/files/patch-radix_fix Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/eispack/files/patch-aa) @@ -0,0 +1,38 @@ +*** balanc.f~ Sat Jan 28 00:00:00 1984 +--- balanc.f Thu Nov 30 15:35:38 1995 +*************** +*** 57,63 **** + c + c ------------------------------------------------------------------ + c +! radix = 16.0d0 + c + b2 = radix * radix + k = 1 +--- 57,63 ---- + c + c ------------------------------------------------------------------ + c +! radix = 2.0d0 + c + b2 = radix * radix + k = 1 +*** cbal.f~ Sat Jan 28 00:00:00 1984 +--- cbal.f Thu Nov 30 15:36:01 1995 +*************** +*** 62,68 **** + c + c ------------------------------------------------------------------ + c +! radix = 16.0d0 + c + b2 = radix * radix + k = 1 +--- 62,68 ---- + c + c ------------------------------------------------------------------ + c +! radix = 2.0d0 + c + b2 = radix * radix + k = 1 Copied: head/math/eval/files/patch-Makefile (from r363257, head/math/eval/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/eval/files/patch-Makefile Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/eval/files/patch-aa) @@ -0,0 +1,27 @@ +--- /tmp/Eval/source/Makefile.unx Tue Apr 13 21:04:14 1993 ++++ Makefile Sat Nov 8 11:50:35 1997 +@@ -11,13 +11,14 @@ + # in order to get the string space high enough. I haven't had any + # trouble with any of the other source modules. + # +-CCFLAGS=-c ++CCFLAGS=-c $(CFLAGS) + # + # On some systems, you can use LIBC=-lc_s to make the program smaller by + # linking to a shared library. + # + LIBC=-lc + LIBM=-lm ++LIBREADLINE=-lreadline -ltermcap + EXE= + OBJ=.o + HEADER=eval.h +@@ -30,7 +31,7 @@ + $(OBJFILES): $(HEADER) + + Eval$(EXE): $(OBJFILES) +- $(CC) -o Eval $(OBJFILES) $(LIBM) $(LIBC) ++ $(CC) -o Eval $(OBJFILES) $(LIBM) $(LIBC) $(LIBREADLINE) + chmod 755 Eval + + eval: Eval$(EXE) Copied: head/math/eval/files/patch-eval.c (from r363257, head/math/eval/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/eval/files/patch-eval.c Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/eval/files/patch-ac) @@ -0,0 +1,166 @@ +--- /tmp/Eval/source/eval.c Tue Apr 13 21:04:42 1993 ++++ eval.c Wed Sep 24 12:25:27 1997 +@@ -44,6 +44,9 @@ + */ + + #include "eval.h" ++#include <readline/readline.h> ++#include <readline/history.h> ++#include <signal.h> + + static char tempname[80]; + static char wdir[100]; +@@ -122,6 +125,7 @@ + static BOOLEAN process_line(FILE *stream,int showinp,int showout,VARPTR vlist, + VARPTR clist,char *pinput); + static void init_varlist(VARPTR vlist); ++static void init_sig(void); + static void var_copy(VARPTR dest,VARPTR source); + static int print_help(FILE *stream,int extended,int page,char *s); + static int more(char *text,char *input,int pause); +@@ -143,6 +147,8 @@ + + + init_varlist(vlist); ++ initialize_readline(); ++ init_sig(); + wdir[0]=EOS; + rpath[0]=EOS; + setobase(10); +@@ -462,6 +468,7 @@ + if (input[m0]!='?') + { + evaluate(&input[m0],showout,vlist,clist); ++ init_sig(); + break; + } + if (!strcmp(&input[m0],"?")) +@@ -565,6 +572,24 @@ + vlist[i].name[0]=EOS; + } + ++static void ignore_fpe(void) ++{ ++ printf("Floating point exception... ignore result!\n"); ++ signal(SIGFPE, SIG_IGN); ++} ++ ++/* ++** init_sig() ++** ++** initialize signal handler for floating point exceptions ++** ++*/ ++ ++static void init_sig(void) ++{ ++ signal(SIGFPE, ignore_fpe); ++} ++ + /* + ** var_copy(VARPTR dest,VARPTR source) + ** +@@ -839,24 +864,89 @@ + s[j+1]=EOS; + } + ++char * ++complete_consts (char *text, int state) ++{ ++ static int i = 0, j = 0; ++ ++ if (state == 0) { ++ i = 0; ++ j = 0; ++ } ++ ++ while (i<MAXC) { ++ if (strncmp (clist[i].name, text, strlen(text)) == 0) ++ return strdup(clist[i++].name); ++ else ++ i++; ++ } + +-static int nextline(char *s,FILE *stream) +- ++ while (j<NUMFUNCS) { ++ if (strncmp (flist[j].name, text, strlen(text)) == 0) ++ return strdup(flist[j++].name); ++ else ++ j++; ++ } ++ ++ return NULL; ++} ++ ++int initialize_readline () ++{ ++ /* Allow conditional parsing of the ~/.inputrc file. */ ++ rl_readline_name = "Eval"; ++ ++ rl_completion_entry_function = (Function *)complete_consts; ++} ++ ++/* A static variable for holding the line. */ ++static char *line_read = (char *)NULL; ++ ++/* Read a string, and return a pointer to it. Returns NULL on EOF. */ ++char * ++do_gets () ++{ ++ /* If the buffer has already been allocated, return the memory ++ to the free pool. */ ++ if (line_read != (char *)NULL) + { +- while (1) +- +- { +- if (stream==stdin) +- printf("%s",PROMPT); +- if (fgets(s,MAXINPUT,stream)==NULL) +- return(0); +- fixup(s); +- if (s[0]!=';') +- break; +- } +- return(1); ++ free (line_read); ++ line_read = (char *)NULL; + } + ++ /* Get a line from the user. */ ++ line_read = readline (PROMPT); ++ ++ /* If the line has any text in it, save it on the history. */ ++ if (line_read && *line_read) ++ add_history (line_read); ++ ++ return (line_read); ++} ++ ++ ++static int nextline(char *s,FILE *stream) ++ ++{ ++ while (1) ++ ++ { ++ if (stream==stdin) { ++ if (do_gets() == NULL) ++ return 0; ++ else ++ strncpy(s, line_read, MAXINPUT); ++ } ++ else ++ if (fgets(s,MAXINPUT,stream)==NULL) ++ return(0); ++ fixup(s); ++ if (s[0]!=';') ++ break; ++ } ++ return(1); ++} ++ + + static void close_temp(int showout) + Copied: head/math/eval/files/patch-eval.h (from r363257, head/math/eval/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/eval/files/patch-eval.h Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/eval/files/patch-ab) @@ -0,0 +1,33 @@ +--- /tmp/Eval/source/eval.h Tue Apr 13 21:04:44 1993 ++++ eval.h Wed Mar 16 04:26:57 1994 +@@ -55,6 +55,8 @@ + #define MAXINPUT 160 + #define NUMFUNCS 30 + #define MAXFLEN 6 ++#define MAXALEN 3 ++#define MAXDLEN 80 + #define SCRWIDTH 80 + #define MAXARGS 10 + #define EOS '\0' +@@ -115,6 +117,12 @@ + char type; + int code; + } TOKEN, *TOKENPTR; ++typedef struct { ++ int id; ++ char name[MAXFLEN+1]; ++ char argspec[MAXALEN+1]; ++ char desc[MAXDLEN+1]; ++ } FUNC, *FUNCPTR; + + /* Function definitions */ + +@@ -131,6 +139,8 @@ + char *func_name (int); + int func_nargs (int); + int print_funclist (FILE *s,char *input,int d); ++ ++extern FUNC flist[]; + + /* ----- PARSE.C functions -------------------------------------------- */ + Copied: head/math/eval/files/patch-funcs.c (from r363257, head/math/eval/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/eval/files/patch-funcs.c Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/eval/files/patch-ad) @@ -0,0 +1,28 @@ +--- /tmp/Eval/source/funcs.c Tue Apr 13 21:04:40 1993 ++++ funcs.c Wed Mar 16 04:31:35 1994 +@@ -52,16 +52,6 @@ + + #include "eval.h" + +-#define MAXALEN 3 +-#define MAXDLEN 80 +- +-typedef struct { +- int id; +- char name[MAXFLEN+1]; +- char argspec[MAXALEN+1]; +- char desc[MAXDLEN+1]; +- } FUNC, *FUNCPTR; +- + #define ABSVAL 1 + #define ACOS 2 + #define ACOSH 3 +@@ -93,7 +83,7 @@ + #define TAN 29 + #define TANH 30 + +-static FUNC flist[NUMFUNCS] = ++FUNC flist[NUMFUNCS] = + { + {ABSVAL,"abs", "x", "absolute value" }, + {ACOS, "acos", "x", "arccosine, return value in radians" }, Modified: head/math/geg/Makefile ============================================================================== --- head/math/geg/Makefile Mon Jul 28 23:20:38 2014 (r363275) +++ head/math/geg/Makefile Mon Jul 28 23:33:47 2014 (r363276) @@ -22,6 +22,6 @@ PLIST_FILES= bin/geg \ man/man1/geg.1.gz pre-configure: - @cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal + @(cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal) .include <bsd.port.mk> Copied: head/math/geg/files/patch-configure.in (from r363257, head/math/geg/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/geg/files/patch-configure.in Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/geg/files/patch-ac) @@ -0,0 +1,12 @@ +--- configure.in.orig Wed Nov 24 08:01:41 1999 ++++ configure.in Sat Jul 1 18:57:50 2000 +@@ -30,8 +30,7 @@ + fi + fi + +-AC_CHECK_PROG(GTK_CFLAGS, gtk-config, `gtk-config --cflags`,,,) +-AC_CHECK_PROG(GTK_LIBS, gtk-config, `gtk-config --libs`,,,) ++AM_PATH_GTK(1.2.0, , AC_MSG_ERROR(GTK+ is not installed or badly configured on your system...)) + + dnl Checks for libraries. + dnl Replace `main' with a function in -libs: Copied: head/math/geg/files/patch-src_main.c (from r363257, head/math/geg/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/geg/files/patch-src_main.c Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/geg/files/patch-ab) @@ -0,0 +1,16 @@ +--- src/main.c.orig Sat Apr 15 19:50:38 2000 ++++ src/main.c Sat Apr 15 19:50:52 2000 +@@ -10,10 +10,13 @@ + #include "app.h" + #include <gtk/gtk.h> + #include <stdio.h> ++#include <ieeefp.h> + + int + main(int argc, char *argv[]) + { ++ fpsetmask(0); ++ + parse_command_line(argc, argv); + parse_rcfile(); + Copied: head/math/ngraph/files/patch-Makefile (from r363257, head/math/ngraph/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/ngraph/files/patch-Makefile Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/ngraph/files/patch-aa) @@ -0,0 +1,73 @@ +--- Makefile.orig 2009-10-15 20:17:47.000000000 +0900 ++++ Makefile 2014-06-20 21:48:30.928895628 +0900 +@@ -2,26 +2,26 @@ + MAINVERSION = '"6.03"' + GUIVERSION = '".51"' + ALIGNSIZE = 8 +-LIBDIR = '"/usr/local/lib/Ngraph"' +-INSTALLDIR = /usr/local/lib/Ngraph +-BINDIR = /usr/local/bin ++LIBDIR = '"${PREFIX}/lib/Ngraph"' ++INSTALLDIR = ${DESTDIR}${PREFIX}/lib/Ngraph ++BINDIR = ${DESTDIR}${PREFIX}/bin + # + # + ############################################################################### + # + # Linux + Open Motif 2.1 [dynamic link] + # +-CC = gcc +-CCOPTION = -O2 -m486 +-MAKE = make +-AR = ar +-RANLIB = ranlib +-STRIP = strip +-DEFS = -DJAPANESE +-PLATFORM = '"for X11 [Linux(glibc2) + Open Motif]"' +-X11INCLUDE = -I/usr/X11R6/include +-STATICLINK = +-X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM ++#CC = gcc ++#CCOPTION = -O2 -m486 ++#MAKE = make ++#AR = ar ++#RANLIB = ranlib ++#STRIP = strip ++#DEFS = -DJAPANESE ++#PLATFORM = '"for X11 [Linux(glibc2) + Open Motif]"' ++#X11INCLUDE = -I/usr/X11R6/include ++#STATICLINK = ++#X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM + # + # + ############################################################################### +@@ -149,17 +149,18 @@ + # + # (Thanks to MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>) + # +-#CC = gcc +-#CCOPTION = ${CFLAGS} +-#MAKE = gmake +-#AR = ar +-#RANLIB = ranlib +-#STRIP = strip +-#DEFS = -DJAPANESE +-#PLATFORM = '"for X11 [FreeBSD+Motif2.1]"' +-#X11INCLUDE = -I/usr/X11R6/include -I/usr/dt/include +-#STATICLINK = /usr/dt/lib/libXm.a +-#X11LIB = -L/usr/X11R6/lib -L/usr/dt/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM -lxpg4 ++CC ?= gcc ++CFLAGS ?= -O -pipe ++CCOPTION = ${CFLAGS} ++MAKE = gmake ++AR = ar ++RANLIB = ranlib ++STRIP = strip ++DEFS = -DJAPANESE ++PLATFORM = '"for X11 [FreeBSD+Motif2.1]"' ++X11INCLUDE = -I${LOCALBASE}/include -I/usr/dt/include ++STATICLINK = ++X11LIB = ${MOTIFLIB} -lm -L${LOCALBASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM + # + ############################################################################### + Copied: head/math/oleo/files/patch-Makefile.in (from r363257, head/math/oleo/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/oleo/files/patch-Makefile.in Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/oleo/files/patch-ad) @@ -0,0 +1,19 @@ +--- Makefile.in.orig Sat Jul 22 18:51:35 2000 ++++ Makefile.in Fri Jul 28 04:28:46 2000 +@@ -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 intl src m4 po Xresources examples + + # 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 + +-docdir = $(prefix)/Oleo ++docdir = $(datadir)/doc/oleo + doc_DATA = AUTHORS FAQ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs Copied: head/math/oleo/files/patch-aclocal.m4 (from r363257, head/math/oleo/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/oleo/files/patch-aclocal.m4 Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/oleo/files/patch-ag) @@ -0,0 +1,16 @@ +--- aclocal.m4.orig Thu Nov 23 05:32:03 2000 ++++ aclocal.m4 Sat Dec 2 12:21:18 2000 +@@ -1996,9 +1996,12 @@ + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo +- DATADIRNAME=lib]) ++ DATADIRNAME=share]) + INSTOBJEXT=.mo + fi ++ fi ++ if test "$gt_cv_func_gettext_libintl" = "yes"; then ++ INTLLIBS='-lintl' + fi + ]) + Copied: head/math/oleo/files/patch-configure.in (from r363257, head/math/oleo/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/oleo/files/patch-configure.in Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/oleo/files/patch-ah) @@ -0,0 +1,21 @@ +--- configure.in.orig Thu Nov 23 05:31:55 2000 ++++ configure.in Sat Dec 2 10:41:01 2000 +@@ -208,13 +208,15 @@ + dnl the libplot from GNU plotutils sometimes requires linking the + dnl X and Motif libraries + dnl +-AC_CHECK_LIB(plot, pl_openpl_r, ++if test "$with_motif" = "yes"; then ++ AC_CHECK_LIB(plot, pl_openpl_r, + AC_DEFINE(HAVE_LIBPLOT) + LIBS="$LIBS -lplot") + +-AC_CHECK_LIB(sciplot, sp_begin_plot) +-if test x$ac_cv_lib_sciplot_sp_begin_plot = xyes; then ++ AC_CHECK_LIB(sciplot, sp_begin_plot) ++ if test x$ac_cv_lib_sciplot_sp_begin_plot = xyes; then + AC_DEFINE(HAVE_LIBSCIPLOT) ++ fi + fi + + dnl Checks for Guile Copied: head/math/oleo/files/patch-doc_Makefile.in (from r363257, head/math/oleo/files/patch-ai) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/oleo/files/patch-doc_Makefile.in Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/oleo/files/patch-ai) @@ -0,0 +1,20 @@ +--- doc/Makefile.in.orig Sat Mar 10 15:32:46 2001 ++++ doc/Makefile.in Mon Jun 7 21:52:58 2004 +@@ -87,7 +87,7 @@ + LIBOBJS = @LIBOBJS@ + LN_S = @LN_S@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = @MAKEINFO@ --no-split + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOTIF_CFLAGS = @MOTIF_CFLAGS@ + MOTIF_LIBS = @MOTIF_LIBS@ +@@ -125,7 +125,7 @@ + EXTRA_DIST = $(TEXIS) oleo_web.html texi2html oleo1.png + noinst_DATA = oleo_web.html $(TEXIS) + +-@HavePerl_TRUE@htmldir = $(prefix)/share/oleo ++@HavePerl_TRUE@htmldir = $(prefix)/share/doc/oleo + @HavePerl_TRUE@html_DATA = oleo.html + + DISTCLEANFILES = $(html_DATA) Copied: head/math/oleo/files/patch-doc_oleo.texi (from r363257, head/math/oleo/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/oleo/files/patch-doc_oleo.texi Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/oleo/files/patch-af) @@ -0,0 +1,12 @@ +--- doc/oleo.texi.orig Thu Dec 24 09:24:23 1998 ++++ doc/oleo.texi Sat Sep 18 03:24:39 1999 +@@ -2,6 +2,9 @@ + @c %**start of header + @setfilename oleo.info + @settitle Oleo @value{version} ++@direntry ++* Oleo: (oleo). Oleo, the GNU spreadsheet. ++@end direntry + @c make a command index: + @defcodeindex cm + @c %**end of header Copied: head/math/oleo/files/patch-src_Makefile.in (from r363257, head/math/oleo/files/patch-ak) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/oleo/files/patch-src_Makefile.in Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/oleo/files/patch-ak) @@ -0,0 +1,22 @@ +--- src/Makefile.in.orig Thu Nov 23 05:39:58 2000 ++++ src/Makefile.in Sat Dec 2 10:44:42 2000 +@@ -158,7 +158,7 @@ + @UseMotif_TRUE@MYCFL = ${X_CFLAGS} + @UseMotif_FALSE@MYCFL = ${X_CFLAGS} + +-oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a ../intl/libintl.a ${X_LIBS} ++oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a ${X_LIBS} + INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl ${MYINC} + CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" ${MYCFL} -DBUILD_PREFIX='"'${BUILD_PREFIX}'"' + +@@ -251,8 +251,8 @@ + @UseMotif_FALSE@@HaveXbase_FALSE@postscript$U.o pcl$U.o epson$U.o \ + @UseMotif_FALSE@@HaveXbase_FALSE@prtext$U.o afm$U.o mdi$U.o gsl$U.o \ + @UseMotif_FALSE@@HaveXbase_FALSE@plotter$U.o legend$U.o +-@UseMotif_TRUE@oleo_DEPENDENCIES = ../lib/liboleo.a ../intl/libintl.a +-@UseMotif_FALSE@oleo_DEPENDENCIES = ../lib/liboleo.a ../intl/libintl.a ++@UseMotif_TRUE@oleo_DEPENDENCIES = ../lib/liboleo.a @INTLDEPS@ ++@UseMotif_FALSE@oleo_DEPENDENCIES = ../lib/liboleo.a @INTLDEPS@ + oleo_LDFLAGS = + CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + CXXLD = $(CXX) Copied: head/math/oleo/files/patch-src_eval.c (from r363257, head/math/oleo/files/patch-src::eval.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/oleo/files/patch-src_eval.c Mon Jul 28 23:33:47 2014 (r363276, copy of r363257, head/math/oleo/files/patch-src::eval.c) @@ -0,0 +1,33 @@ +--- src/eval.c.orig Wed Jul 14 23:06:00 2004 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407282333.s6SNXm69083392>