From d49de8a9ae361cddb09cfe859b9c89e01bdaddd1 Mon Sep 17 00:00:00 2001 From: FUJISHIMA Satsuki Date: Sat, 19 Jan 2002 05:02:32 +0000 Subject: o update to 0.99.4. o change maintainer's e-mail address. PR: 33748 Submitted by: maintainer --- lang/ferite/files/patch-Makefile.in | 9 ++-- lang/ferite/files/patch-configure | 59 ++++++++++------------ lang/ferite/files/patch-docs::Makefile.in | 9 ++-- lang/ferite/files/patch-docs::images::Makefile.in | 11 ++-- lang/ferite/files/patch-libs::Makefile.in | 11 ---- lang/ferite/files/patch-libs::triton::configure | 18 +++++++ lang/ferite/files/patch-libs::triton::ltmain.sh | 36 +++++++++++++ lang/ferite/files/patch-ltmain.sh | 14 ++--- lang/ferite/files/patch-modules::ipc::ipc_header.h | 14 +++++ lang/ferite/files/patch-scripts::test::ipc_test.fe | 14 +++++ lang/ferite/files/patch-scripts::test::test.fe | 18 +++---- lang/ferite/files/patch-src::Makefile.in | 20 -------- 12 files changed, 145 insertions(+), 88 deletions(-) delete mode 100644 lang/ferite/files/patch-libs::Makefile.in create mode 100644 lang/ferite/files/patch-libs::triton::configure create mode 100644 lang/ferite/files/patch-libs::triton::ltmain.sh create mode 100644 lang/ferite/files/patch-modules::ipc::ipc_header.h create mode 100644 lang/ferite/files/patch-scripts::test::ipc_test.fe delete mode 100644 lang/ferite/files/patch-src::Makefile.in (limited to 'lang/ferite/files') diff --git a/lang/ferite/files/patch-Makefile.in b/lang/ferite/files/patch-Makefile.in index 1f9acb1ba0be..b8ea8df6c14a 100644 --- a/lang/ferite/files/patch-Makefile.in +++ b/lang/ferite/files/patch-Makefile.in @@ -1,6 +1,9 @@ ---- Makefile.in.orig Sun Nov 11 11:47:00 2001 -+++ Makefile.in Sun Nov 11 21:43:41 2001 -@@ -116,7 +116,7 @@ + +$FreeBSD$ + +--- Makefile.in.orig Wed Jan 9 08:47:06 2002 ++++ Makefile.in Wed Jan 9 12:11:41 2002 +@@ -122,7 +122,7 @@ stamp-h.in diff --git a/lang/ferite/files/patch-configure b/lang/ferite/files/patch-configure index 73ca4d9078d2..c0de60585f6c 100644 --- a/lang/ferite/files/patch-configure +++ b/lang/ferite/files/patch-configure @@ -1,36 +1,9 @@ $FreeBSD$ ---- configure.orig Thu Nov 15 11:09:00 2001 -+++ configure Thu Nov 15 18:26:26 2001 -@@ -261,7 +261,6 @@ - : ${ac_max_here_lines=38} - - ac_unique_file="src/ferite.c" --ac_subdirs_all="$ac_subdirs_all libs/ltdl" - - # Initialize some variables set by options. - ac_init_help= -@@ -2666,18 +2665,6 @@ - SET_MAKE="MAKE=${MAKE-make}" - fi - -- case $enable_ltdl_convenience in -- no) { { echo "$as_me:2670: error: this package needs a convenience libltdl" >&5 --echo "$as_me: error: this package needs a convenience libltdl" >&2;} -- { (exit 1); exit 1; }; } ;; -- "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -- esac -- LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la -- INCLTDL='-I${top_srcdir}/''libltdl' -- --subdirs="$subdirs libs/ltdl" -- - # Check whether --enable-shared or --disable-shared was given. - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" -@@ -7096,13 +7083,13 @@ +--- configure.orig Wed Jan 9 08:47:22 2002 ++++ configure Wed Jan 9 12:39:13 2002 +@@ -7096,13 +7096,13 @@ { (exit 1); exit 1; }; } fi @@ -47,7 +20,7 @@ $FreeBSD$ cat >conftest.$ac_ext <<_ACEOF #line 7107 "configure" #include "confdefs.h" -@@ -7150,7 +7137,7 @@ +@@ -7150,7 +7150,7 @@ #define HAVE_LIBPTHREAD 1 EOF @@ -56,3 +29,27 @@ $FreeBSD$ else +@@ -7229,7 +7229,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmysqlclient $LIBS" ++LIBS="-L%%LOCALBASE%%/lib/mysql -lmysqlclient $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line 7234 "configure" + #include "confdefs.h" +@@ -7279,10 +7279,10 @@ + fi + + if test "$mysql" = yes; then +- mysql_LIBS=`mysql_config --libs` +- mysql_CFLAGS=`mysql_config --cflags` +- MYSQL_SOCKET=`mysql_config --socket` +- MYSQL_PORT=`mysql_config --port` ++ mysql_LIBS="-L%%LOCALBASE%%/lib/mysql -lmysqlclient -lz -lm -lcrypt" ++ mysql_CFLAGS="-I%%LOCALBASE%%/include/mysql" ++ MYSQL_SOCKET="" ++ MYSQL_PORT="" + + sql_LIBS="$sql_LIBS $mysql_LIBS" + sql_CFLAGS="$sql_CFLAGS $mysql_CFLAGS" diff --git a/lang/ferite/files/patch-docs::Makefile.in b/lang/ferite/files/patch-docs::Makefile.in index 89c4685af2cf..f5b9316e1ffd 100644 --- a/lang/ferite/files/patch-docs::Makefile.in +++ b/lang/ferite/files/patch-docs::Makefile.in @@ -1,6 +1,9 @@ ---- docs/Makefile.in.orig Sun Nov 11 11:47:01 2001 -+++ docs/Makefile.in Sun Nov 11 21:43:41 2001 -@@ -111,7 +111,7 @@ + +$FreeBSD$ + +--- docs/Makefile.in.orig Wed Jan 9 08:47:07 2002 ++++ docs/Makefile.in Wed Jan 9 12:11:41 2002 +@@ -117,7 +117,7 @@ manual.pdf diff --git a/lang/ferite/files/patch-docs::images::Makefile.in b/lang/ferite/files/patch-docs::images::Makefile.in index 81eeaba3a38c..e7ed1cc934ef 100644 --- a/lang/ferite/files/patch-docs::images::Makefile.in +++ b/lang/ferite/files/patch-docs::images::Makefile.in @@ -1,7 +1,10 @@ ---- docs/images/Makefile.in.orig Sun Nov 11 11:47:01 2001 -+++ docs/images/Makefile.in Sun Nov 11 21:43:41 2001 -@@ -114,7 +114,7 @@ - ferite_logo.xcf + +$FreeBSD$ + +--- docs/images/Makefile.in.orig Wed Jan 9 08:47:07 2002 ++++ docs/images/Makefile.in Wed Jan 9 12:11:41 2002 +@@ -117,7 +117,7 @@ + ferite_logo_black.png -imagesdir = $(prefix)/share/ferite/images diff --git a/lang/ferite/files/patch-libs::Makefile.in b/lang/ferite/files/patch-libs::Makefile.in deleted file mode 100644 index 6a9078ad9771..000000000000 --- a/lang/ferite/files/patch-libs::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/Makefile.in.orig Sun Nov 11 11:47:02 2001 -+++ libs/Makefile.in Sun Nov 11 21:43:41 2001 -@@ -112,7 +112,7 @@ - # A list of all the files in the current directory which can be regenerated - MAINTAINERCLEANFILES = - --SUBDIRS = ltdl -+SUBDIRS = - - EXTRA_DIST = - subdir = libs diff --git a/lang/ferite/files/patch-libs::triton::configure b/lang/ferite/files/patch-libs::triton::configure new file mode 100644 index 000000000000..1df7f2fb1eaa --- /dev/null +++ b/lang/ferite/files/patch-libs::triton::configure @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- libs/triton/configure.orig Wed Jan 9 08:46:55 2002 ++++ libs/triton/configure Wed Jan 9 11:35:30 2002 +@@ -2563,10 +2563,10 @@ + fi + if test "$system" = "FreeBSD"; then + cat >>confdefs.h <<\EOF +-#define USE_LTDL 1 ++#define USE_DLFCN 1 + EOF + +- loader="ltdl" ++ TRITON_LDFLAGS="" + fi + if test "$system" = "SunOS"; then + cat >>confdefs.h <<\EOF diff --git a/lang/ferite/files/patch-libs::triton::ltmain.sh b/lang/ferite/files/patch-libs::triton::ltmain.sh new file mode 100644 index 000000000000..78e740d29002 --- /dev/null +++ b/lang/ferite/files/patch-libs::triton::ltmain.sh @@ -0,0 +1,36 @@ + +$FreeBSD$ + +--- libs/triton/ltmain.sh.orig Wed Jan 9 08:46:56 2002 ++++ libs/triton/ltmain.sh Wed Jan 9 12:09:50 2002 +@@ -958,6 +958,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -2462,6 +2463,9 @@ + *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4247,10 +4251,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/lang/ferite/files/patch-ltmain.sh b/lang/ferite/files/patch-ltmain.sh index 63517d276ed8..8eff0c638517 100644 --- a/lang/ferite/files/patch-ltmain.sh +++ b/lang/ferite/files/patch-ltmain.sh @@ -1,9 +1,9 @@ $FreeBSD$ ---- ltmain.sh.orig Tue Aug 14 16:55:55 2001 -+++ ltmain.sh Thu Nov 15 18:07:04 2001 -@@ -944,6 +944,7 @@ +--- ltmain.sh.orig Wed Jan 9 08:46:56 2002 ++++ ltmain.sh Wed Jan 9 12:09:50 2002 +@@ -958,6 +958,7 @@ ;; -avoid-version) @@ -11,9 +11,9 @@ $FreeBSD$ avoid_version=yes continue ;; -@@ -2408,6 +2409,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. +@@ -2462,6 +2463,9 @@ + *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) + # FreeBSD doesn't need this... @@ -21,7 +21,7 @@ $FreeBSD$ *) # Add libc to deplibs on all other systems if necessary. if test $build_libtool_need_lc = "yes"; then -@@ -4175,10 +4179,12 @@ +@@ -4247,10 +4251,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/lang/ferite/files/patch-modules::ipc::ipc_header.h b/lang/ferite/files/patch-modules::ipc::ipc_header.h new file mode 100644 index 000000000000..b5d70a4fca1f --- /dev/null +++ b/lang/ferite/files/patch-modules::ipc::ipc_header.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- modules/ipc/ipc_header.h.orig Wed Jan 9 08:46:18 2002 ++++ modules/ipc/ipc_header.h Wed Jan 9 11:49:17 2002 +@@ -22,7 +22,7 @@ + #define DEFAULT_SEGMENT_SIZE 1024 + + +-#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) ++#if defined(__FreeBSD__) || defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) + /* union semun is defined by including */ + #else + /* according to X/OPEN we have to define it ourselves */ diff --git a/lang/ferite/files/patch-scripts::test::ipc_test.fe b/lang/ferite/files/patch-scripts::test::ipc_test.fe new file mode 100644 index 000000000000..eeeff773ff4d --- /dev/null +++ b/lang/ferite/files/patch-scripts::test::ipc_test.fe @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- scripts/test/ipc_test.fe.orig Wed Nov 21 10:01:07 2001 ++++ scripts/test/ipc_test.fe Wed Jan 9 12:05:55 2002 +@@ -16,7 +16,7 @@ + myipc = new IpcObject(); + + Console.println ("::Connecting..."); +-myipc.connect ("/bin/bash"); ++myipc.connect ("/bin/sh"); + + + Console.println ("Choose one of the following options"); diff --git a/lang/ferite/files/patch-scripts::test::test.fe b/lang/ferite/files/patch-scripts::test::test.fe index 0e131485dc0e..2568e3ca2698 100644 --- a/lang/ferite/files/patch-scripts::test::test.fe +++ b/lang/ferite/files/patch-scripts::test::test.fe @@ -1,17 +1,17 @@ $FreeBSD$ ---- scripts/test/test.fe.orig Thu Jul 26 01:10:56 2001 -+++ scripts/test/test.fe Thu Nov 15 18:53:41 2001 +--- scripts/test/test.fe.orig Sun Dec 23 14:17:44 2001 ++++ scripts/test/test.fe Wed Jan 9 11:25:18 2002 @@ -17,17 +17,17 @@ a_global_int = 10; testfile = new File(); - Console.println( "Printing Out All ext2 Partitions in /etc/fstab" ); + Console.println( "Printing Out All ufs Partitions in /etc/fstab" ); - testfile->open( "/etc/fstab", "r" ); + testfile->open( "/etc/fstab", "r", "" ); Console.println( "Here." ); - while( blam = testfile->readln() && ! testfile->eof() ) + while( blam = testfile->readln(1024) && ! testfile->eof() ) { if( blam =~ / - (\/dev\/[hs]d[a-g][1-9]) # device entry @@ -19,11 +19,11 @@ $FreeBSD$ - (\/[a-z]*(\/[a-z]*)*) # mount point - [\ \t]* # whitespace - ext2 # force adherance to ext2 -+ (\/dev\/[adw][ad][0-9][0-9]?s?[1-4]?[a-h]) # device entry -+ [\ \t]* # whitespace -+ (\/[a-z]*(\/[a-z]*)*) # mount point -+ [\ \t]* # whitespace -+ ufs # force adherance to ufs ++ (\/dev\/[adw][ad][0-9][0-9]?s?[1-4]?[a-h]) # device entry ++ [\ \t]* # whitespace ++ (\/[a-z]*(\/[a-z]*)*) # mount point ++ [\ \t]* # whitespace ++ ufs # force adherance to ufs /xoi /* make usre it's not case sensitive */ ) { diff --git a/lang/ferite/files/patch-src::Makefile.in b/lang/ferite/files/patch-src::Makefile.in deleted file mode 100644 index 3fe360fe81ef..000000000000 --- a/lang/ferite/files/patch-src::Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- src/Makefile.in.orig Sun Nov 11 11:47:04 2001 -+++ src/Makefile.in Sun Nov 11 21:42:22 2001 -@@ -116,7 +116,7 @@ - LDFLAGS = -L/usr/local/lib - - INCLUDES = -I${top_srcdir}/include -I${prefix}/include -I$(includedir) \ -- -I${top_srcdir}/include/ferite/ -I$(top_srcdir)/libs/ltdl @pcre_cflags@ -+ -I${top_srcdir}/include/ferite/ @pcre_cflags@ - - - DEFS = -DMODULE_DIR=\"$(libdir)/ferite/modules\" -DSCRIPT_DIR=\"$(libdir)/ferite/scripts\" @debugdefs@ -@@ -151,7 +151,7 @@ - ferite.c - - --libferite_la_LIBADD = $(top_builddir)/libs/ltdl/libltdlc.la -lm @pcre_libs@ $(LDFLAGS) -+libferite_la_LIBADD = -lltdl -lm @pcre_libs@ $(LDFLAGS) - libferite_la_DEPENDENCIES = $(top_builddir)/config.h - libferite_la_LDFLAGS = -version-info 0:99:0 -export-dynamic - subdir = src -- cgit v1.2.3