17 files changed, 341 insertions, 287 deletions

diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index 97f593ea2668..009f2ccf5b8b 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -6,39 +6,28 @@
 #
 
 PORTNAME=	ferite
-PORTVERSION=	0.99.4
+PORTVERSION=	0.99.6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client \
-		pcre.0:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+INSTALLS_SHLIB=	yes
+PLIST_SUB=	MACHINE_ARCH=${MACHINE_ARCH}
 
-EXTRA_DOCS=	AUTHORS COPYING ChangeLog README ROADMAP TODO
+MAN1=		builder.1 ferite.1
 
 .if defined(NOPORTDOCS)
-MAKE_ENV=	DOCS=""
-.else
-MAKE_ENV=	DOCS=docs
-post-install:
-.for i in ${EXTRA_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/ferite
-.endfor
+MAKE_ENV+=	NOPORTDOCS=${NOPORTDOCS}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%PTRHEAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
-		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:S/"//g}|g' \
-		${WRKSRC}/configure ${WRKSRC}/ferite-config.in
-
 .include <bsd.port.mk>
diff --git a/lang/ferite/distinfo b/lang/ferite/distinfo
index c5a5be37030d..519caaf24c32 100644
--- a/lang/ferite/distinfo
+++ b/lang/ferite/distinfo
@@ -1 +1 @@
-MD5 (ferite-0.99.4.tar.gz) = 7d9fbfba0e6b45b53aa32792031f82fd
+MD5 (ferite-0.99.6.tar.gz) = a2f7b046b32086bd28575a0bf6174f9e
diff --git a/lang/ferite/files/patch-Makefile.in b/lang/ferite/files/patch-Makefile.in
index b8ea8df6c14a..8b553a11883b 100644
--- a/lang/ferite/files/patch-Makefile.in
+++ b/lang/ferite/files/patch-Makefile.in
@@ -1,14 +1,27 @@
-
-$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
+--- Makefile.in.orig	Thu Jan  9 04:49:25 2003
++++ Makefile.in	Tue Jan 14 09:37:06 2003
+@@ -137,7 +137,7 @@
+ bin_SCRIPTS = ferite-config
  
+ fbm_DATA = LICENSE AUTHORS TODO ROADMAP DEVELOPERS ABOUT RELEASE.NOTES
+-fbmdir = $(prefix)/share/ferite
++fbmdir = $(prefix)/share/doc/ferite
  
--SUBDIRS = libs src builder test include modules docs scripts
-+SUBDIRS = libs src builder test include modules $(DOCS) scripts
+ EXTRA_DIST = shtool $(fbm_DATA) $(m4data_DATA) ferite.spec
  
- bin_SCRIPTS = ferite-config
+@@ -236,6 +236,7 @@
+ uninstall-info-am:
+ fbmDATA_INSTALL = $(INSTALL_DATA)
+ install-fbmDATA: $(fbm_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(fbmdir)
+ 	@list='$(fbm_DATA)'; for p in $$list; do \
+@@ -244,6 +245,7 @@
+ 	  echo " $(fbmDATA_INSTALL) $$d$$p $(DESTDIR)$(fbmdir)/$$f"; \
+ 	  $(fbmDATA_INSTALL) $$d$$p $(DESTDIR)$(fbmdir)/$$f; \
+ 	done
++endif
  
+ uninstall-fbmDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/lang/ferite/files/patch-configure b/lang/ferite/files/patch-configure
deleted file mode 100644
index c0de60585f6c..000000000000
--- a/lang/ferite/files/patch-configure
+++ /dev/null
@@ -1,55 +0,0 @@
-
-$FreeBSD$
-
---- 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
- 
--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:7099: checking for pthread_mutex_lock in %%PTHREAD_LIBS%%" >&5
-+echo $ECHO_N "checking for pthread_mutex_lock in %%PTHREAD_LIBS%%... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="%%PTHREAD_LIBS%%  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 7107 "configure"
- #include "confdefs.h"
-@@ -7150,7 +7150,7 @@
- #define HAVE_LIBPTHREAD 1
- EOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="%%PTHREAD_LIBS%% $LIBS"
- 
- 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 f5b9316e1ffd..feddd21e232b 100644
--- a/lang/ferite/files/patch-docs::Makefile.in
+++ b/lang/ferite/files/patch-docs::Makefile.in
@@ -1,14 +1,18 @@
-
-$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
- 
- 
--docsdir = $(prefix)/share/ferite/docs
-+docsdir = $(prefix)/share/doc/ferite
- 
- EXTRA_DIST = $(docs_DATA)
+--- docs/Makefile.in.orig	Thu Jan  9 04:49:26 2003
++++ docs/Makefile.in	Tue Jan 14 09:43:14 2003
+@@ -212,6 +212,7 @@
+ 	done
+ docsDATA_INSTALL = $(INSTALL_DATA)
+ install-docsDATA: $(docs_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(docsdir)
+ 	@list='$(docs_DATA)'; for p in $$list; do \
+@@ -220,6 +221,7 @@
+ 	  echo " $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f"; \
+ 	  $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f; \
+ 	done
++endif
  
+ uninstall-docsDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/lang/ferite/files/patch-docs::images::Makefile.in b/lang/ferite/files/patch-docs::images::Makefile.in
index e7ed1cc934ef..7140dd52180a 100644
--- a/lang/ferite/files/patch-docs::images::Makefile.in
+++ b/lang/ferite/files/patch-docs::images::Makefile.in
@@ -1,9 +1,6 @@
-
-$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 @@
+--- docs/images/Makefile.in.orig	Thu Jan  9 04:49:26 2003
++++ docs/images/Makefile.in	Tue Jan 14 09:37:43 2003
+@@ -127,7 +127,7 @@
  	    ferite_logo_black.png
  
  
@@ -12,3 +9,19 @@ $FreeBSD$
  
  EXTRA_DIST = $(images_DATA)
  subdir = docs/images
+@@ -158,6 +158,7 @@
+ uninstall-info-am:
+ imagesDATA_INSTALL = $(INSTALL_DATA)
+ install-imagesDATA: $(images_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(imagesdir)
+ 	@list='$(images_DATA)'; for p in $$list; do \
+@@ -166,6 +167,7 @@
+ 	  echo " $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f"; \
+ 	  $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f; \
+ 	done
++endif
+ 
+ uninstall-imagesDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/lang/ferite/files/patch-ferite-config.in b/lang/ferite/files/patch-ferite-config.in
deleted file mode 100644
index 630421b686fa..000000000000
--- a/lang/ferite/files/patch-ferite-config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-
-$FreeBSD$
-
---- ferite-config.in.orig	Wed Jul 25 15:47:03 2001
-+++ ferite-config.in	Thu Nov 15 18:21:57 2001
-@@ -42,11 +42,11 @@
-       if test @includedir@ != /usr/include ; then
-         includes=-I@includedir@
-       fi
--      echo $includes @debugdefs@
-+      echo %%PTHREAD_CFLAGS%% $includes @debugdefs@
-       ;;
-     --libs)
-       libdirs=-L@libdir@
--      echo $libdirs -lferite -lm -lpcre
-+      echo $libdirs -lferite %%PTHREAD_LIBS%% -lm -lpcre
-       ;;
-     --module-path)
-       echo @libdir@/ferite/modules
diff --git a/lang/ferite/files/patch-libs::aphex::src::aphex_thread.c b/lang/ferite/files/patch-libs::aphex::src::aphex_thread.c
new file mode 100644
index 000000000000..48fdee8a7ace
--- /dev/null
+++ b/lang/ferite/files/patch-libs::aphex::src::aphex_thread.c
@@ -0,0 +1,14 @@
+--- libs/aphex/src/aphex_thread.c.orig	Sat Nov 23 05:28:53 2002
++++ libs/aphex/src/aphex_thread.c	Tue Jan 14 08:40:17 2003
+@@ -134,7 +134,11 @@
+     pthread_mutex_init( &mutex->mutex, NULL );
+ #else
+     pthread_mutexattr_init( &mutex->attr );
++#if defined(__FreeBSD__)
++    pthread_mutexattr_setkind_np( &mutex->attr, PTHREAD_MUTEX_RECURSIVE );
++#else
+     pthread_mutexattr_setkind_np( &mutex->attr, PTHREAD_MUTEX_RECURSIVE_NP );
++#endif
+     pthread_mutex_init( &mutex->mutex, &mutex->attr );
+ #endif
+     mutex->recursive = 1;
diff --git a/lang/ferite/files/patch-libs::triton::configure b/lang/ferite/files/patch-libs::triton::configure
deleted file mode 100644
index 1df7f2fb1eaa..000000000000
--- a/lang/ferite/files/patch-libs::triton::configure
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$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
deleted file mode 100644
index 78e740d29002..000000000000
--- a/lang/ferite/files/patch-libs::triton::ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$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-modules::ipc::ipc_header.h b/lang/ferite/files/patch-modules::ipc::ipc_header.h
deleted file mode 100644
index b5d70a4fca1f..000000000000
--- a/lang/ferite/files/patch-modules::ipc::ipc_header.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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 <sys/sem.h> */
- #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
deleted file mode 100644
index eeeff773ff4d..000000000000
--- a/lang/ferite/files/patch-scripts::test::ipc_test.fe
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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 2568e3ca2698..4a025ceb00e2 100644
--- a/lang/ferite/files/patch-scripts::test::test.fe
+++ b/lang/ferite/files/patch-scripts::test::test.fe
@@ -1,29 +1,26 @@
-
-$FreeBSD$
-
---- scripts/test/test.fe.orig	Sun Dec 23 14:17:44 2001
-+++ scripts/test/test.fe	Wed Jan  9 11:25:18 2002
+--- scripts/test/test.fe.orig	Sat Nov 23 05:29:42 2002
++++ scripts/test/test.fe	Sat Jan 11 18:27:52 2003
 @@ -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", "" );
-    Console.println( "Here." );
-    while( blam = testfile->readln(1024) && ! testfile->eof() )
-    {
-       if( blam =~ /
--	 (\/dev\/[hs]d[a-g][1-9])   # device entry
--	 [\ \t]*                    # whitespace 
--	 (\/[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
- 	 /xoi   /* make usre it's not case sensitive */ 
-         )
-       {
+ 
+     a_global_int = 10;
+ 
+-    Console.println( "Printing Out All ext3 Partitions in /etc/fstab" );
++    Console.println( "Printing Out All ufs Partitions in /etc/fstab" );
+     testfile = Sys.openfile( "/etc/fstab", 0 );
+     Console.println( "Here." );
+     while( (blam = testfile.readln()) )
+     {
+         if( blam =~ m/
+-            (\/dev\/[hs]d[a-g][1-9])   # device entry
+-            [\ \t]*                    # whitespace
+-            (\/[a-z]*(\/[a-z]*)*)      # mount point
+-            [\ \t]*                    # whitespace
+-            ext3                       # force adherance to ext3
++            (\/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-tools::doc::Makefile.in b/lang/ferite/files/patch-tools::doc::Makefile.in
new file mode 100644
index 000000000000..0f3d288cba55
--- /dev/null
+++ b/lang/ferite/files/patch-tools::doc::Makefile.in
@@ -0,0 +1,27 @@
+--- tools/doc/Makefile.in.orig	Thu Jan  9 04:49:50 2003
++++ tools/doc/Makefile.in	Tue Jan 14 09:38:37 2003
+@@ -125,7 +125,7 @@
+ SUBDIRS = template
+ 
+ doc_DATA = parser.fe structs.fe doc.fe template.fe  
+-docdir = @prefix@/share/ferite/doc
++docdir = @prefix@/share/doc/ferite
+ 
+ bin_SCRIPTS = feritedoc
+ 
+@@ -188,6 +188,7 @@
+ uninstall-info-am:
+ docDATA_INSTALL = $(INSTALL_DATA)
+ install-docDATA: $(doc_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+ 	@list='$(doc_DATA)'; for p in $$list; do \
+@@ -196,6 +197,7 @@
+ 	  echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \
+ 	  $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \
+ 	done
++endif
+ 
+ uninstall-docDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/lang/ferite/files/patch-tools::doc::template::Makefile.in b/lang/ferite/files/patch-tools::doc::template::Makefile.in
new file mode 100644
index 000000000000..ee7405ca1cb6
--- /dev/null
+++ b/lang/ferite/files/patch-tools::doc::template::Makefile.in
@@ -0,0 +1,27 @@
+--- tools/doc/template/Makefile.in.orig	Thu Jan  9 04:49:50 2003
++++ tools/doc/template/Makefile.in	Tue Jan 14 09:39:24 2003
+@@ -124,7 +124,7 @@
+ xml_LIBS = @xml_LIBS@
+ template_DATA = text.fe html.fe
+ 
+-templatedir = @prefix@/share/ferite/doc/template
++templatedir = @prefix@/share/doc/ferite/template
+ 
+ EXTRA_DIST = $(template_DATA)
+ 
+@@ -163,6 +163,7 @@
+ uninstall-info-am:
+ templateDATA_INSTALL = $(INSTALL_DATA)
+ install-templateDATA: $(template_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(templatedir)
+ 	@list='$(template_DATA)'; for p in $$list; do \
+@@ -171,6 +172,7 @@
+ 	  echo " $(templateDATA_INSTALL) $$d$$p $(DESTDIR)$(templatedir)/$$f"; \
+ 	  $(templateDATA_INSTALL) $$d$$p $(DESTDIR)$(templatedir)/$$f; \
+ 	done
++endif
+ 
+ uninstall-templateDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/lang/ferite/files/patch-tools::doc::template::html::Makefile.in b/lang/ferite/files/patch-tools::doc::template::html::Makefile.in
new file mode 100644
index 000000000000..933cc8381eff
--- /dev/null
+++ b/lang/ferite/files/patch-tools::doc::template::html::Makefile.in
@@ -0,0 +1,27 @@
+--- tools/doc/template/html/Makefile.in.orig	Thu Jan  9 04:49:51 2003
++++ tools/doc/template/html/Makefile.in	Tue Jan 14 09:40:05 2003
+@@ -124,7 +124,7 @@
+ xml_LIBS = @xml_LIBS@
+ template_DATA = namespace.png class.png empty.png back.png var.png function.png style.css
+ 
+-templatedir = @prefix@/share/ferite/doc/template/html
++templatedir = @prefix@/share/doc/ferite/template/html
+ 
+ EXTRA_DIST = $(template_DATA)
+ subdir = tools/doc/template/html
+@@ -155,6 +155,7 @@
+ uninstall-info-am:
+ templateDATA_INSTALL = $(INSTALL_DATA)
+ install-templateDATA: $(template_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(templatedir)
+ 	@list='$(template_DATA)'; for p in $$list; do \
+@@ -163,6 +164,7 @@
+ 	  echo " $(templateDATA_INSTALL) $$d$$p $(DESTDIR)$(templatedir)/$$f"; \
+ 	  $(templateDATA_INSTALL) $$d$$p $(DESTDIR)$(templatedir)/$$f; \
+ 	done
++endif
+ 
+ uninstall-templateDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/lang/ferite/pkg-plist b/lang/ferite/pkg-plist
index f7ac5734f475..6996e482cb26 100644
--- a/lang/ferite/pkg-plist
+++ b/lang/ferite/pkg-plist
@@ -1,9 +1,10 @@
-@comment $FreeBSD$
 bin/builder
 bin/ferite
 bin/ferite-config
-include/ferite.h
+bin/feritedoc
+bin/generate-module
 include/ferite/farray.h
+include/ferite/fbuffer.h
 include/ferite/fcompile.h
 include/ferite/fdebug.h
 include/ferite/ferror.h
@@ -15,6 +16,7 @@ include/ferite/fmem.h
 include/ferite/fmem_jedi.h
 include/ferite/fmodule.h
 include/ferite/fns.h
+include/ferite/fobj.h
 include/ferite/foop.h
 include/ferite/fopcode.h
 include/ferite/fops.h
@@ -22,65 +24,162 @@ include/ferite/fparser.h
 include/ferite/fregex.h
 include/ferite/freq.h
 include/ferite/fstack.h
+include/ferite/fstring.h
 include/ferite/fstructs.h
+include/ferite/fthread.h
 include/ferite/futils.h
 include/ferite/fvariables.h
-include/triton.h
-lib/ferite/modules/array.so
-lib/ferite/modules/console.so
-lib/ferite/modules/file.so
-lib/ferite/modules/ipc.so
-lib/ferite/modules/math.so
-lib/ferite/modules/network.so
-lib/ferite/modules/reflection.so
-lib/ferite/modules/sql.so
-lib/ferite/modules/string.so
-lib/ferite/modules/system.so
-lib/ferite/modules/time.so
-lib/ferite/modules/xml.so
-lib/ferite/scripts/cgi/cgi.fe
-lib/ferite/scripts/test/array_in_script.fe
-lib/ferite/scripts/test/autoload.fe
-lib/ferite/scripts/test/error.fe
-lib/ferite/scripts/test/helloworld.fe
-lib/ferite/scripts/test/initialisers_non_function.fe
-lib/ferite/scripts/test/ipc_test.fe
-lib/ferite/scripts/test/loop.fe
-lib/ferite/scripts/test/mem.fe
-lib/ferite/scripts/test/namespace.fe
-lib/ferite/scripts/test/native_inheiritance.fe
-lib/ferite/scripts/test/recurse.fe
-lib/ferite/scripts/test/reflection.fe
-lib/ferite/scripts/test/regex.fe
-lib/ferite/scripts/test/static.fe
-lib/ferite/scripts/test/string.fe
-lib/ferite/scripts/test/super.fe
-lib/ferite/scripts/test/switch.fe
-lib/ferite/scripts/test/test.fe
-lib/ferite/scripts/test/test2.fe
-lib/ferite/scripts/test/testfncparams.fe
-lib/ferite/scripts/test/uarray.fe
-lib/ferite/scripts/test/var_args.fe
+include/ferite.h
+lib/ferite/GetOptLong.fe
+lib/ferite/array.fec
+lib/ferite/cgi/cgi.fe
+lib/ferite/complex.fec
+lib/ferite/console.fec
+lib/ferite/env.fec
+lib/ferite/examples/array_in_script.fe
+lib/ferite/examples/autoload.fe
+lib/ferite/examples/bofh.fe
+lib/ferite/examples/complex.fe
+lib/ferite/examples/dot_self.fe
+lib/ferite/examples/error.fe
+lib/ferite/examples/escape.fe
+lib/ferite/examples/fail_uses.fe
+lib/ferite/examples/foreach.fe
+lib/ferite/examples/helloworld.fe
+lib/ferite/examples/huge_but_small.fe
+lib/ferite/examples/initialisers_non_function.fe
+lib/ferite/examples/ipc_test.fe
+lib/ferite/examples/logical.fe
+lib/ferite/examples/loop.fe
+lib/ferite/examples/mem.fe
+lib/ferite/examples/method_overloading.fe
+lib/ferite/examples/namespace.fe
+lib/ferite/examples/native_inheiritance.fe
+lib/ferite/examples/numbers.fe
+lib/ferite/examples/object_bug.fe
+lib/ferite/examples/passnscls.fe
+lib/ferite/examples/pipe.fe
+lib/ferite/examples/questioncolon.fe
+lib/ferite/examples/recurse.fe
+lib/ferite/examples/reflection.fe
+lib/ferite/examples/regex.fe
+lib/ferite/examples/rename.fe
+lib/ferite/examples/rmi/server.fe
+lib/ferite/examples/rmi/test.fe
+lib/ferite/examples/rusage.fe
+lib/ferite/examples/select.fe
+lib/ferite/examples/sets.fe
+lib/ferite/examples/signal.fe
+lib/ferite/examples/sort.fe
+lib/ferite/examples/static.fe
+lib/ferite/examples/super.fe
+lib/ferite/examples/switch.fe
+lib/ferite/examples/t3.fe
+lib/ferite/examples/test.fe
+lib/ferite/examples/test2.fe
+lib/ferite/examples/testfncparams.fe
+lib/ferite/examples/thread.fe
+lib/ferite/examples/thread_exception.fe
+lib/ferite/examples/tracevar.fe
+lib/ferite/examples/uarray.fe
+lib/ferite/examples/udp.fe
+lib/ferite/examples/uname.fe
+lib/ferite/examples/var_args.fe
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/array.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/ipc.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/math.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/reflection.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/serialize.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/string.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/sys.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/test.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/thread.so
+lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%/xml.so
+lib/ferite/ipc.fec
+lib/ferite/math.fec
+lib/ferite/network.fec
+lib/ferite/posix.fec
+lib/ferite/posix_consts.fec
+lib/ferite/reflection.fec
+lib/ferite/rmi/RMILocalVariable.fe
+lib/ferite/rmi/RMIProtocolLayer.fe
+lib/ferite/rmi/RMIRemoteObject.fe
+lib/ferite/rmi/RMITranslationLayer.fe
+lib/ferite/rmi/RMITransportLayer.fe
+lib/ferite/rmi/protocol/std.fe
+lib/ferite/rmi/translation/std.fe
+lib/ferite/rmi/transport/debug.fe
+lib/ferite/rmi/transport/tcpip.fe
+lib/ferite/rmi.fe
+lib/ferite/serialize.fec
+lib/ferite/std.fec
+lib/ferite/string.fec
+lib/ferite/sys.fec
+lib/ferite/syslog.fec
+lib/ferite/test-suite/README
+lib/ferite/test-suite/array.fe
+lib/ferite/test-suite/file.fe
+lib/ferite/test-suite/reflection.fe
+lib/ferite/test-suite/serialize.fe
+lib/ferite/test-suite/string.fe
+lib/ferite/test-suite/system.fe
+lib/ferite/test.fec
+lib/ferite/thread.fec
+lib/ferite/xml.fec
 lib/libferite.a
 lib/libferite.so
 lib/libferite.so.0
+share/aclocal/ferite.m4
+%%PORTDOCS%%share/doc/ferite/ABOUT
 %%PORTDOCS%%share/doc/ferite/AUTHORS
-%%PORTDOCS%%share/doc/ferite/COPYING
-%%PORTDOCS%%share/doc/ferite/ChangeLog
-%%PORTDOCS%%share/doc/ferite/README
+%%PORTDOCS%%share/doc/ferite/DEVELOPERS
+%%PORTDOCS%%share/doc/ferite/LICENSE
+%%PORTDOCS%%share/doc/ferite/RELEASE.NOTES
 %%PORTDOCS%%share/doc/ferite/ROADMAP
 %%PORTDOCS%%share/doc/ferite/TODO
-%%PORTDOCS%%share/doc/ferite/manual.pdf
+%%PORTDOCS%%share/doc/ferite/doc.fe
+%%PORTDOCS%%share/doc/ferite/embed.pdf
 %%PORTDOCS%%share/doc/ferite/images/ferite_logo_black.png
-share/ferite/config.h
-share/ferite/libtool
-share/ferite/shtool
-@dirrm include/ferite
-@dirrm lib/ferite/modules
-@dirrm lib/ferite/scripts/cgi
-@dirrm lib/ferite/scripts/test
-@dirrm lib/ferite/scripts
-@dirrm lib/ferite
+%%PORTDOCS%%share/doc/ferite/manual.pdf
+%%PORTDOCS%%share/doc/ferite/parser.fe
+%%PORTDOCS%%share/doc/ferite/structs.fe
+%%PORTDOCS%%share/doc/ferite/template/html/back.png
+%%PORTDOCS%%share/doc/ferite/template/html/class.png
+%%PORTDOCS%%share/doc/ferite/template/html/empty.png
+%%PORTDOCS%%share/doc/ferite/template/html/function.png
+%%PORTDOCS%%share/doc/ferite/template/html/namespace.png
+%%PORTDOCS%%share/doc/ferite/template/html/style.css
+%%PORTDOCS%%share/doc/ferite/template/html/var.png
+%%PORTDOCS%%share/doc/ferite/template/html.fe
+%%PORTDOCS%%share/doc/ferite/template/text.fe
+%%PORTDOCS%%share/doc/ferite/template.fe
+%%PORTDOCS%%share/doc/ferite/variable_accessors
+share/ferite/generate-module/generate-module.fe
+share/ferite/generate-module/skel/AUTHORS
+share/ferite/generate-module/skel/ChangeLog
+share/ferite/generate-module/skel/Makefile.am
+share/ferite/generate-module/skel/Makefile.in
+share/ferite/generate-module/skel/README
+share/ferite/generate-module/skel/autogen.sh
+share/ferite/generate-module/skel/config.h.in
+share/ferite/generate-module/skel/configure.ac
+share/ferite/generate-module/skel/stamp-h.in
+share/ferite/generate-module/skel/udcl.sh
+@dirrm share/ferite/generate-module/skel
+@dirrm share/ferite/generate-module
+@dirrm share/ferite
+%%PORTDOCS%%@dirrm share/doc/ferite/template/html
+%%PORTDOCS%%@dirrm share/doc/ferite/template
 %%PORTDOCS%%@dirrm share/doc/ferite/images
 %%PORTDOCS%%@dirrm share/doc/ferite
-@dirrm share/ferite
+@dirrm lib/ferite/test-suite
+@dirrm lib/ferite/rmi/transport
+@dirrm lib/ferite/rmi/translation
+@dirrm lib/ferite/rmi/protocol
+@dirrm lib/ferite/rmi
+@dirrm lib/ferite/freebsd%%OSREL%%-%%MACHINE_ARCH%%
+@dirrm lib/ferite/examples/rmi
+@dirrm lib/ferite/examples
+@dirrm lib/ferite/cgi
+@dirrm lib/ferite
+@dirrm include/ferite