upgrade to 0.99.2

PR:		31964
Submitted by:	maintainer

8 files changed, 39 insertions, 48 deletions

diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index 5353f294b80b..12204cd2696f 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ferite
-PORTVERSION=	0.99.1
+PORTVERSION=	0.99.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/lang/ferite/distinfo b/lang/ferite/distinfo
index a68a0249c524..5d85edc9b95d 100644
--- a/lang/ferite/distinfo
+++ b/lang/ferite/distinfo
@@ -1 +1 @@
-MD5 (ferite-0.99.1.tar.gz) = aac4c03b8fe5b01ee86fb927bfe0e98e
+MD5 (ferite-0.99.2.tar.gz) = 036385afde16239ea17792b5a268d72d
diff --git a/lang/ferite/files/patch-Makefile.in b/lang/ferite/files/patch-Makefile.in
index e32edc0bc4d1..1f9acb1ba0be 100644
--- a/lang/ferite/files/patch-Makefile.in
+++ b/lang/ferite/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Tue Aug 21 04:21:23 2001
-+++ Makefile.in	Sat Aug 25 19:40:04 2001
-@@ -105,7 +105,7 @@
- MAINTAINERCLEANFILES = INSTALL Makefile.in aclocal.m4 config.guess 		       config.h.in config.sub configure install-sh 		       ltconfig ltmain.sh missing mkinstalldirs 		       stamp-h.in
+--- Makefile.in.orig	Sun Nov 11 11:47:00 2001
++++ Makefile.in	Sun Nov 11 21:43:41 2001
+@@ -116,7 +116,7 @@
+ 		       stamp-h.in
  
  
 -SUBDIRS = libs src builder test include modules docs scripts
diff --git a/lang/ferite/files/patch-configure b/lang/ferite/files/patch-configure
index abfc6eacb39c..7655b8194c36 100644
--- a/lang/ferite/files/patch-configure
+++ b/lang/ferite/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Oct  8 14:11:39 2001
-+++ configure	Mon Oct  8 17:45:36 2001
-@@ -260,7 +260,6 @@
+--- configure.orig	Sun Nov 11 11:47:08 2001
++++ configure	Sun Nov 11 21:39:39 2001
+@@ -261,7 +261,6 @@
  : ${ac_max_here_lines=38}
  
  ac_unique_file="src/ferite.c"
@@ -8,12 +8,12 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -2455,18 +2454,6 @@
+@@ -2666,18 +2665,6 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
 -  case $enable_ltdl_convenience in
--  no) { { echo "$as_me:2459: error: this package needs a convenience libltdl" >&5
+-  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
@@ -27,7 +27,7 @@
  # Check whether --enable-shared or --disable-shared was given.
  if test "${enable_shared+set}" = set; then
    enableval="$enable_shared"
-@@ -6257,7 +6244,7 @@
+@@ -6507,7 +6494,7 @@
  build_old_libs=$enable_static
  
  # Whether or not to add -lc for building shared libraries.
@@ -36,13 +36,13 @@
  
  # Whether or not to optimize for fast installation.
  fast_install=$enable_fast_install
-@@ -6846,13 +6833,13 @@
+@@ -7096,13 +7083,13 @@
     { (exit 1); exit 1; }; }
  fi
  
--echo "$as_me:6849: checking for pthread_mutex_lock in -lpthread" >&5
+-echo "$as_me:7099: checking for pthread_mutex_lock in -lpthread" >&5
 -echo $ECHO_N "checking for pthread_mutex_lock in -lpthread... $ECHO_C" >&6
-+echo "$as_me:6849: checking for pthread_mutex_lock in -pthread" >&5
++echo "$as_me:7099: checking for pthread_mutex_lock in -pthread" >&5
 +echo $ECHO_N "checking for pthread_mutex_lock in -pthread... $ECHO_C" >&6
  if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -51,9 +51,9 @@
 -LIBS="-lpthread  $LIBS"
 +LIBS="-pthread  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 6857 "configure"
+ #line 7107 "configure"
  #include "confdefs.h"
-@@ -6900,7 +6887,7 @@
+@@ -7150,7 +7137,7 @@
  #define HAVE_LIBPTHREAD 1
  EOF
  
@@ -62,12 +62,3 @@
  
  else
  
-@@ -6937,7 +6924,7 @@
- modules="$modules file"
- 
- echo "checking module math ..."
--math_LIBS=""
-+math_LIBS="-lm"
- math_CFLAGS=""
- 
- modules="$modules math"
diff --git a/lang/ferite/files/patch-docs::Makefile.in b/lang/ferite/files/patch-docs::Makefile.in
index 9953f8318c00..89c4685af2cf 100644
--- a/lang/ferite/files/patch-docs::Makefile.in
+++ b/lang/ferite/files/patch-docs::Makefile.in
@@ -1,7 +1,7 @@
---- docs/Makefile.in.orig	Tue Aug 21 04:21:48 2001
-+++ docs/Makefile.in	Sat Aug 25 19:42:51 2001
-@@ -102,7 +102,7 @@
- docs_DATA =  ferite_language_def.pdf
+--- 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 @@
+ manual.pdf
  
  
 -docsdir = $(prefix)/share/ferite/docs
diff --git a/lang/ferite/files/patch-docs::images::Makefile.in b/lang/ferite/files/patch-docs::images::Makefile.in
index 33ebec06df4f..81eeaba3a38c 100644
--- a/lang/ferite/files/patch-docs::images::Makefile.in
+++ b/lang/ferite/files/patch-docs::images::Makefile.in
@@ -1,11 +1,11 @@
---- docs/images/Makefile.in.orig	Tue Aug 21 04:21:49 2001
-+++ docs/images/Makefile.in	Sat Aug 25 19:43:23 2001
-@@ -102,7 +102,7 @@
- images_DATA = ferite_logo_colour_blue.png 	    ferite_logo_black.png 	    ferite_logo_black_600x300.png 	    ferite_logo_colour.png 	    ferite_logo.xcf
+--- 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
  
  
 -imagesdir = $(prefix)/share/ferite/images
 +imagesdir = $(prefix)/share/doc/ferite/images
  
  EXTRA_DIST = $(images_DATA)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ subdir = docs/images
diff --git a/lang/ferite/files/patch-libs::Makefile.in b/lang/ferite/files/patch-libs::Makefile.in
index 1c6b2a3655b3..6a9078ad9771 100644
--- a/lang/ferite/files/patch-libs::Makefile.in
+++ b/lang/ferite/files/patch-libs::Makefile.in
@@ -1,6 +1,6 @@
---- libs/Makefile.in.orig	Tue Aug 21 04:21:24 2001
-+++ libs/Makefile.in	Sat Aug 25 19:11:20 2001
-@@ -104,7 +104,7 @@
+--- 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 = 
  
@@ -8,4 +8,4 @@
 +SUBDIRS = 
  
  EXTRA_DIST = 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ subdir = libs
diff --git a/lang/ferite/files/patch-src::Makefile.in b/lang/ferite/files/patch-src::Makefile.in
index 00dd999a7c97..3fe360fe81ef 100644
--- a/lang/ferite/files/patch-src::Makefile.in
+++ b/lang/ferite/files/patch-src::Makefile.in
@@ -1,20 +1,20 @@
---- src/Makefile.in.orig	Mon Oct  8 14:18:25 2001
-+++ src/Makefile.in	Mon Oct  8 17:43:52 2001
-@@ -110,7 +110,7 @@
- 
+--- 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@
-+INCLUDES = -I${top_srcdir}/include -I${prefix}/include -I$(includedir)    			       -I${top_srcdir}/include/ferite/ @pcre_cflags@
+ 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@
-@@ -122,7 +122,7 @@
- libferite_la_SOURCES =    ferite_mem_classic.c      ferite_mem_jedi.c     ferite_variables.c     ferite_namespace.c      ferite_function.c       ferite_compile.c       ferite_execute.c       ferite_scanner.c       ferite_globals.c        ferite_parser.c        ferite_opcode.c        ferite_module.c         ferite_error.c         ferite_utils.c         ferite_stack.c 	ferite_regex.c         ferite_class.c          ferite_file.c 	 ferite_hash.c 	 ferite_uarray.c           ferite_ops.c            ferite_gc. c               ferite.c
+@@ -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
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ subdir = src