174 files changed, 1244 insertions, 4800 deletions

diff --git a/MOVED b/MOVED
index c6bc94d76a29..5d9977646b8a 100644
--- a/MOVED
+++ b/MOVED
@@ -376,3 +376,4 @@ mail/evolution-devel|mail/evolution|2003-06-11|rolled into evolution
 misc/wmessage|x11/wmessage|2003-06-12|accurate category
 net/mldonkey-src|net/mldonkey|2003-06-15|no londer needed
 news/straw||2003-06-20|port was broken with no sign of a fix
+devel/libtool|devel/libtool13|2003-06-26|move to versioned libtool portnames
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 5735de01c676..1e8bf499f07a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -268,8 +268,27 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				- Set to path of GNU autoconf shared directory (default:
 #				  according to USE_AUTOCONF_VER value)
 ##
-# USE_LIBTOOL	- Says that the port uses Libtool.  Implies GNU_CONFIGURE.
-# LIBTOOL		- Set to path of libtool (default: libtool).
+# USE_LIBTOOL_VER (PORT MAY SET THIS VALUE)
+#				- Implies USE_LIBTOOL. 
+#				- Implies WANT_LIBTOOL_VER=(value)
+# USE_LIBTOOL (PORT MAY SET THIS VALUE)
+#				- Says that the port uses Libtool.  
+#				- Implies GNU_CONFIGURE.
+#				- Implies WANT_LIBTOOL_VER?=13
+# LIBTOOL (READ-ONLY)
+#				- Set to path of libtool (default:
+#				  according to USE_LIBTOOL_VER value)
+# LIBTOOLIZE (READ-ONLY)
+#				- Set to path of libtoolize (default:
+#				  according to USE_LIBTOOL_VER value)
+# LIBTOOL_VERSION (READ-ONLY)
+#				- Exported version of USE_LIBTOOL_VER
+# LIBTOOL_SHAREDIR (READ-ONLY)
+#				- Set to path of GNU libtool shared directory (default:
+#				  according to USE_LIBTOOL_VER value)
+# LIBTOOL_LIBEXECDIR (READ-ONLY)
+#				- Set to path of GNU libtool libexec directory (default:
+#				  according to USE_LIBTOOL_VER value)
 # LIBTOOLFILES	- Files to patch for libtool (defaults: "aclocal.m4" if
 #				  USE_AUTOCONF is set, "configure" otherwise).
 # LIBTOOLFLAGS	- Additional flags to pass to ltconfig
@@ -1238,16 +1257,55 @@ AUTOCONF_DIR?=${NONEXISTENT}
 # END AUTOMAKE/AUTOCONF
 ######################################################################
 
+######################################################################
+# LIBTOOL
+
+.if defined(USE_LIBTOOL_VER)
+USE_LIBTOOL?=		yes
+WANT_LIBTOOL_VER?=	${USE_LIBTOOL_VER}
+.endif
+
 .if defined(USE_LIBTOOL)
 GNU_CONFIGURE=	yes
-BUILD_DEPENDS+=		libtool:${PORTSDIR}/devel/libtool
+WANT_LIBTOOL_VER?=	13
+.endif
+
+.if defined(WANT_LIBTOOL_VER)
+LIBTOOL_VERSION=	${WANT_LIBTOOL_VER:L}
+
+.if exists(${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}/Makefile)
+LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool${LIBTOOL_VERSION}
+LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool${LIBTOOL_VERSION}
+BUILD_DEPENDS+=		${LIBTOOL_LIBEXECDIR}/libtool:${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}
+.else
+BROKEN="unknown LIBTOOL version: ${USE_LIBTOOL_VER}"
+.endif
+
 .if defined(USE_AUTOCONF)
 LIBTOOLFILES?=		aclocal.m4
 .else
 LIBTOOLFILES?=		configure
 .endif
+
 LIBTOOLFLAGS?=		--disable-ltlibs
 .endif
+
+########## prefix to path, add to env vars
+.if defined(LIBTOOL_LIBEXECDIR)
+MAKE_ENV+=	PATH=${LIBTOOL_LIBEXECDIR}:${PATH}
+CONFIGURE_ENV+=	PATH=${LIBTOOL_LIBEXECDIR}:${PATH}
+SCRIPTS_ENV+=	PATH=${LIBTOOL_LIBEXECDIR}:${PATH}
+AUTOCONF_ENV+=	PATH=${LIBTOOL_LIBEXECDIR}:${PATH}
+AUTOMAKE_ENV+=	PATH=${LIBTOOL_LIBEXECDIR}:${PATH}
+AUTOTOOLS_ENV+=	PATH=${LIBTOOL_LIBEXECDIR}:${PATH}
+.endif # defined(ltpath)
+
+LIBTOOL?=	${LIBTOOL_LIBEXECDIR}/libtool
+LIBTOOLIZE?=	${LIBTOOL_LIBEXECDIR}/libtoolize
+
+# END LIBTOOL
+######################################################################
+
 .if defined(USE_GCC) && ${USE_GCC} == 2.95 && ( ${OSVERSION} < 400012 || ${OSVERSION} > 500034 )
 CC=				gcc295
 CXX=			g++295
@@ -1433,7 +1491,6 @@ NONEXISTENT?=	/nonexistent
 
 # Miscellaneous overridable commands:
 GMAKE?=			gmake
-LIBTOOL?=		libtool
 XMKMF?=			xmkmf -a
 MKHTMLINDEX?=		${X11BASE}/bin/mkhtmlindex
 .if exists(/sbin/md5)
@@ -3205,17 +3262,11 @@ ${stage}-${name}-script:
 .if !target(patch-libtool)
 patch-libtool:
 .if defined(USE_LIBTOOL)
-	@(if ${LIBTOOL} --version | grep -vq "1\.3\.4-freebsd-ports"; then \
-		(${ECHO_CMD} "Your libtool installation is out of date. Please remove"; \
-		 ${ECHO_CMD} "and reinstall ${PORTSDIR}/devel/libtool."; \
-		 exit 1); \
-	  fi; \
-	 LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin//*libtool^/share/libtool^'` || ${LOCALBASE}/share/libtool; \
-	 cd ${PATCH_WRKSRC}; \
+	 @(cd ${PATCH_WRKSRC}; \
 	 for file in ${LIBTOOLFILES}; do \
 		${CP} $$file $$file.tmp; \
-		${SED} -e "s^\$$ac_aux_dir/ltconfig^$${LIBTOOLDIR}/ltconfig^g" \
-			-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} $${LIBTOOLDIR}/ltmain.sh^g" \
+		${SED} -e "s^\$$ac_aux_dir/ltconfig^${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}^g" \
+			-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LIBTOOL_SHAREDIR}/ltmain.sh^g" \
 			$$file.tmp > $$file; \
 	 done);
 .else
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index a37eed4e276e..2c486ee7aa36 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libcomprex
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnupdate
@@ -16,14 +17,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Transparently handles automatic compression and decompression of files
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.2:${PORTSDIR}/ftp/curl \
+		ltdl.4:${PORTSDIR}/devel/libltdl
 
 .if !exists(/usr/bin/bzip2) 
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
-USE_LIBTOOL=	yes
-LIBTOOLFLAGS=	# none
+GNU_CONFIGURE=	yes
+# USE_LIBTOOL=	yes
+# LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl"
 INSTALLS_SHLIB=	yes
diff --git a/archivers/sectar/files/patch-aa b/archivers/sectar/files/patch-aa
deleted file mode 100644
index 53d49f3462b8..000000000000
--- a/archivers/sectar/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Feb  2 16:22:29 2001
-+++ configure	Sun Feb  4 01:17:10 2001
-@@ -2153,7 +2153,7 @@
- objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
- deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $lt_target \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 5cc46ba973b7..7c0844d25909 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -38,8 +38,8 @@ pre-patch: build-depends
 post-patch:
 # make sure everything is prepared prior to configure stage
 # pre-configure will not work since *AUTO* tools happen in-between
-	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; libtoolize \
-		--automake
+	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \
+		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
 # CFLAGS safeness
 	@${FIND} ${WRKSRC} -type f -name Makefile.am | \
 		${XARGS} -n 5 -x \
@@ -48,7 +48,7 @@ post-patch:
 
 post-configure:
 # sync the multiple libtool copies
-	@${CP} ${WRKSRC}/${LIBTOOL} ${WRKSRC}/common/mp4v2/
+	@${CP} ${WRKSRC}/libtool ${WRKSRC}/common/mp4v2/
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 511aaf0fb806..6be7061f5972 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	A powerful, fast, stable, and easily extensible sound editor for GNOME
 
-LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_GNOME=	gnomeprefix gnomehack libglade
 USE_X_PREFIX=	yes
diff --git a/audio/liba52-devel/Makefile b/audio/liba52-devel/Makefile
index d36a9234a5e0..72f5647e412a 100644
--- a/audio/liba52-devel/Makefile
+++ b/audio/liba52-devel/Makefile
@@ -58,7 +58,7 @@ post-patch:
 .endif
 
 post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index d36a9234a5e0..72f5647e412a 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -58,7 +58,7 @@ post-patch:
 .endif
 
 post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index c0f26c349c0b..11c55311ea2f 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -29,6 +29,12 @@ USE_REINPLACE=	yes
 
 WRKSRC=		${WRKDIR}/libshout
 
+# Idiot packagers
+pre-configure:
+.for file in config.guess config.sub ltmain.sh
+	${LN} -sf ${LIBTOOL_SHAREDIR}/${file} ${WRKSRC}
+.endfor
+
 post-configure:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'\
 					${WRKSRC}/examples/Makefile
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 68039b89a115..7b8c1362ee86 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gnomeprint.16:${PORTSDIR}/print/gnomeprint \
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index 0b6b90021081..56a4b1e39c68 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -57,9 +57,9 @@ GNU_CONFIGURE=	YES
 USE_REINPLACE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
 ALL_TARGET=	all
-.if defined(WITH_TCL)
-ALL_TARGET+=	libtclsqlite.la
-.endif
+#.if defined(WITH_TCL)
+#ALL_TARGET+=	libtclsqlite.la
+#.endif
 
 INSTALLS_SHLIB=	YES
 
@@ -76,7 +76,9 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
 
 post-patch:
-	${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
+			 -e "s|%%LIBTOOL%%|${LIBTOOL}|g" \
+			 ${WRKSRC}/Makefile.in
 	${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
 	${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
 	#${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
diff --git a/databases/sqlite/files/patch-makefile b/databases/sqlite/files/patch-makefile
index 1097d4d24b13..a3739872b3c1 100644
--- a/databases/sqlite/files/patch-makefile
+++ b/databases/sqlite/files/patch-makefile
@@ -13,7 +13,7 @@
   prefix = @prefix@
   exec_prefix = @exec_prefix@
   INSTALL = @INSTALL@
-! LIBTOOL = @prefix@/bin/libtool
+! LIBTOOL = %%LIBTOOL%%
   
   # Compiler options needed for programs that use the TCL library.
   #
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 0b6b90021081..56a4b1e39c68 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -57,9 +57,9 @@ GNU_CONFIGURE=	YES
 USE_REINPLACE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
 ALL_TARGET=	all
-.if defined(WITH_TCL)
-ALL_TARGET+=	libtclsqlite.la
-.endif
+#.if defined(WITH_TCL)
+#ALL_TARGET+=	libtclsqlite.la
+#.endif
 
 INSTALLS_SHLIB=	YES
 
@@ -76,7 +76,9 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
 
 post-patch:
-	${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
+			 -e "s|%%LIBTOOL%%|${LIBTOOL}|g" \
+			 ${WRKSRC}/Makefile.in
 	${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
 	${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
 	#${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
diff --git a/databases/sqlite2/files/patch-makefile b/databases/sqlite2/files/patch-makefile
index 1097d4d24b13..a3739872b3c1 100644
--- a/databases/sqlite2/files/patch-makefile
+++ b/databases/sqlite2/files/patch-makefile
@@ -13,7 +13,7 @@
   prefix = @prefix@
   exec_prefix = @exec_prefix@
   INSTALL = @INSTALL@
-! LIBTOOL = @prefix@/bin/libtool
+! LIBTOOL = %%LIBTOOL%%
   
   # Compiler options needed for programs that use the TCL library.
   #
diff --git a/devel/Makefile b/devel/Makefile
index c931513d6a47..d7bd7ed0d67b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -333,6 +333,7 @@
     SUBDIR += libhash
     SUBDIR += libhoard
     SUBDIR += libical
+    SUBDIR += libltdl
     SUBDIR += libmba
     SUBDIR += libmcve
     SUBDIR += libmtrie
@@ -356,7 +357,8 @@
     SUBDIR += libtai
     SUBDIR += libtar
     SUBDIR += libtecla
-    SUBDIR += libtool
+    SUBDIR += libtool13
+    SUBDIR += libtool14
     SUBDIR += libukcprog
     SUBDIR += libunicode
     SUBDIR += libusb
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index cd35ce630a3c..3072f3b6312a 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -14,7 +14,6 @@ DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
 MAINTAINER=	rodrigc@attbi.com
 COMMENT=	The Apache Group's Portability Library
 
-BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
@@ -22,7 +21,8 @@ WANT_AUTOCONF_VER=	253
 
 USE_PERL5=		yes
 USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
+USE_LIBTOOL_VER=	14
+LIBTOOLFILES=		# none
 INSTALLS_SHLIB=		yes
 
 WRKSRC=	${WRKDIR}
@@ -40,8 +40,9 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 			--with-iconv=${PREFIX}
 
 pre-configure:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ./buildconf
-	cd ${WRKDIR}/apr-util-${PORTVERSION}; ./buildconf \
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
+	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
+		${SETENV} ${SCRIPTS_ENV} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 
 do-configure:
diff --git a/devel/apr/files/patch-buildconf b/devel/apr/files/patch-buildconf
new file mode 100644
index 000000000000..9d06665e6300
--- /dev/null
+++ b/devel/apr/files/patch-buildconf
@@ -0,0 +1,7 @@
+--- apr-0.9.3/buildconf.orig	Wed May 15 16:47:09 2002
++++ apr-0.9.3/buildconf	Wed Feb 19 23:24:35 2003
+@@ -83,3 +83,3 @@
+ ltpath=`dirname $libtoolize`
+-ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
++ltfile=`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4
+ 
diff --git a/devel/apr/pkg-plist b/devel/apr/pkg-plist
index 4d3dddda0e39..ae682db4c52d 100644
--- a/devel/apr/pkg-plist
+++ b/devel/apr/pkg-plist
@@ -66,11 +66,9 @@ include/apr-0/apu_version.h
 lib/apr.exp
 lib/aprutil.exp
 lib/libapr-0.a
-lib/libapr-0.la
 lib/libapr-0.so
 lib/libapr-0.so.9
 lib/libaprutil-0.a
-lib/libaprutil-0.la
 lib/libaprutil-0.so
 lib/libaprutil-0.so.9
 @dirrm build
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index cd35ce630a3c..3072f3b6312a 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -14,7 +14,6 @@ DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
 MAINTAINER=	rodrigc@attbi.com
 COMMENT=	The Apache Group's Portability Library
 
-BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
@@ -22,7 +21,8 @@ WANT_AUTOCONF_VER=	253
 
 USE_PERL5=		yes
 USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
+USE_LIBTOOL_VER=	14
+LIBTOOLFILES=		# none
 INSTALLS_SHLIB=		yes
 
 WRKSRC=	${WRKDIR}
@@ -40,8 +40,9 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 			--with-iconv=${PREFIX}
 
 pre-configure:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ./buildconf
-	cd ${WRKDIR}/apr-util-${PORTVERSION}; ./buildconf \
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
+	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
+		${SETENV} ${SCRIPTS_ENV} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 
 do-configure:
diff --git a/devel/apr0/files/patch-buildconf b/devel/apr0/files/patch-buildconf
new file mode 100644
index 000000000000..9d06665e6300
--- /dev/null
+++ b/devel/apr0/files/patch-buildconf
@@ -0,0 +1,7 @@
+--- apr-0.9.3/buildconf.orig	Wed May 15 16:47:09 2002
++++ apr-0.9.3/buildconf	Wed Feb 19 23:24:35 2003
+@@ -83,3 +83,3 @@
+ ltpath=`dirname $libtoolize`
+-ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
++ltfile=`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4
+ 
diff --git a/devel/apr0/pkg-plist b/devel/apr0/pkg-plist
index 4d3dddda0e39..ae682db4c52d 100644
--- a/devel/apr0/pkg-plist
+++ b/devel/apr0/pkg-plist
@@ -66,11 +66,9 @@ include/apr-0/apu_version.h
 lib/apr.exp
 lib/aprutil.exp
 lib/libapr-0.a
-lib/libapr-0.la
 lib/libapr-0.so
 lib/libapr-0.so.9
 lib/libaprutil-0.a
-lib/libaprutil-0.la
 lib/libaprutil-0.so
 lib/libaprutil-0.so.9
 @dirrm build
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index cd35ce630a3c..3072f3b6312a 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -14,7 +14,6 @@ DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
 MAINTAINER=	rodrigc@attbi.com
 COMMENT=	The Apache Group's Portability Library
 
-BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
@@ -22,7 +21,8 @@ WANT_AUTOCONF_VER=	253
 
 USE_PERL5=		yes
 USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
+USE_LIBTOOL_VER=	14
+LIBTOOLFILES=		# none
 INSTALLS_SHLIB=		yes
 
 WRKSRC=	${WRKDIR}
@@ -40,8 +40,9 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 			--with-iconv=${PREFIX}
 
 pre-configure:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ./buildconf
-	cd ${WRKDIR}/apr-util-${PORTVERSION}; ./buildconf \
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
+	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
+		${SETENV} ${SCRIPTS_ENV} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 
 do-configure:
diff --git a/devel/apr1/files/patch-buildconf b/devel/apr1/files/patch-buildconf
new file mode 100644
index 000000000000..9d06665e6300
--- /dev/null
+++ b/devel/apr1/files/patch-buildconf
@@ -0,0 +1,7 @@
+--- apr-0.9.3/buildconf.orig	Wed May 15 16:47:09 2002
++++ apr-0.9.3/buildconf	Wed Feb 19 23:24:35 2003
+@@ -83,3 +83,3 @@
+ ltpath=`dirname $libtoolize`
+-ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
++ltfile=`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4
+ 
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
index 4d3dddda0e39..ae682db4c52d 100644
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -66,11 +66,9 @@ include/apr-0/apu_version.h
 lib/apr.exp
 lib/aprutil.exp
 lib/libapr-0.a
-lib/libapr-0.la
 lib/libapr-0.so
 lib/libapr-0.so.9
 lib/libaprutil-0.a
-lib/libaprutil-0.la
 lib/libaprutil-0.so
 lib/libaprutil-0.so.9
 @dirrm build
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index cd35ce630a3c..3072f3b6312a 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -14,7 +14,6 @@ DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
 MAINTAINER=	rodrigc@attbi.com
 COMMENT=	The Apache Group's Portability Library
 
-BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
@@ -22,7 +21,8 @@ WANT_AUTOCONF_VER=	253
 
 USE_PERL5=		yes
 USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
+USE_LIBTOOL_VER=	14
+LIBTOOLFILES=		# none
 INSTALLS_SHLIB=		yes
 
 WRKSRC=	${WRKDIR}
@@ -40,8 +40,9 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 			--with-iconv=${PREFIX}
 
 pre-configure:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ./buildconf
-	cd ${WRKDIR}/apr-util-${PORTVERSION}; ./buildconf \
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
+	cd ${WRKDIR}/apr-util-${PORTVERSION}; \
+		${SETENV} ${SCRIPTS_ENV} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 
 do-configure:
diff --git a/devel/apr2/files/patch-buildconf b/devel/apr2/files/patch-buildconf
new file mode 100644
index 000000000000..9d06665e6300
--- /dev/null
+++ b/devel/apr2/files/patch-buildconf
@@ -0,0 +1,7 @@
+--- apr-0.9.3/buildconf.orig	Wed May 15 16:47:09 2002
++++ apr-0.9.3/buildconf	Wed Feb 19 23:24:35 2003
+@@ -83,3 +83,3 @@
+ ltpath=`dirname $libtoolize`
+-ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
++ltfile=`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4
+ 
diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist
index 4d3dddda0e39..ae682db4c52d 100644
--- a/devel/apr2/pkg-plist
+++ b/devel/apr2/pkg-plist
@@ -66,11 +66,9 @@ include/apr-0/apu_version.h
 lib/apr.exp
 lib/aprutil.exp
 lib/libapr-0.a
-lib/libapr-0.la
 lib/libapr-0.so
 lib/libapr-0.so.9
 lib/libaprutil-0.a
-lib/libaprutil-0.la
 lib/libaprutil-0.so
 lib/libaprutil-0.so.9
 @dirrm build
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index f2d48b0798d6..7ede9914fea3 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	directfb
 PORTVERSION=	0.9.16
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.directfb.org/download/DirectFB/
 DISTNAME=	DirectFB-${PORTVERSION}
diff --git a/devel/directfb/pkg-plist b/devel/directfb/pkg-plist
index d00f1d302f86..a97efcf96b05 100644
--- a/devel/directfb/pkg-plist
+++ b/devel/directfb/pkg-plist
@@ -62,13 +62,18 @@ include/directfb-internal/misc/utf8.h
 include/directfb-internal/misc/util.h
 include/directfb-internal/windows/idirectfbwindow.h
 lib/libdirectfb-0.9.so.16
-lib/libdirectfb.a
 lib/libdirectfb.so
+lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_default.la
 lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_default.so
+%%WITH_FREETYPE2%%lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
 %%WITH_FREETYPE2%%lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
+lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
 lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
+lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
 lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
+lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
 lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
+lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
 lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
 libdata/pkgconfig/directfb.pc
 libdata/pkgconfig/directfb-internal.pc
diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index fe6e1d76b734..573ac0226009 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -5,26 +5,53 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libtool
-PORTVERSION=	1.3.4
-PORTREVISION=	4
+PORTNAME?=	libtool
+PORTVERSION=	1.4.3
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
+DISTNAME=	libtool-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
-COMMENT=	Generic shared library support script
-
-# This port has not been upgraded to 1.4 because it is used by about 30% of
-# the ports collection, and more testing is needed.  If someone can supply a
-# working patch then it will be upgraded.
+COMMENT?=	Generic shared library support script
 
+LATEST_LINK?=	libtool14
+GNU_CONFIGURE=	 yes
+CONFIGURE_ARGS?= --disable-ltdl-install
+CONFIGURE_ARGS+= --program-suffix=14
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PREFIX=${PREFIX}
+CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool14
+USE_REINPLACE=	yes
+
+.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
+pre-everything:
+	@${ECHO} ===========================================================
+	@${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables"
+	@${ECHO} "defined either in environment or in make(1) arguments."
+	@${ECHO} "Please undefine them and try again."
+	@${ECHO} ===========================================================
+	@${FALSE}
+.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
+
+post-extract:
+	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool14.m4
+	@${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl14.m4
+	@${REINPLACE_CMD} -e 's|libtool.m4|libtool14.m4|g' \
+			  -e 's|ltdl.m4|ltdl14.m4|g' ${WRKSRC}/Makefile.in
+	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool14.info
+	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool14.texi
 
-.ifdef USE_LIBTOOL
-.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.if ${PORTNAME} == "libtool"
+post-install:
+	@-${RM} -fr ${PREFIX}/libexec/libtool14
+	${MKDIR} ${PREFIX}/libexec/libtool14
+.for i in libtool libtoolize
+	${LN} -sf ${PREFIX}/bin/${i}14 ${PREFIX}/libexec/libtool14/${i}
+.endfor
+.for i in config.guess config.sub
+	${MV} ${PREFIX}/share/libtool14/${i}14 ${PREFIX}/share/libtool14/${i}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/gnu-libtool/distinfo b/devel/gnu-libtool/distinfo
index c39e3aaff92d..7cace71782d6 100644
--- a/devel/gnu-libtool/distinfo
+++ b/devel/gnu-libtool/distinfo
@@ -1 +1 @@
-MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e
+MD5 (libtool-1.4.3.tar.gz) = d11a3c835449d7fa50a025dc9c01ad81
diff --git a/devel/gnu-libtool/files/patch-aa b/devel/gnu-libtool/files/patch-aa
index 91ff871e5ae3..8ba2b3510563 100644
--- a/devel/gnu-libtool/files/patch-aa
+++ b/devel/gnu-libtool/files/patch-aa
@@ -1,11 +1,15 @@
---- doc/libtool.texi.orig	Tue Jun 29 15:48:12 1999
-+++ doc/libtool.texi	Tue Aug 31 23:41:25 1999
-@@ -11,7 +11,7 @@
- @set MAILLIST the libtool mailing list @email{libtool@@gnu.org}
- @set objdir .libs
+--- doc/libtool14.info.orig	Wed Oct 23 02:26:36 2002
++++ doc/libtool14.info	Mon Feb 17 01:46:42 2003
+@@ -3,5 +3,5 @@
  
--@dircategory GNU programming tools
-+@dircategory Programming & development tools
- @direntry
- * Libtool: (libtool).           Generic shared library support script.
- @end direntry
+-INFO-DIR-SECTION GNU programming tools
++INFO-DIR-SECTION Programming & development tools
+ START-INFO-DIR-ENTRY
+-* Libtool: (libtool).           Generic shared library support script.
++* Libtool: (libtool14).           Generic shared library support script.
+ END-INFO-DIR-ENTRY
+@@ -10,3 +10,3 @@
+ START-INFO-DIR-ENTRY
+-* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
++* libtoolize: (libtool14)Invoking libtoolize.     Adding libtool support.
+ END-INFO-DIR-ENTRY
diff --git a/devel/gnu-libtool/files/patch-ab b/devel/gnu-libtool/files/patch-ab
index f96b92eac308..384c86a0bd18 100644
--- a/devel/gnu-libtool/files/patch-ab
+++ b/devel/gnu-libtool/files/patch-ab
@@ -1,11 +1,50 @@
---- doc/Makefile.in.orig	Fri Jul  2 09:24:54 1999
-+++ doc/Makefile.in	Tue Aug 31 23:41:57 1999
-@@ -70,7 +70,7 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
+--- doc/Makefile.in.orig	Wed Oct 23 02:51:04 2002
++++ doc/Makefile.in	Mon Feb 17 02:01:16 2003
+@@ -72,3 +72,3 @@
  LN_S = @LN_S@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  NM = @NM@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
+@@ -85,4 +85,4 @@
+ AUTOMAKE_OPTIONS = gnits
+-info_TEXINFOS = libtool.texi
+-libtool_TEXINFOS = PLATFORMS fdl.texi
++info_TEXINFOS = libtool14.texi
++libtool14_TEXINFOS = PLATFORMS fdl.texi
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -90,6 +90,6 @@
+ TEXI2DVI = texi2dvi
+-INFO_DEPS = libtool.info
+-DVIS = libtool.dvi
+-TEXINFOS = libtool.texi
+-DIST_COMMON =  $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \
++INFO_DEPS = libtool14.info
++DVIS = libtool14.dvi
++TEXINFOS = libtool14.texi
++DIST_COMMON =  $(libtool14_TEXINFOS) Makefile.am Makefile.in mdate-sh \
+ stamp-vti texinfo.tex version.texi
+@@ -115,4 +115,4 @@
+ 
+-$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in
+-	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp
++$(srcdir)/stamp-vti: libtool14.texi $(top_srcdir)/configure.in
++	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool14.texi`" > vti.tmp
+ 	@echo "@set EDITION $(VERSION)" >> vti.tmp
+@@ -135,4 +135,4 @@
+ 
+-libtool.info: libtool.texi version.texi $(libtool_TEXINFOS)
+-libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS)
++libtool14.info: libtool14.texi version.texi $(libtool14_TEXINFOS)
++libtool14.dvi: libtool14.texi version.texi $(libtool14_TEXINFOS)
+ 
+@@ -235,6 +235,6 @@
+ mostlyclean-aminfo:
+-	-rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \
+-	  libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \
+-	  libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \
+-	  libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn
++	-rm -f libtool14.aux libtool14.cp libtool14.cps libtool14.dvi libtool14.fn \
++	  libtool14.fns libtool14.ky libtool14.kys libtool14.ps libtool14.log \
++	  libtool14.pg libtool14.toc libtool14.tp libtool14.tps libtool14.vr \
++	  libtool14.vrs libtool14.op libtool14.tr libtool14.cv libtool14.cn
+ 
diff --git a/devel/gnu-libtool/files/patch-ac b/devel/gnu-libtool/files/patch-ac
deleted file mode 100644
index 3a1894e10003..000000000000
--- a/devel/gnu-libtool/files/patch-ac
+++ /dev/null
@@ -1,157 +0,0 @@
-
-$FreeBSD$
-
---- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Sat Jun  8 11:48:12 2002
-@@ -169,7 +169,7 @@
- # Constants:
- PROGRAM=ltconfig
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-@@ -185,6 +185,8 @@
- # which needs '.lib').
- enable_static=yes
- enable_fast_install=yes
-+install_ltlibs=yes
-+release_suffix=yes
- enable_dlopen=unknown
- enable_win32_dll=no
- ltmain=
-@@ -242,10 +244,14 @@
- 
- Generate a system-specific libtool script.
- 
-+    --build                no-op to keep compatability with configure scripts generated for 1.4
-     --debug                enable verbose shell tracing
-     --disable-shared       do not build shared libraries
-     --disable-static       do not build static libraries
-     --disable-fast-install do not optimize for fast installation
-+    --disable-ltlibs       don't install the .la archives
-+    --release-ignore       don't use -release specification
-+    --release-suffix       use -release suffix for all files
-     --enable-dlopen        enable dlopen support
-     --enable-win32-dll     enable building dlls on win32 hosts
-     --help                 display this help and exit
-@@ -268,6 +274,8 @@
-   exit 0
-   ;;
- 
-+  --build=*) ;;
-+
-   --debug)
-     echo "$progname: enabling shell trace mode"
-     set -x
-@@ -279,6 +287,12 @@
- 
-   --disable-fast-install) enable_fast_install=no ;;
- 
-+  --disable-ltlibs) install_ltlibs=no ;;
-+
-+  --release-ignore) release_suffix=no ;;
-+
-+  --release-suffix) release_suffix=all ;;
-+
-   --enable-dlopen) enable_dlopen=yes ;;
- 
-   --enable-win32-dll) enable_win32_dll=yes ;;
-@@ -971,11 +985,11 @@
-   $rm conftest.dat
-   if ln -s X conftest.dat 2>/dev/null; then
-     $rm conftest.dat
--    LN_S="ln -s"
-+    LN_S="ln -sf"
-   else
-     LN_S=ln
-   fi
--  if test "$LN_S" = "ln -s"; then
-+  if test "$LN_S" = "ln -sf"; then
-     echo "$ac_t"yes 1>&6
-   else
-     echo "$ac_t"no 1>&6
-@@ -1226,8 +1240,8 @@
- 
-   *)
-     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-     else
-       ld_shlibs=no
-     fi
-@@ -1353,14 +1367,6 @@
-     hardcode_shlibpath_var=no
-     ;;
- 
--  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
--    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
--
-   hpux9* | hpux10* | hpux11*)
-     case "$host_os" in
-     hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1781,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+sys_lib_search_path_spec="/lib /usr/lib"
- file_magic_cmd=
- file_magic_test_file=
- deplibs_check_method='unknown'
-@@ -1873,19 +1879,22 @@
-   version_type=freebsd-$objformat
-   case "$version_type" in
-     freebsd-elf*)
--      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
--      file_magic_cmd=/usr/bin/file
--      file_magic_test_file=`echo /usr/lib/libc.so*`
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
--      need_version=no
--      need_lib_prefix=no
-+      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
-       ;;
-     freebsd-*)
--      deplibs_check_method=unknown
--      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
--      need_version=yes
-+      deplibs_check_method='file_magic FreeBSD.* shared library'
-       ;;
-   esac
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test "$release_suffix" = all; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
-+  fi 
-+  need_version=no
-+  need_lib_prefix=no
-+  finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   case "$host_os" in
-   freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2785,15 @@
- 
- # Shell to use when invoking shell scripts.
- SHELL=$LTSHELL
-+
-+# Whether to waste disk space.
-+install_ltlibs=$install_ltlibs 
-+
-+# What to do with -release.
-+#  yes - only for shared archive
-+#  no  - ingnore
-+#  all - for all archives
-+release_suffix=$release_suffix
- 
- # Whether or not to build shared libraries.
- build_libtool_libs=$enable_shared
diff --git a/devel/gnu-libtool/files/patch-ad b/devel/gnu-libtool/files/patch-ad
index 3ec71700ffbb..c04c4dd4a24c 100644
--- a/devel/gnu-libtool/files/patch-ad
+++ b/devel/gnu-libtool/files/patch-ad
@@ -1,226 +1,32 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Tue Dec  7 23:50:49 1999
-+++ ltmain.sh	Thu May  2 10:24:05 2002
-@@ -23,6 +23,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
+--- ltmain.sh.orig	Mon Sep 10 22:33:26 2001
++++ ltmain.sh	Wed Jan 23 16:39:22 2002
+@@ -1062,6 +1062,12 @@
  
-+EXPR_COMPAT=1
-+export EXPR_COMPAT
-+
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-   # Discard the --no-reexec flag, and continue.
-@@ -54,7 +57,7 @@
- # Constants.
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- 
- default_mode=
-@@ -952,7 +955,11 @@
- 	  continue
- 	  ;;
- 	release)
--	  release="-$arg"
-+	  if test "$release_suffix" = all; then
-+	    release="$arg"
-+	  elif test "$release_suffix" = yes; then
-+	    release="-$arg"
-+	  fi
- 	  prev=
- 	  continue
- 	  ;;
-@@ -1005,6 +1012,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -1091,6 +1099,10 @@
- 	deplibs="$deplibs $arg"
- 	;;
- 
-+      -?thread)
-+	deplibs="$deplibs $arg"
-+	;;
-+
        -module)
  	module=yes
++	case $host in
++	*-*-freebsd*)
++	  # Do not build the useless static library
++	  build_old_libs=no
++	  ;;
++	esac
  	continue
-@@ -1168,7 +1180,7 @@
- 
-       *.o | *.obj | *.a | *.lib)
- 	# A standard object.
--	objs="$objs $arg"
-+	libobjs="$libobjs $arg"
  	;;
  
-       *.lo)
-@@ -1603,12 +1615,6 @@
- 	exit 1
-       fi
- 
--      # How the heck are we supposed to write a wrapper for a shared library?
--      if test -n "$link_against_libtool_libs"; then
--	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
--	 exit 1
--      fi
--
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
-       fi
-@@ -1795,6 +1801,9 @@
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
+@@ -2444,6 +2450,9 @@
+ 	  *-*-openbsd*)
+ 	    # 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.
- 	  deplibs="$deplibs -lc"
-@@ -1802,6 +1811,94 @@
- 	esac
-       fi
- 
-+      if test -n "$rpath$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	for libdir in $rpath $xrpath; do
-+	  # This is the magic to use -rpath.
-+	  case "$compile_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) compile_rpath="$compile_rpath $libdir" ;;
-+	  esac
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+      fi
-+
-+      # Now hardcode the library paths
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $compile_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      compile_rpath="$rpath"
-+
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$finalize_perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      finalize_rpath="$rpath"
-+
-       # Create the output directory, or remove our outputs if we need to.
-       if test -d $output_objdir; then
- 	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-@@ -1817,7 +1914,11 @@
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	if test "$release_suffix" = all; then
-+	 oldlibs="$oldlibs $output_objdir/$libname$release.$libext"
-+	else
-+	 oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	fi
- 
- 	# Transform .lo files to .o files.
- 	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-@@ -2011,7 +2112,11 @@
- 	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
--	      oldlibs="$output_objdir/$libname.$libext"
-+	      if test "$release_suffix" = all; then
-+	        oldlibs="$output_objdir/$libname$release.$libext"
-+	      else
-+	        oldlibs="$output_objdir/$libname.$libext"
-+	      fi
- 	      build_libtool_libs=module
- 	      build_old_libs=yes
- 	    else
-@@ -3059,7 +3164,11 @@
-     case "$output" in
-     *.la)
-       old_library=
--      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      if test "$release_suffix" = all; then
-+        test "$build_old_libs" = yes && old_library="$libname$release.$libext"
-+      else
-+        test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      fi
-       $show "creating $output"
- 
-       if test -n "$xrpath"; then
-@@ -3348,10 +3457,12 @@
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4210,10 +4219,17 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
@@ -228,20 +34,17 @@ $FreeBSD$
 -	instname="$dir/$name"i
 -	$show "$install_prog $instname $destdir/$name"
 -	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	if test "$install_ltlibs" = yes; then
++	case $host in
++	*-*-freebsd*)
++	  # Do not install the useless pseudo-library
++	  ;;
++	*)
 +	  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
++	  ;;
++	esac
  
  	# Maybe install the static library, too.
  	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-@@ -3440,7 +3551,6 @@
- 	    fi
- 	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
--	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- 	      finalize=no
- 	    fi
- 	  done
diff --git a/devel/gnu-libtool/files/patch-ae b/devel/gnu-libtool/files/patch-ae
index c92b003b58cd..62aeecd4ae60 100644
--- a/devel/gnu-libtool/files/patch-ae
+++ b/devel/gnu-libtool/files/patch-ae
@@ -1,13 +1,14 @@
---- configure.orig	Fri Jul  2 09:01:56 1999
-+++ configure	Tue Aug 31 23:45:29 1999
-@@ -1853,10 +1853,6 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
+--- configure.orig	Wed Oct 23 02:26:05 2002
++++ configure	Mon Feb 17 02:04:57 2003
+@@ -865,3 +865,3 @@
+ 
+-PACKAGE=libtool
++PACKAGE=libtool14
+ 
+@@ -6089,6 +6089,2 @@
        esac
 -  case "$ac_given_INSTALL" in
 -        [/$]*) INSTALL="$ac_given_INSTALL" ;;
 -        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 -        esac
  
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/devel/gnu-libtool/files/patch-af b/devel/gnu-libtool/files/patch-af
index beb6be3b456f..1298dce981e1 100644
--- a/devel/gnu-libtool/files/patch-af
+++ b/devel/gnu-libtool/files/patch-af
@@ -1,13 +1,11 @@
---- libltdl/Makefile.in.orig	Tue Dec  7 13:03:38 1999
-+++ libltdl/Makefile.in	Mon Jan 17 16:35:34 2000
-@@ -326,17 +326,16 @@
- distdir: $(DISTFILES)
- 	-rm -rf $(distdir)
+--- libltdl/Makefile.in.orig	Wed Oct 23 02:26:07 2002
++++ libltdl/Makefile.in	Mon Feb 17 02:06:58 2003
+@@ -342,3 +342,3 @@
  	mkdir $(distdir)
 -	-chmod 777 $(distdir)
 +	-chmod 555 $(distdir)
  	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
+@@ -346,9 +346,8 @@
  	  if test -d $$d/$$file; then \
 -	    cp -pr $$d/$$file $(distdir)/$$file; \
 +	    echo no copy dir $$d/$$file; \
@@ -20,5 +18,20 @@
  	done
 +	-chmod a+x $(distdir)/configure
  info-am:
- info: info-am
- dvi-am:
+@@ -452,4 +451,4 @@
+ local-install-files: $(DISTFILES)
+-	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
++	-rm -rf $(DESTDIR)$(datadir)/libtool14/libltdl
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool14/libltdl
+ 	@for file in $(DISTFILES); do \
+@@ -457,6 +456,6 @@
+ 	  if test -d $$d/$$file; then \
+-	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
++	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file; \
+ 	  else \
+-	    test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
+-	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
++	    test -f $(DESTDIR)$(datadir)/libtool14/libltdl/$$file \
++	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file || :; \
+ 	  fi; \
diff --git a/devel/gnu-libtool/files/patch-ag b/devel/gnu-libtool/files/patch-ag
deleted file mode 100644
index 5fdcd1924641..000000000000
--- a/devel/gnu-libtool/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libltdl/configure	2001/01/31 10:58:38	1.1
-+++ libltdl/configure	2001/01/31 10:59:14
-@@ -1455,7 +1455,7 @@
- esac
- 
- # Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
-+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
diff --git a/devel/gnu-libtool/files/patch-libtoolize.in b/devel/gnu-libtool/files/patch-libtoolize.in
new file mode 100644
index 000000000000..b92bbeb9d8e9
--- /dev/null
+++ b/devel/gnu-libtool/files/patch-libtoolize.in
@@ -0,0 +1,9 @@
+--- libtoolize.in.orig	Sun Oct 13 16:21:38 2002
++++ libtoolize.in	Mon Feb 17 01:56:19 2003
+@@ -39,4 +39,4 @@
+ 
+-libtool_m4="$aclocaldir/libtool.m4"
+-ltdl_m4="$aclocaldir/ltdl.m4"
++libtool_m4="$aclocaldir/libtool14.m4"
++ltdl_m4="$aclocaldir/ltdl14.m4"
+ 
diff --git a/devel/gnu-libtool/pkg-descr.libltdl b/devel/gnu-libtool/pkg-descr.libltdl
new file mode 100644
index 000000000000..e57b99f21a5c
--- /dev/null
+++ b/devel/gnu-libtool/pkg-descr.libltdl
@@ -0,0 +1,9 @@
+This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
+
+It supports the following dlopen interfaces:
+* dlopen (Solaris, Linux and various BSD flavors)
+* shl_load (HP-UX)
+* LoadLibrary (Win16 and Win32)
+* load_add_on (BeOS)
+* GNU DLD (emulates dynamic linking for static libraries)
+* libtool's dlpreopen
diff --git a/devel/gnu-libtool/pkg-plist b/devel/gnu-libtool/pkg-plist
index f057cdf134b2..c0510d95ad88 100644
--- a/devel/gnu-libtool/pkg-plist
+++ b/devel/gnu-libtool/pkg-plist
@@ -1,29 +1,28 @@
-bin/libtool
-bin/libtoolize
-include/ltdl.h
-@unexec install-info --delete %D/info/libtool.info %D/info/dir
-info/libtool.info
-@exec install-info %D/info/libtool.info %D/info/dir
-lib/libltdl.a
-lib/libltdl.so
-lib/libltdl.so.1
-share/aclocal/libtool.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
-share/libtool/libltdl/acinclude.m4
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.in
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/stamp-h.in
-share/libtool/ltconfig
-share/libtool/ltmain.sh
-@dirrm share/libtool/libltdl
-@dirrm share/libtool
+@comment $FreeBSD$
+bin/libtool14
+bin/libtoolize14
+libexec/libtool14/libtool
+libexec/libtool14/libtoolize
+@unexec install-info --delete %D/info/libtool14.info %D/info/dir
+info/libtool14.info
+@exec install-info %D/info/libtool14.info %D/info/dir
+share/aclocal/libtool14.m4
+share/aclocal/ltdl14.m4
+share/libtool14/config.guess
+share/libtool14/config.sub
+share/libtool14/libltdl/COPYING.LIB
+share/libtool14/libltdl/Makefile.am
+share/libtool14/libltdl/Makefile.in
+share/libtool14/libltdl/README
+share/libtool14/libltdl/acinclude.m4
+share/libtool14/libltdl/aclocal.m4
+share/libtool14/libltdl/config-h.in
+share/libtool14/libltdl/configure
+share/libtool14/libltdl/configure.in
+share/libtool14/libltdl/ltdl.c
+share/libtool14/libltdl/ltdl.h
+share/libtool14/libltdl/stamp-h.in
+share/libtool14/ltmain.sh
+@dirrm share/libtool14/libltdl
+@dirrm share/libtool14
+@dirrm libexec/libtool14
diff --git a/devel/gnu-libtool/pkg-plist.libltdl b/devel/gnu-libtool/pkg-plist.libltdl
new file mode 100644
index 000000000000..1a8458d1a65c
--- /dev/null
+++ b/devel/gnu-libtool/pkg-plist.libltdl
@@ -0,0 +1,5 @@
+@comment $FreeBSD$
+include/ltdl.h
+lib/libltdl.a
+lib/libltdl.so
+lib/libltdl.so.4
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index de530a374752..feed020d00c6 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -16,11 +16,10 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ class library of common digital signal processing functions
 
-# dont use "USE_LIBTOOL=yes" because there's no configure script
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
-
 WRKSRC=		${WRKDIR}/libdsp-src/${PORTNAME:S/dsp/DSP/}-${PORTVERSION}
 
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	# none
 USE_GMAKE=	yes
 MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MKDIR="${MKDIR}" \
 		INLINE_VER="${INLINE_VER}"
@@ -29,6 +28,10 @@ INSTALLS_SHLIB=	yes
 
 INLINE_VER=	1.2.5
 
+# There's no configure script, but we need libtool to build
+do-configure:
+	@${DO_NADA}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
diff --git a/devel/libltdl/Makefile b/devel/libltdl/Makefile
new file mode 100644
index 000000000000..079e42eac4fc
--- /dev/null
+++ b/devel/libltdl/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	libltdl
+# Date created:		23 January 2002
+# Whom:			Jeremy Norris <ishmael27x@yahoo.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libltdl
+PORTREVISION=	0
+MASTERDIR=	${.CURDIR}/../libtool14
+
+COMMENT=	System independent dlopen wrapper
+
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--enable-ltdl-install
+BUILD_WRKSRC=	${WRKSRC}/libltdl
+INSTALL_WRKSRC=	${WRKSRC}/libltdl
+DESCR=		${PKGDIR}/pkg-descr.libltdl
+PLIST=		${PKGDIR}/pkg-plist.libltdl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/libltdl15/Makefile b/devel/libltdl15/Makefile
new file mode 100644
index 000000000000..079e42eac4fc
--- /dev/null
+++ b/devel/libltdl15/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	libltdl
+# Date created:		23 January 2002
+# Whom:			Jeremy Norris <ishmael27x@yahoo.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libltdl
+PORTREVISION=	0
+MASTERDIR=	${.CURDIR}/../libtool14
+
+COMMENT=	System independent dlopen wrapper
+
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--enable-ltdl-install
+BUILD_WRKSRC=	${WRKSRC}/libltdl
+INSTALL_WRKSRC=	${WRKSRC}/libltdl
+DESCR=		${PKGDIR}/pkg-descr.libltdl
+PLIST=		${PKGDIR}/pkg-plist.libltdl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
deleted file mode 100644
index fe6e1d76b734..000000000000
--- a/devel/libtool/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	libtool
-# Date created:		6 May 1998
-# Whom:			Motoyuki Kasahara <m-kasahr@sra.co.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libtool
-PORTVERSION=	1.3.4
-PORTREVISION=	4
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	libtool
-
-MAINTAINER=	ade@FreeBSD.org
-COMMENT=	Generic shared library support script
-
-# This port has not been upgraded to 1.4 because it is used by about 30% of
-# the ports collection, and more testing is needed.  If someone can supply a
-# working patch then it will be upgraded.
-
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PREFIX=${PREFIX}
-
-.ifdef USE_LIBTOOL
-.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
deleted file mode 100644
index c39e3aaff92d..000000000000
--- a/devel/libtool/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e
diff --git a/devel/libtool/files/patch-aa b/devel/libtool/files/patch-aa
deleted file mode 100644
index 91ff871e5ae3..000000000000
--- a/devel/libtool/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/libtool.texi.orig	Tue Jun 29 15:48:12 1999
-+++ doc/libtool.texi	Tue Aug 31 23:41:25 1999
-@@ -11,7 +11,7 @@
- @set MAILLIST the libtool mailing list @email{libtool@@gnu.org}
- @set objdir .libs
- 
--@dircategory GNU programming tools
-+@dircategory Programming & development tools
- @direntry
- * Libtool: (libtool).           Generic shared library support script.
- @end direntry
diff --git a/devel/libtool/files/patch-ab b/devel/libtool/files/patch-ab
deleted file mode 100644
index f96b92eac308..000000000000
--- a/devel/libtool/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Fri Jul  2 09:24:54 1999
-+++ doc/Makefile.in	Tue Aug 31 23:41:57 1999
-@@ -70,7 +70,7 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
diff --git a/devel/libtool/files/patch-ac b/devel/libtool/files/patch-ac
deleted file mode 100644
index 3a1894e10003..000000000000
--- a/devel/libtool/files/patch-ac
+++ /dev/null
@@ -1,157 +0,0 @@
-
-$FreeBSD$
-
---- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Sat Jun  8 11:48:12 2002
-@@ -169,7 +169,7 @@
- # Constants:
- PROGRAM=ltconfig
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-@@ -185,6 +185,8 @@
- # which needs '.lib').
- enable_static=yes
- enable_fast_install=yes
-+install_ltlibs=yes
-+release_suffix=yes
- enable_dlopen=unknown
- enable_win32_dll=no
- ltmain=
-@@ -242,10 +244,14 @@
- 
- Generate a system-specific libtool script.
- 
-+    --build                no-op to keep compatability with configure scripts generated for 1.4
-     --debug                enable verbose shell tracing
-     --disable-shared       do not build shared libraries
-     --disable-static       do not build static libraries
-     --disable-fast-install do not optimize for fast installation
-+    --disable-ltlibs       don't install the .la archives
-+    --release-ignore       don't use -release specification
-+    --release-suffix       use -release suffix for all files
-     --enable-dlopen        enable dlopen support
-     --enable-win32-dll     enable building dlls on win32 hosts
-     --help                 display this help and exit
-@@ -268,6 +274,8 @@
-   exit 0
-   ;;
- 
-+  --build=*) ;;
-+
-   --debug)
-     echo "$progname: enabling shell trace mode"
-     set -x
-@@ -279,6 +287,12 @@
- 
-   --disable-fast-install) enable_fast_install=no ;;
- 
-+  --disable-ltlibs) install_ltlibs=no ;;
-+
-+  --release-ignore) release_suffix=no ;;
-+
-+  --release-suffix) release_suffix=all ;;
-+
-   --enable-dlopen) enable_dlopen=yes ;;
- 
-   --enable-win32-dll) enable_win32_dll=yes ;;
-@@ -971,11 +985,11 @@
-   $rm conftest.dat
-   if ln -s X conftest.dat 2>/dev/null; then
-     $rm conftest.dat
--    LN_S="ln -s"
-+    LN_S="ln -sf"
-   else
-     LN_S=ln
-   fi
--  if test "$LN_S" = "ln -s"; then
-+  if test "$LN_S" = "ln -sf"; then
-     echo "$ac_t"yes 1>&6
-   else
-     echo "$ac_t"no 1>&6
-@@ -1226,8 +1240,8 @@
- 
-   *)
-     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-     else
-       ld_shlibs=no
-     fi
-@@ -1353,14 +1367,6 @@
-     hardcode_shlibpath_var=no
-     ;;
- 
--  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
--    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
--
-   hpux9* | hpux10* | hpux11*)
-     case "$host_os" in
-     hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1781,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+sys_lib_search_path_spec="/lib /usr/lib"
- file_magic_cmd=
- file_magic_test_file=
- deplibs_check_method='unknown'
-@@ -1873,19 +1879,22 @@
-   version_type=freebsd-$objformat
-   case "$version_type" in
-     freebsd-elf*)
--      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
--      file_magic_cmd=/usr/bin/file
--      file_magic_test_file=`echo /usr/lib/libc.so*`
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
--      need_version=no
--      need_lib_prefix=no
-+      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
-       ;;
-     freebsd-*)
--      deplibs_check_method=unknown
--      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
--      need_version=yes
-+      deplibs_check_method='file_magic FreeBSD.* shared library'
-       ;;
-   esac
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test "$release_suffix" = all; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
-+  fi 
-+  need_version=no
-+  need_lib_prefix=no
-+  finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   case "$host_os" in
-   freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2785,15 @@
- 
- # Shell to use when invoking shell scripts.
- SHELL=$LTSHELL
-+
-+# Whether to waste disk space.
-+install_ltlibs=$install_ltlibs 
-+
-+# What to do with -release.
-+#  yes - only for shared archive
-+#  no  - ingnore
-+#  all - for all archives
-+release_suffix=$release_suffix
- 
- # Whether or not to build shared libraries.
- build_libtool_libs=$enable_shared
diff --git a/devel/libtool/files/patch-ad b/devel/libtool/files/patch-ad
deleted file mode 100644
index 3ec71700ffbb..000000000000
--- a/devel/libtool/files/patch-ad
+++ /dev/null
@@ -1,247 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Tue Dec  7 23:50:49 1999
-+++ ltmain.sh	Thu May  2 10:24:05 2002
-@@ -23,6 +23,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+EXPR_COMPAT=1
-+export EXPR_COMPAT
-+
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-   # Discard the --no-reexec flag, and continue.
-@@ -54,7 +57,7 @@
- # Constants.
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- 
- default_mode=
-@@ -952,7 +955,11 @@
- 	  continue
- 	  ;;
- 	release)
--	  release="-$arg"
-+	  if test "$release_suffix" = all; then
-+	    release="$arg"
-+	  elif test "$release_suffix" = yes; then
-+	    release="-$arg"
-+	  fi
- 	  prev=
- 	  continue
- 	  ;;
-@@ -1005,6 +1012,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -1091,6 +1099,10 @@
- 	deplibs="$deplibs $arg"
- 	;;
- 
-+      -?thread)
-+	deplibs="$deplibs $arg"
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -1168,7 +1180,7 @@
- 
-       *.o | *.obj | *.a | *.lib)
- 	# A standard object.
--	objs="$objs $arg"
-+	libobjs="$libobjs $arg"
- 	;;
- 
-       *.lo)
-@@ -1603,12 +1615,6 @@
- 	exit 1
-       fi
- 
--      # How the heck are we supposed to write a wrapper for a shared library?
--      if test -n "$link_against_libtool_libs"; then
--	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
--	 exit 1
--      fi
--
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
-       fi
-@@ -1795,6 +1801,9 @@
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
-+	  ;;
- 	*)
- 	  # Add libc to deplibs on all other systems.
- 	  deplibs="$deplibs -lc"
-@@ -1802,6 +1811,94 @@
- 	esac
-       fi
- 
-+      if test -n "$rpath$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	for libdir in $rpath $xrpath; do
-+	  # This is the magic to use -rpath.
-+	  case "$compile_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) compile_rpath="$compile_rpath $libdir" ;;
-+	  esac
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+      fi
-+
-+      # Now hardcode the library paths
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $compile_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      compile_rpath="$rpath"
-+
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$finalize_perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      finalize_rpath="$rpath"
-+
-       # Create the output directory, or remove our outputs if we need to.
-       if test -d $output_objdir; then
- 	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-@@ -1817,7 +1914,11 @@
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	if test "$release_suffix" = all; then
-+	 oldlibs="$oldlibs $output_objdir/$libname$release.$libext"
-+	else
-+	 oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	fi
- 
- 	# Transform .lo files to .o files.
- 	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-@@ -2011,7 +2112,11 @@
- 	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
--	      oldlibs="$output_objdir/$libname.$libext"
-+	      if test "$release_suffix" = all; then
-+	        oldlibs="$output_objdir/$libname$release.$libext"
-+	      else
-+	        oldlibs="$output_objdir/$libname.$libext"
-+	      fi
- 	      build_libtool_libs=module
- 	      build_old_libs=yes
- 	    else
-@@ -3059,7 +3164,11 @@
-     case "$output" in
-     *.la)
-       old_library=
--      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      if test "$release_suffix" = all; then
-+        test "$build_old_libs" = yes && old_library="$libname$release.$libext"
-+      else
-+        test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      fi
-       $show "creating $output"
- 
-       if test -n "$xrpath"; then
-@@ -3348,10 +3457,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	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 $?
-+	if test "$install_ltlibs" = yes; 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"
-@@ -3440,7 +3551,6 @@
- 	    fi
- 	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
--	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- 	      finalize=no
- 	    fi
- 	  done
diff --git a/devel/libtool/files/patch-ae b/devel/libtool/files/patch-ae
deleted file mode 100644
index c92b003b58cd..000000000000
--- a/devel/libtool/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Fri Jul  2 09:01:56 1999
-+++ configure	Tue Aug 31 23:45:29 1999
-@@ -1853,10 +1853,6 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/devel/libtool/files/patch-af b/devel/libtool/files/patch-af
deleted file mode 100644
index beb6be3b456f..000000000000
--- a/devel/libtool/files/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
---- libltdl/Makefile.in.orig	Tue Dec  7 13:03:38 1999
-+++ libltdl/Makefile.in	Mon Jan 17 16:35:34 2000
-@@ -326,17 +326,16 @@
- distdir: $(DISTFILES)
- 	-rm -rf $(distdir)
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
-+	-chmod 555 $(distdir)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    echo no copy dir $$d/$$file; \
- 	  else \
--	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \
- 	  fi; \
- 	done
-+	-chmod a+x $(distdir)/configure
- info-am:
- info: info-am
- dvi-am:
diff --git a/devel/libtool/files/patch-ag b/devel/libtool/files/patch-ag
deleted file mode 100644
index 5fdcd1924641..000000000000
--- a/devel/libtool/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libltdl/configure	2001/01/31 10:58:38	1.1
-+++ libltdl/configure	2001/01/31 10:59:14
-@@ -1455,7 +1455,7 @@
- esac
- 
- # Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
-+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
diff --git a/devel/libtool/pkg-descr b/devel/libtool/pkg-descr
deleted file mode 100644
index 1dea88bf6d51..000000000000
--- a/devel/libtool/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This is GNU Libtool, a generic library support script.  Libtool hides
-the complexity of using shared libraries behind a consistent, portable
-interface.
-
-To use libtool, add the new generic library building commands to your
-Makefile, Makefile.in, or Makefile.am.
-
-WWW: http://www.gnu.org/software/libtool/
diff --git a/devel/libtool/pkg-plist b/devel/libtool/pkg-plist
deleted file mode 100644
index f057cdf134b2..000000000000
--- a/devel/libtool/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/libtool
-bin/libtoolize
-include/ltdl.h
-@unexec install-info --delete %D/info/libtool.info %D/info/dir
-info/libtool.info
-@exec install-info %D/info/libtool.info %D/info/dir
-lib/libltdl.a
-lib/libltdl.so
-lib/libltdl.so.1
-share/aclocal/libtool.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
-share/libtool/libltdl/acinclude.m4
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.in
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/stamp-h.in
-share/libtool/ltconfig
-share/libtool/ltmain.sh
-@dirrm share/libtool/libltdl
-@dirrm share/libtool
diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile
index fe6e1d76b734..154c7665074d 100644
--- a/devel/libtool13/Makefile
+++ b/devel/libtool13/Makefile
@@ -6,25 +6,49 @@
 #
 
 PORTNAME=	libtool
-PORTVERSION=	1.3.4
-PORTREVISION=	4
+PORTVERSION=	1.3.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
+DISTNAME=	libtool-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 COMMENT=	Generic shared library support script
 
-# This port has not been upgraded to 1.4 because it is used by about 30% of
-# the ports collection, and more testing is needed.  If someone can supply a
-# working patch then it will be upgraded.
-
-INSTALLS_SHLIB=	yes
+LATEST_LINK=	libtool13
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PREFIX=${PREFIX}
+CONFIGURE_ARGS=	--disable-ltdl-install \
+		--program-suffix=13
+CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool13
+USE_REINPLACE=	yes
+
+.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
+pre-everything:
+	@${ECHO} ===========================================================
+	@${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables"
+	@${ECHO} "defined either in environment or in make(1) arguments."
+	@${ECHO} "Please undefine them and try again."
+	@${ECHO} ===========================================================
+	@${FALSE}
+.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
+
+post-extract:
+	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool13.m4
+	@${REINPLACE_CMD} -e 's|libtool.m4|libtool13.m4|g' \
+			  ${WRKSRC}/Makefile.in
+	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool13.info
+	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool13.texi
 
-.ifdef USE_LIBTOOL
-.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
+post-install:
+	@-${RM} -fr ${PREFIX}/libexec/libtool13
+	${MKDIR} ${PREFIX}/libexec/libtool13
+.for i in libtool libtoolize
+	${LN} -sf ${PREFIX}/bin/${i}13 ${PREFIX}/libexec/libtool13/${i}
+.endfor
+.for i in config.guess config.sub
+	${MV} ${PREFIX}/share/libtool13/${i}13 ${PREFIX}/share/libtool13/${i}
+.endfor
+	${LN} -sf ${PREFIX}/share/libtool13/ltconfig13 \
+		${PREFIX}/share/libtool13/ltconfig
 
 .include <bsd.port.mk>
diff --git a/devel/libtool13/distinfo b/devel/libtool13/distinfo
index c39e3aaff92d..2b891425c242 100644
--- a/devel/libtool13/distinfo
+++ b/devel/libtool13/distinfo
@@ -1 +1 @@
-MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e
+MD5 (libtool-1.3.5.tar.gz) = fa26a07c978ad05d1f88ed7a472daa49
diff --git a/devel/libtool13/files/patch-aa b/devel/libtool13/files/patch-aa
index 91ff871e5ae3..95c4f56b1de3 100644
--- a/devel/libtool13/files/patch-aa
+++ b/devel/libtool13/files/patch-aa
@@ -1,11 +1,28 @@
---- doc/libtool.texi.orig	Tue Jun 29 15:48:12 1999
-+++ doc/libtool.texi	Tue Aug 31 23:41:25 1999
-@@ -11,7 +11,7 @@
+--- doc/libtool13.texi.orig	Tue Nov  2 07:36:23 1999
++++ doc/libtool13.texi	Sat Dec 14 00:11:27 2002
+@@ -1,6 +1,6 @@
+ \input texinfo   @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename libtool.info
++@setfilename libtool13.info
+ @settitle Libtool
+ @c For double-sided printing, uncomment:
+ @c @setchapternewpage odd
+@@ -11,14 +11,14 @@
  @set MAILLIST the libtool mailing list @email{libtool@@gnu.org}
  @set objdir .libs
  
 -@dircategory GNU programming tools
 +@dircategory Programming & development tools
  @direntry
- * Libtool: (libtool).           Generic shared library support script.
+-* Libtool: (libtool).           Generic shared library support script.
++* Libtool: (libtool13).         Generic shared library support script.
  @end direntry
+ 
+ @dircategory Individual utilities
+ @direntry
+-* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
++* libtoolize: (libtool13)Invoking libtoolize.   Adding libtool support.
+ @end direntry
+ 
+ @ifinfo
diff --git a/devel/libtool13/files/patch-ab b/devel/libtool13/files/patch-ab
index f96b92eac308..18ada0907569 100644
--- a/devel/libtool13/files/patch-ab
+++ b/devel/libtool13/files/patch-ab
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Fri Jul  2 09:24:54 1999
-+++ doc/Makefile.in	Tue Aug 31 23:41:57 1999
-@@ -70,7 +70,7 @@
+--- doc/Makefile.in.orig	Sat May 27 07:23:34 2000
++++ doc/Makefile.in	Sat Dec 14 00:04:56 2002
+@@ -71,7 +71,7 @@
  LIBTOOL = @LIBTOOL@
  LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
  LN_S = @LN_S@
@@ -9,3 +9,62 @@
  NM = @NM@
  OBJDUMP = @OBJDUMP@
  PACKAGE = @PACKAGE@
+@@ -81,15 +81,15 @@
+ pkgdatadir = @pkgdatadir@
+ 
+ AUTOMAKE_OPTIONS = gnits
+-info_TEXINFOS = libtool.texi
+-libtool_TEXINFOS = PLATFORMS
++info_TEXINFOS = libtool13.texi
++libtool13_TEXINFOS = PLATFORMS
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
+ TEXI2DVI = texi2dvi
+-INFO_DEPS = libtool.info
+-DVIS = libtool.dvi
+-TEXINFOS = libtool.texi
+-DIST_COMMON =  $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \
++INFO_DEPS = libtool13.info
++DVIS = libtool13.dvi
++TEXINFOS = libtool13.texi
++DIST_COMMON =  $(libtool13_TEXINFOS) Makefile.am Makefile.in mdate-sh \
+ stamp-vti texinfo.tex version.texi
+ 
+ 
+@@ -111,8 +111,8 @@
+ $(srcdir)/version.texi: stamp-vti
+ 	@:
+ 
+-$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in
+-	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp
++$(srcdir)/stamp-vti: libtool13.texi $(top_srcdir)/configure.in
++	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool13.texi`" > vti.tmp
+ 	@echo "@set EDITION $(VERSION)" >> vti.tmp
+ 	@echo "@set VERSION $(VERSION)" >> vti.tmp
+ 	@cmp -s vti.tmp $(srcdir)/version.texi \
+@@ -131,8 +131,8 @@
+ maintainer-clean-vti:
+ 	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
+ 
+-libtool.info: libtool.texi version.texi $(libtool_TEXINFOS)
+-libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS)
++libtool13.info: libtool13.texi version.texi $(libtool13_TEXINFOS)
++libtool13.dvi: libtool13.texi version.texi $(libtool13_TEXINFOS)
+ 
+ 
+ DVIPS = dvips
+@@ -231,10 +231,10 @@
+ 	done
+ 
+ mostlyclean-aminfo:
+-	-rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \
+-	  libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \
+-	  libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \
+-	  libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn
++	-rm -f libtool13.aux libtool13.cp libtool13.cps libtool13.dvi libtool13.fn \
++	  libtool13.fns libtool13.ky libtool13.kys libtool13.ps libtool13.log \
++	  libtool13.pg libtool13.toc libtool13.tp libtool13.tps libtool13.vr \
++	  libtool13.vrs libtool13.op libtool13.tr libtool13.cv libtool13.cn
+ 
+ clean-aminfo:
+ 
diff --git a/devel/libtool13/files/patch-ac b/devel/libtool13/files/patch-ac
index 3a1894e10003..b74f12d923d3 100644
--- a/devel/libtool13/files/patch-ac
+++ b/devel/libtool13/files/patch-ac
@@ -1,15 +1,12 @@
-
-$FreeBSD$
-
---- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Sat Jun  8 11:48:12 2002
+--- ltconfig.orig	Fri Dec 13 23:36:10 2002
++++ ltconfig	Fri Dec 13 23:47:30 2002
 @@ -169,7 +169,7 @@
  # Constants:
  PROGRAM=ltconfig
  PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
+-VERSION=1.3.5
++VERSION=1.3.5-freebsd-ports
+ TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
  ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 @@ -185,6 +185,8 @@
@@ -72,7 +69,7 @@ $FreeBSD$
      echo "$ac_t"yes 1>&6
    else
      echo "$ac_t"no 1>&6
-@@ -1226,8 +1240,8 @@
+@@ -1232,8 +1246,8 @@
  
    *)
      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
@@ -83,7 +80,7 @@ $FreeBSD$
      else
        ld_shlibs=no
      fi
-@@ -1353,14 +1367,6 @@
+@@ -1359,14 +1373,6 @@
      hardcode_shlibpath_var=no
      ;;
  
@@ -98,7 +95,7 @@ $FreeBSD$
    hpux9* | hpux10* | hpux11*)
      case "$host_os" in
      hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1781,7 @@
+@@ -1793,7 +1799,7 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -107,7 +104,7 @@ $FreeBSD$
  file_magic_cmd=
  file_magic_test_file=
  deplibs_check_method='unknown'
-@@ -1873,19 +1879,22 @@
+@@ -1891,19 +1897,22 @@
    version_type=freebsd-$objformat
    case "$version_type" in
      freebsd-elf*)
@@ -127,7 +124,7 @@ $FreeBSD$
        ;;
    esac
 +  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /usr/lib/libc.so.*`
++  file_magic_test_file=`echo /usr/lib/libc.so*`
 +  if test "$release_suffix" = all; then
 +    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so'
 +  else
@@ -139,7 +136,7 @@ $FreeBSD$
    shlibpath_var=LD_LIBRARY_PATH
    case "$host_os" in
    freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2785,15 @@
+@@ -2812,6 +2821,15 @@
  
  # Shell to use when invoking shell scripts.
  SHELL=$LTSHELL
diff --git a/devel/libtool13/files/patch-ad b/devel/libtool13/files/patch-ad
index 3ec71700ffbb..304e840caaa9 100644
--- a/devel/libtool13/files/patch-ad
+++ b/devel/libtool13/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Tue Dec  7 23:50:49 1999
-+++ ltmain.sh	Thu May  2 10:24:05 2002
+--- ltmain.sh.orig	Sat May 27 07:15:01 2000
++++ ltmain.sh	Fri Dec 13 23:50:12 2002
 @@ -23,6 +23,9 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
@@ -17,20 +14,19 @@ $FreeBSD$
  # Constants.
  PROGRAM=ltmain.sh
  PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
+-VERSION=1.3.5
++VERSION=1.3.5-freebsd-ports
+ TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
  
  default_mode=
 @@ -952,7 +955,11 @@
  	  continue
  	  ;;
  	release)
--	  release="-$arg"
 +	  if test "$release_suffix" = all; then
 +	    release="$arg"
 +	  elif test "$release_suffix" = yes; then
-+	    release="-$arg"
+ 	  release="-$arg"
 +	  fi
  	  prev=
  	  continue
@@ -76,9 +72,9 @@ $FreeBSD$
        if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
  	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
        fi
-@@ -1795,6 +1801,9 @@
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
+@@ -1799,6 +1805,9 @@
+ 	  # rhapsody is a little odd...
+ 	  deplibs="$deplibs -framework System"
  	  ;;
 +	*-*-freebsd*)
 +	  # FreeBSD doesn't need this...
@@ -86,7 +82,7 @@ $FreeBSD$
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -1802,6 +1811,94 @@
+@@ -1806,6 +1815,94 @@
  	esac
        fi
  
@@ -181,63 +177,56 @@ $FreeBSD$
        # Create the output directory, or remove our outputs if we need to.
        if test -d $output_objdir; then
  	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-@@ -1817,7 +1914,11 @@
+@@ -1821,7 +1918,11 @@
  
        # Now set the variables for building old libraries.
        if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--	oldlibs="$oldlibs $output_objdir/$libname.$libext"
 +	if test "$release_suffix" = all; then
 +	 oldlibs="$oldlibs $output_objdir/$libname$release.$libext"
 +	else
-+	 oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
 +	fi
  
  	# Transform .lo files to .o files.
  	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-@@ -2011,7 +2112,11 @@
+@@ -2015,7 +2116,11 @@
  	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
  	    fi
  	    if test "$build_old_libs" = no; then
--	      oldlibs="$output_objdir/$libname.$libext"
 +	      if test "$release_suffix" = all; then
 +	        oldlibs="$output_objdir/$libname$release.$libext"
 +	      else
-+	        oldlibs="$output_objdir/$libname.$libext"
+ 	      oldlibs="$output_objdir/$libname.$libext"
 +	      fi
  	      build_libtool_libs=module
  	      build_old_libs=yes
  	    else
-@@ -3059,7 +3164,11 @@
+@@ -3071,7 +3176,11 @@
      case "$output" in
      *.la)
        old_library=
--      test "$build_old_libs" = yes && old_library="$libname.$libext"
 +      if test "$release_suffix" = all; then
 +        test "$build_old_libs" = yes && old_library="$libname$release.$libext"
 +      else
-+        test "$build_old_libs" = yes && old_library="$libname.$libext"
+       test "$build_old_libs" = yes && old_library="$libname.$libext"
 +      fi
        $show "creating $output"
  
        if test -n "$xrpath"; then
-@@ -3348,10 +3457,12 @@
+@@ -3360,10 +3469,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
--	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 $?
 +	if test "$install_ltlibs" = yes; 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 $?
+ 	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"
-@@ -3440,7 +3551,6 @@
+@@ -3452,7 +3563,6 @@
  	    fi
  	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
  	    if test -n "$libdir" && test ! -f "$libfile"; then
diff --git a/devel/libtool13/files/patch-ae b/devel/libtool13/files/patch-ae
index c92b003b58cd..ffd4cff4c7db 100644
--- a/devel/libtool13/files/patch-ae
+++ b/devel/libtool13/files/patch-ae
@@ -1,6 +1,18 @@
---- configure.orig	Fri Jul  2 09:01:56 1999
-+++ configure	Tue Aug 31 23:45:29 1999
-@@ -1853,10 +1853,6 @@
+
+$FreeBSD$
+
+--- configure.orig	Tue Dec  7 15:22:41 1999
++++ configure	Mon Jan 14 16:21:53 2002
+@@ -702,7 +702,7 @@
+ fi
+ 
+ 
+-PACKAGE=libtool
++PACKAGE=libtool13
+ 
+ VERSION=1.3.5
+ 
+@@ -1859,10 +1859,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/devel/libtool13/files/patch-af b/devel/libtool13/files/patch-af
index beb6be3b456f..935b056b3c39 100644
--- a/devel/libtool13/files/patch-af
+++ b/devel/libtool13/files/patch-af
@@ -1,5 +1,8 @@
---- libltdl/Makefile.in.orig	Tue Dec  7 13:03:38 1999
-+++ libltdl/Makefile.in	Mon Jan 17 16:35:34 2000
+
+$FreeBSD$
+
+--- libltdl/Makefile.in.orig	Tue Dec  7 15:03:38 1999
++++ libltdl/Makefile.in	Mon Jan 14 17:05:36 2002
 @@ -326,17 +326,16 @@
  distdir: $(DISTFILES)
  	-rm -rf $(distdir)
@@ -22,3 +25,24 @@
  info-am:
  info: info-am
  dvi-am:
+@@ -435,15 +434,15 @@
+ 	$(SHELL) ./config.status --recheck
+ 
+ local-install-files: $(DISTFILES)
+-	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
++	-rm -rf $(DESTDIR)$(datadir)/libtool13/libltdl
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool13/libltdl
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
++	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file; \
+ 	  else \
+-	    test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
+-	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
++	    test -f $(DESTDIR)$(datadir)/libtool13/libltdl/$$file \
++	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file || :; \
+ 	  fi; \
+ 	done
+ 
diff --git a/devel/libtool13/files/patch-ag b/devel/libtool13/files/patch-ag
deleted file mode 100644
index 5fdcd1924641..000000000000
--- a/devel/libtool13/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libltdl/configure	2001/01/31 10:58:38	1.1
-+++ libltdl/configure	2001/01/31 10:59:14
-@@ -1455,7 +1455,7 @@
- esac
- 
- # Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
-+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
diff --git a/devel/libtool13/files/patch-libtoolize.in b/devel/libtool13/files/patch-libtoolize.in
new file mode 100644
index 000000000000..ec80fc6ea6c3
--- /dev/null
+++ b/devel/libtool13/files/patch-libtoolize.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- libtoolize.in.orig	Tue Mar 30 13:25:27 1999
++++ libtoolize.in	Mon Jan 14 16:26:55 2002
+@@ -37,7 +37,7 @@
+ pkgdatadir=@pkgdatadir@
+ aclocaldir=@aclocaldir@
+ 
+-libtool_m4="$aclocaldir/libtool.m4"
++libtool_m4="$aclocaldir/libtool13.m4"
+ 
+ dry_run=no
+ help="Try \`$progname --help' for more information."
diff --git a/devel/libtool13/pkg-plist b/devel/libtool13/pkg-plist
index f057cdf134b2..6ec0729c163b 100644
--- a/devel/libtool13/pkg-plist
+++ b/devel/libtool13/pkg-plist
@@ -1,29 +1,30 @@
-bin/libtool
-bin/libtoolize
-include/ltdl.h
-@unexec install-info --delete %D/info/libtool.info %D/info/dir
-info/libtool.info
-@exec install-info %D/info/libtool.info %D/info/dir
-lib/libltdl.a
-lib/libltdl.so
-lib/libltdl.so.1
-share/aclocal/libtool.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
-share/libtool/libltdl/acinclude.m4
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.in
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/stamp-h.in
-share/libtool/ltconfig
-share/libtool/ltmain.sh
-@dirrm share/libtool/libltdl
-@dirrm share/libtool
+@comment $FreeBSD$
+bin/libtool13
+bin/libtoolize13
+libexec/libtool13/libtool
+libexec/libtool13/libtoolize
+@unexec install-info --delete %D/info/libtool13.info %D/info/dir
+info/libtool13.info
+@exec install-info %D/info/libtool13.info %D/info/dir
+share/aclocal/libtool13.m4
+share/libtool13/config.guess
+share/libtool13/config.sub
+share/libtool13/libltdl/README
+share/libtool13/libltdl/stamp-h.in
+share/libtool13/libltdl/COPYING.LIB
+share/libtool13/libltdl/Makefile.am
+share/libtool13/libltdl/Makefile.in
+share/libtool13/libltdl/acconfig.h
+share/libtool13/libltdl/acinclude.m4
+share/libtool13/libltdl/aclocal.m4
+share/libtool13/libltdl/config.h.in
+share/libtool13/libltdl/configure
+share/libtool13/libltdl/configure.in
+share/libtool13/libltdl/ltdl.c
+share/libtool13/libltdl/ltdl.h
+share/libtool13/ltconfig
+share/libtool13/ltconfig13
+share/libtool13/ltmain.sh
+@dirrm share/libtool13/libltdl
+@dirrm share/libtool13
+@dirrm libexec/libtool13
diff --git a/devel/libtool14/Makefile b/devel/libtool14/Makefile
index fe6e1d76b734..573ac0226009 100644
--- a/devel/libtool14/Makefile
+++ b/devel/libtool14/Makefile
@@ -5,26 +5,53 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libtool
-PORTVERSION=	1.3.4
-PORTREVISION=	4
+PORTNAME?=	libtool
+PORTVERSION=	1.4.3
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
+DISTNAME=	libtool-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
-COMMENT=	Generic shared library support script
-
-# This port has not been upgraded to 1.4 because it is used by about 30% of
-# the ports collection, and more testing is needed.  If someone can supply a
-# working patch then it will be upgraded.
+COMMENT?=	Generic shared library support script
 
+LATEST_LINK?=	libtool14
+GNU_CONFIGURE=	 yes
+CONFIGURE_ARGS?= --disable-ltdl-install
+CONFIGURE_ARGS+= --program-suffix=14
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PREFIX=${PREFIX}
+CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool14
+USE_REINPLACE=	yes
+
+.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
+pre-everything:
+	@${ECHO} ===========================================================
+	@${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables"
+	@${ECHO} "defined either in environment or in make(1) arguments."
+	@${ECHO} "Please undefine them and try again."
+	@${ECHO} ===========================================================
+	@${FALSE}
+.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
+
+post-extract:
+	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool14.m4
+	@${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl14.m4
+	@${REINPLACE_CMD} -e 's|libtool.m4|libtool14.m4|g' \
+			  -e 's|ltdl.m4|ltdl14.m4|g' ${WRKSRC}/Makefile.in
+	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool14.info
+	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool14.texi
 
-.ifdef USE_LIBTOOL
-.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.if ${PORTNAME} == "libtool"
+post-install:
+	@-${RM} -fr ${PREFIX}/libexec/libtool14
+	${MKDIR} ${PREFIX}/libexec/libtool14
+.for i in libtool libtoolize
+	${LN} -sf ${PREFIX}/bin/${i}14 ${PREFIX}/libexec/libtool14/${i}
+.endfor
+.for i in config.guess config.sub
+	${MV} ${PREFIX}/share/libtool14/${i}14 ${PREFIX}/share/libtool14/${i}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libtool14/distinfo b/devel/libtool14/distinfo
index c39e3aaff92d..7cace71782d6 100644
--- a/devel/libtool14/distinfo
+++ b/devel/libtool14/distinfo
@@ -1 +1 @@
-MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e
+MD5 (libtool-1.4.3.tar.gz) = d11a3c835449d7fa50a025dc9c01ad81
diff --git a/devel/libtool14/files/patch-aa b/devel/libtool14/files/patch-aa
index 91ff871e5ae3..8ba2b3510563 100644
--- a/devel/libtool14/files/patch-aa
+++ b/devel/libtool14/files/patch-aa
@@ -1,11 +1,15 @@
---- doc/libtool.texi.orig	Tue Jun 29 15:48:12 1999
-+++ doc/libtool.texi	Tue Aug 31 23:41:25 1999
-@@ -11,7 +11,7 @@
- @set MAILLIST the libtool mailing list @email{libtool@@gnu.org}
- @set objdir .libs
+--- doc/libtool14.info.orig	Wed Oct 23 02:26:36 2002
++++ doc/libtool14.info	Mon Feb 17 01:46:42 2003
+@@ -3,5 +3,5 @@
  
--@dircategory GNU programming tools
-+@dircategory Programming & development tools
- @direntry
- * Libtool: (libtool).           Generic shared library support script.
- @end direntry
+-INFO-DIR-SECTION GNU programming tools
++INFO-DIR-SECTION Programming & development tools
+ START-INFO-DIR-ENTRY
+-* Libtool: (libtool).           Generic shared library support script.
++* Libtool: (libtool14).           Generic shared library support script.
+ END-INFO-DIR-ENTRY
+@@ -10,3 +10,3 @@
+ START-INFO-DIR-ENTRY
+-* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
++* libtoolize: (libtool14)Invoking libtoolize.     Adding libtool support.
+ END-INFO-DIR-ENTRY
diff --git a/devel/libtool14/files/patch-ab b/devel/libtool14/files/patch-ab
index f96b92eac308..384c86a0bd18 100644
--- a/devel/libtool14/files/patch-ab
+++ b/devel/libtool14/files/patch-ab
@@ -1,11 +1,50 @@
---- doc/Makefile.in.orig	Fri Jul  2 09:24:54 1999
-+++ doc/Makefile.in	Tue Aug 31 23:41:57 1999
-@@ -70,7 +70,7 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
+--- doc/Makefile.in.orig	Wed Oct 23 02:51:04 2002
++++ doc/Makefile.in	Mon Feb 17 02:01:16 2003
+@@ -72,3 +72,3 @@
  LN_S = @LN_S@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  NM = @NM@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
+@@ -85,4 +85,4 @@
+ AUTOMAKE_OPTIONS = gnits
+-info_TEXINFOS = libtool.texi
+-libtool_TEXINFOS = PLATFORMS fdl.texi
++info_TEXINFOS = libtool14.texi
++libtool14_TEXINFOS = PLATFORMS fdl.texi
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -90,6 +90,6 @@
+ TEXI2DVI = texi2dvi
+-INFO_DEPS = libtool.info
+-DVIS = libtool.dvi
+-TEXINFOS = libtool.texi
+-DIST_COMMON =  $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \
++INFO_DEPS = libtool14.info
++DVIS = libtool14.dvi
++TEXINFOS = libtool14.texi
++DIST_COMMON =  $(libtool14_TEXINFOS) Makefile.am Makefile.in mdate-sh \
+ stamp-vti texinfo.tex version.texi
+@@ -115,4 +115,4 @@
+ 
+-$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in
+-	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp
++$(srcdir)/stamp-vti: libtool14.texi $(top_srcdir)/configure.in
++	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool14.texi`" > vti.tmp
+ 	@echo "@set EDITION $(VERSION)" >> vti.tmp
+@@ -135,4 +135,4 @@
+ 
+-libtool.info: libtool.texi version.texi $(libtool_TEXINFOS)
+-libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS)
++libtool14.info: libtool14.texi version.texi $(libtool14_TEXINFOS)
++libtool14.dvi: libtool14.texi version.texi $(libtool14_TEXINFOS)
+ 
+@@ -235,6 +235,6 @@
+ mostlyclean-aminfo:
+-	-rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \
+-	  libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \
+-	  libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \
+-	  libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn
++	-rm -f libtool14.aux libtool14.cp libtool14.cps libtool14.dvi libtool14.fn \
++	  libtool14.fns libtool14.ky libtool14.kys libtool14.ps libtool14.log \
++	  libtool14.pg libtool14.toc libtool14.tp libtool14.tps libtool14.vr \
++	  libtool14.vrs libtool14.op libtool14.tr libtool14.cv libtool14.cn
+ 
diff --git a/devel/libtool14/files/patch-ac b/devel/libtool14/files/patch-ac
deleted file mode 100644
index 3a1894e10003..000000000000
--- a/devel/libtool14/files/patch-ac
+++ /dev/null
@@ -1,157 +0,0 @@
-
-$FreeBSD$
-
---- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Sat Jun  8 11:48:12 2002
-@@ -169,7 +169,7 @@
- # Constants:
- PROGRAM=ltconfig
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-@@ -185,6 +185,8 @@
- # which needs '.lib').
- enable_static=yes
- enable_fast_install=yes
-+install_ltlibs=yes
-+release_suffix=yes
- enable_dlopen=unknown
- enable_win32_dll=no
- ltmain=
-@@ -242,10 +244,14 @@
- 
- Generate a system-specific libtool script.
- 
-+    --build                no-op to keep compatability with configure scripts generated for 1.4
-     --debug                enable verbose shell tracing
-     --disable-shared       do not build shared libraries
-     --disable-static       do not build static libraries
-     --disable-fast-install do not optimize for fast installation
-+    --disable-ltlibs       don't install the .la archives
-+    --release-ignore       don't use -release specification
-+    --release-suffix       use -release suffix for all files
-     --enable-dlopen        enable dlopen support
-     --enable-win32-dll     enable building dlls on win32 hosts
-     --help                 display this help and exit
-@@ -268,6 +274,8 @@
-   exit 0
-   ;;
- 
-+  --build=*) ;;
-+
-   --debug)
-     echo "$progname: enabling shell trace mode"
-     set -x
-@@ -279,6 +287,12 @@
- 
-   --disable-fast-install) enable_fast_install=no ;;
- 
-+  --disable-ltlibs) install_ltlibs=no ;;
-+
-+  --release-ignore) release_suffix=no ;;
-+
-+  --release-suffix) release_suffix=all ;;
-+
-   --enable-dlopen) enable_dlopen=yes ;;
- 
-   --enable-win32-dll) enable_win32_dll=yes ;;
-@@ -971,11 +985,11 @@
-   $rm conftest.dat
-   if ln -s X conftest.dat 2>/dev/null; then
-     $rm conftest.dat
--    LN_S="ln -s"
-+    LN_S="ln -sf"
-   else
-     LN_S=ln
-   fi
--  if test "$LN_S" = "ln -s"; then
-+  if test "$LN_S" = "ln -sf"; then
-     echo "$ac_t"yes 1>&6
-   else
-     echo "$ac_t"no 1>&6
-@@ -1226,8 +1240,8 @@
- 
-   *)
-     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-     else
-       ld_shlibs=no
-     fi
-@@ -1353,14 +1367,6 @@
-     hardcode_shlibpath_var=no
-     ;;
- 
--  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
--    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
--
-   hpux9* | hpux10* | hpux11*)
-     case "$host_os" in
-     hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1781,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+sys_lib_search_path_spec="/lib /usr/lib"
- file_magic_cmd=
- file_magic_test_file=
- deplibs_check_method='unknown'
-@@ -1873,19 +1879,22 @@
-   version_type=freebsd-$objformat
-   case "$version_type" in
-     freebsd-elf*)
--      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
--      file_magic_cmd=/usr/bin/file
--      file_magic_test_file=`echo /usr/lib/libc.so*`
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
--      need_version=no
--      need_lib_prefix=no
-+      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
-       ;;
-     freebsd-*)
--      deplibs_check_method=unknown
--      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
--      need_version=yes
-+      deplibs_check_method='file_magic FreeBSD.* shared library'
-       ;;
-   esac
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test "$release_suffix" = all; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
-+  fi 
-+  need_version=no
-+  need_lib_prefix=no
-+  finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   case "$host_os" in
-   freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2785,15 @@
- 
- # Shell to use when invoking shell scripts.
- SHELL=$LTSHELL
-+
-+# Whether to waste disk space.
-+install_ltlibs=$install_ltlibs 
-+
-+# What to do with -release.
-+#  yes - only for shared archive
-+#  no  - ingnore
-+#  all - for all archives
-+release_suffix=$release_suffix
- 
- # Whether or not to build shared libraries.
- build_libtool_libs=$enable_shared
diff --git a/devel/libtool14/files/patch-ad b/devel/libtool14/files/patch-ad
index 3ec71700ffbb..c04c4dd4a24c 100644
--- a/devel/libtool14/files/patch-ad
+++ b/devel/libtool14/files/patch-ad
@@ -1,226 +1,32 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Tue Dec  7 23:50:49 1999
-+++ ltmain.sh	Thu May  2 10:24:05 2002
-@@ -23,6 +23,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
+--- ltmain.sh.orig	Mon Sep 10 22:33:26 2001
++++ ltmain.sh	Wed Jan 23 16:39:22 2002
+@@ -1062,6 +1062,12 @@
  
-+EXPR_COMPAT=1
-+export EXPR_COMPAT
-+
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-   # Discard the --no-reexec flag, and continue.
-@@ -54,7 +57,7 @@
- # Constants.
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- 
- default_mode=
-@@ -952,7 +955,11 @@
- 	  continue
- 	  ;;
- 	release)
--	  release="-$arg"
-+	  if test "$release_suffix" = all; then
-+	    release="$arg"
-+	  elif test "$release_suffix" = yes; then
-+	    release="-$arg"
-+	  fi
- 	  prev=
- 	  continue
- 	  ;;
-@@ -1005,6 +1012,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -1091,6 +1099,10 @@
- 	deplibs="$deplibs $arg"
- 	;;
- 
-+      -?thread)
-+	deplibs="$deplibs $arg"
-+	;;
-+
        -module)
  	module=yes
++	case $host in
++	*-*-freebsd*)
++	  # Do not build the useless static library
++	  build_old_libs=no
++	  ;;
++	esac
  	continue
-@@ -1168,7 +1180,7 @@
- 
-       *.o | *.obj | *.a | *.lib)
- 	# A standard object.
--	objs="$objs $arg"
-+	libobjs="$libobjs $arg"
  	;;
  
-       *.lo)
-@@ -1603,12 +1615,6 @@
- 	exit 1
-       fi
- 
--      # How the heck are we supposed to write a wrapper for a shared library?
--      if test -n "$link_against_libtool_libs"; then
--	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
--	 exit 1
--      fi
--
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
-       fi
-@@ -1795,6 +1801,9 @@
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
+@@ -2444,6 +2450,9 @@
+ 	  *-*-openbsd*)
+ 	    # 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.
- 	  deplibs="$deplibs -lc"
-@@ -1802,6 +1811,94 @@
- 	esac
-       fi
- 
-+      if test -n "$rpath$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	for libdir in $rpath $xrpath; do
-+	  # This is the magic to use -rpath.
-+	  case "$compile_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) compile_rpath="$compile_rpath $libdir" ;;
-+	  esac
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+      fi
-+
-+      # Now hardcode the library paths
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $compile_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      compile_rpath="$rpath"
-+
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$finalize_perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      finalize_rpath="$rpath"
-+
-       # Create the output directory, or remove our outputs if we need to.
-       if test -d $output_objdir; then
- 	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-@@ -1817,7 +1914,11 @@
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	if test "$release_suffix" = all; then
-+	 oldlibs="$oldlibs $output_objdir/$libname$release.$libext"
-+	else
-+	 oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	fi
- 
- 	# Transform .lo files to .o files.
- 	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-@@ -2011,7 +2112,11 @@
- 	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
--	      oldlibs="$output_objdir/$libname.$libext"
-+	      if test "$release_suffix" = all; then
-+	        oldlibs="$output_objdir/$libname$release.$libext"
-+	      else
-+	        oldlibs="$output_objdir/$libname.$libext"
-+	      fi
- 	      build_libtool_libs=module
- 	      build_old_libs=yes
- 	    else
-@@ -3059,7 +3164,11 @@
-     case "$output" in
-     *.la)
-       old_library=
--      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      if test "$release_suffix" = all; then
-+        test "$build_old_libs" = yes && old_library="$libname$release.$libext"
-+      else
-+        test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      fi
-       $show "creating $output"
- 
-       if test -n "$xrpath"; then
-@@ -3348,10 +3457,12 @@
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4210,10 +4219,17 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
@@ -228,20 +34,17 @@ $FreeBSD$
 -	instname="$dir/$name"i
 -	$show "$install_prog $instname $destdir/$name"
 -	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	if test "$install_ltlibs" = yes; then
++	case $host in
++	*-*-freebsd*)
++	  # Do not install the useless pseudo-library
++	  ;;
++	*)
 +	  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
++	  ;;
++	esac
  
  	# Maybe install the static library, too.
  	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-@@ -3440,7 +3551,6 @@
- 	    fi
- 	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
--	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- 	      finalize=no
- 	    fi
- 	  done
diff --git a/devel/libtool14/files/patch-ae b/devel/libtool14/files/patch-ae
index c92b003b58cd..62aeecd4ae60 100644
--- a/devel/libtool14/files/patch-ae
+++ b/devel/libtool14/files/patch-ae
@@ -1,13 +1,14 @@
---- configure.orig	Fri Jul  2 09:01:56 1999
-+++ configure	Tue Aug 31 23:45:29 1999
-@@ -1853,10 +1853,6 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
+--- configure.orig	Wed Oct 23 02:26:05 2002
++++ configure	Mon Feb 17 02:04:57 2003
+@@ -865,3 +865,3 @@
+ 
+-PACKAGE=libtool
++PACKAGE=libtool14
+ 
+@@ -6089,6 +6089,2 @@
        esac
 -  case "$ac_given_INSTALL" in
 -        [/$]*) INSTALL="$ac_given_INSTALL" ;;
 -        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 -        esac
  
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/devel/libtool14/files/patch-af b/devel/libtool14/files/patch-af
index beb6be3b456f..1298dce981e1 100644
--- a/devel/libtool14/files/patch-af
+++ b/devel/libtool14/files/patch-af
@@ -1,13 +1,11 @@
---- libltdl/Makefile.in.orig	Tue Dec  7 13:03:38 1999
-+++ libltdl/Makefile.in	Mon Jan 17 16:35:34 2000
-@@ -326,17 +326,16 @@
- distdir: $(DISTFILES)
- 	-rm -rf $(distdir)
+--- libltdl/Makefile.in.orig	Wed Oct 23 02:26:07 2002
++++ libltdl/Makefile.in	Mon Feb 17 02:06:58 2003
+@@ -342,3 +342,3 @@
  	mkdir $(distdir)
 -	-chmod 777 $(distdir)
 +	-chmod 555 $(distdir)
  	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
+@@ -346,9 +346,8 @@
  	  if test -d $$d/$$file; then \
 -	    cp -pr $$d/$$file $(distdir)/$$file; \
 +	    echo no copy dir $$d/$$file; \
@@ -20,5 +18,20 @@
  	done
 +	-chmod a+x $(distdir)/configure
  info-am:
- info: info-am
- dvi-am:
+@@ -452,4 +451,4 @@
+ local-install-files: $(DISTFILES)
+-	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
++	-rm -rf $(DESTDIR)$(datadir)/libtool14/libltdl
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool14/libltdl
+ 	@for file in $(DISTFILES); do \
+@@ -457,6 +456,6 @@
+ 	  if test -d $$d/$$file; then \
+-	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
++	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file; \
+ 	  else \
+-	    test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
+-	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
++	    test -f $(DESTDIR)$(datadir)/libtool14/libltdl/$$file \
++	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file || :; \
+ 	  fi; \
diff --git a/devel/libtool14/files/patch-ag b/devel/libtool14/files/patch-ag
deleted file mode 100644
index 5fdcd1924641..000000000000
--- a/devel/libtool14/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libltdl/configure	2001/01/31 10:58:38	1.1
-+++ libltdl/configure	2001/01/31 10:59:14
-@@ -1455,7 +1455,7 @@
- esac
- 
- # Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
-+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
diff --git a/devel/libtool14/files/patch-libtoolize.in b/devel/libtool14/files/patch-libtoolize.in
new file mode 100644
index 000000000000..b92bbeb9d8e9
--- /dev/null
+++ b/devel/libtool14/files/patch-libtoolize.in
@@ -0,0 +1,9 @@
+--- libtoolize.in.orig	Sun Oct 13 16:21:38 2002
++++ libtoolize.in	Mon Feb 17 01:56:19 2003
+@@ -39,4 +39,4 @@
+ 
+-libtool_m4="$aclocaldir/libtool.m4"
+-ltdl_m4="$aclocaldir/ltdl.m4"
++libtool_m4="$aclocaldir/libtool14.m4"
++ltdl_m4="$aclocaldir/ltdl14.m4"
+ 
diff --git a/devel/libtool14/pkg-descr.libltdl b/devel/libtool14/pkg-descr.libltdl
new file mode 100644
index 000000000000..e57b99f21a5c
--- /dev/null
+++ b/devel/libtool14/pkg-descr.libltdl
@@ -0,0 +1,9 @@
+This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
+
+It supports the following dlopen interfaces:
+* dlopen (Solaris, Linux and various BSD flavors)
+* shl_load (HP-UX)
+* LoadLibrary (Win16 and Win32)
+* load_add_on (BeOS)
+* GNU DLD (emulates dynamic linking for static libraries)
+* libtool's dlpreopen
diff --git a/devel/libtool14/pkg-plist b/devel/libtool14/pkg-plist
index f057cdf134b2..c0510d95ad88 100644
--- a/devel/libtool14/pkg-plist
+++ b/devel/libtool14/pkg-plist
@@ -1,29 +1,28 @@
-bin/libtool
-bin/libtoolize
-include/ltdl.h
-@unexec install-info --delete %D/info/libtool.info %D/info/dir
-info/libtool.info
-@exec install-info %D/info/libtool.info %D/info/dir
-lib/libltdl.a
-lib/libltdl.so
-lib/libltdl.so.1
-share/aclocal/libtool.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
-share/libtool/libltdl/acinclude.m4
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.in
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/stamp-h.in
-share/libtool/ltconfig
-share/libtool/ltmain.sh
-@dirrm share/libtool/libltdl
-@dirrm share/libtool
+@comment $FreeBSD$
+bin/libtool14
+bin/libtoolize14
+libexec/libtool14/libtool
+libexec/libtool14/libtoolize
+@unexec install-info --delete %D/info/libtool14.info %D/info/dir
+info/libtool14.info
+@exec install-info %D/info/libtool14.info %D/info/dir
+share/aclocal/libtool14.m4
+share/aclocal/ltdl14.m4
+share/libtool14/config.guess
+share/libtool14/config.sub
+share/libtool14/libltdl/COPYING.LIB
+share/libtool14/libltdl/Makefile.am
+share/libtool14/libltdl/Makefile.in
+share/libtool14/libltdl/README
+share/libtool14/libltdl/acinclude.m4
+share/libtool14/libltdl/aclocal.m4
+share/libtool14/libltdl/config-h.in
+share/libtool14/libltdl/configure
+share/libtool14/libltdl/configure.in
+share/libtool14/libltdl/ltdl.c
+share/libtool14/libltdl/ltdl.h
+share/libtool14/libltdl/stamp-h.in
+share/libtool14/ltmain.sh
+@dirrm share/libtool14/libltdl
+@dirrm share/libtool14
+@dirrm libexec/libtool14
diff --git a/devel/libtool14/pkg-plist.libltdl b/devel/libtool14/pkg-plist.libltdl
new file mode 100644
index 000000000000..1a8458d1a65c
--- /dev/null
+++ b/devel/libtool14/pkg-plist.libltdl
@@ -0,0 +1,5 @@
+@comment $FreeBSD$
+include/ltdl.h
+lib/libltdl.a
+lib/libltdl.so
+lib/libltdl.so.4
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index fe6e1d76b734..573ac0226009 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -5,26 +5,53 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libtool
-PORTVERSION=	1.3.4
-PORTREVISION=	4
+PORTNAME?=	libtool
+PORTVERSION=	1.4.3
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
+DISTNAME=	libtool-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
-COMMENT=	Generic shared library support script
-
-# This port has not been upgraded to 1.4 because it is used by about 30% of
-# the ports collection, and more testing is needed.  If someone can supply a
-# working patch then it will be upgraded.
+COMMENT?=	Generic shared library support script
 
+LATEST_LINK?=	libtool14
+GNU_CONFIGURE=	 yes
+CONFIGURE_ARGS?= --disable-ltdl-install
+CONFIGURE_ARGS+= --program-suffix=14
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PREFIX=${PREFIX}
+CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool14
+USE_REINPLACE=	yes
+
+.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
+pre-everything:
+	@${ECHO} ===========================================================
+	@${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables"
+	@${ECHO} "defined either in environment or in make(1) arguments."
+	@${ECHO} "Please undefine them and try again."
+	@${ECHO} ===========================================================
+	@${FALSE}
+.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
+
+post-extract:
+	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool14.m4
+	@${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl14.m4
+	@${REINPLACE_CMD} -e 's|libtool.m4|libtool14.m4|g' \
+			  -e 's|ltdl.m4|ltdl14.m4|g' ${WRKSRC}/Makefile.in
+	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool14.info
+	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool14.texi
 
-.ifdef USE_LIBTOOL
-.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.if ${PORTNAME} == "libtool"
+post-install:
+	@-${RM} -fr ${PREFIX}/libexec/libtool14
+	${MKDIR} ${PREFIX}/libexec/libtool14
+.for i in libtool libtoolize
+	${LN} -sf ${PREFIX}/bin/${i}14 ${PREFIX}/libexec/libtool14/${i}
+.endfor
+.for i in config.guess config.sub
+	${MV} ${PREFIX}/share/libtool14/${i}14 ${PREFIX}/share/libtool14/${i}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo
index c39e3aaff92d..7cace71782d6 100644
--- a/devel/libtool15/distinfo
+++ b/devel/libtool15/distinfo
@@ -1 +1 @@
-MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e
+MD5 (libtool-1.4.3.tar.gz) = d11a3c835449d7fa50a025dc9c01ad81
diff --git a/devel/libtool15/files/patch-aa b/devel/libtool15/files/patch-aa
index 91ff871e5ae3..8ba2b3510563 100644
--- a/devel/libtool15/files/patch-aa
+++ b/devel/libtool15/files/patch-aa
@@ -1,11 +1,15 @@
---- doc/libtool.texi.orig	Tue Jun 29 15:48:12 1999
-+++ doc/libtool.texi	Tue Aug 31 23:41:25 1999
-@@ -11,7 +11,7 @@
- @set MAILLIST the libtool mailing list @email{libtool@@gnu.org}
- @set objdir .libs
+--- doc/libtool14.info.orig	Wed Oct 23 02:26:36 2002
++++ doc/libtool14.info	Mon Feb 17 01:46:42 2003
+@@ -3,5 +3,5 @@
  
--@dircategory GNU programming tools
-+@dircategory Programming & development tools
- @direntry
- * Libtool: (libtool).           Generic shared library support script.
- @end direntry
+-INFO-DIR-SECTION GNU programming tools
++INFO-DIR-SECTION Programming & development tools
+ START-INFO-DIR-ENTRY
+-* Libtool: (libtool).           Generic shared library support script.
++* Libtool: (libtool14).           Generic shared library support script.
+ END-INFO-DIR-ENTRY
+@@ -10,3 +10,3 @@
+ START-INFO-DIR-ENTRY
+-* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
++* libtoolize: (libtool14)Invoking libtoolize.     Adding libtool support.
+ END-INFO-DIR-ENTRY
diff --git a/devel/libtool15/files/patch-ab b/devel/libtool15/files/patch-ab
index f96b92eac308..384c86a0bd18 100644
--- a/devel/libtool15/files/patch-ab
+++ b/devel/libtool15/files/patch-ab
@@ -1,11 +1,50 @@
---- doc/Makefile.in.orig	Fri Jul  2 09:24:54 1999
-+++ doc/Makefile.in	Tue Aug 31 23:41:57 1999
-@@ -70,7 +70,7 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
+--- doc/Makefile.in.orig	Wed Oct 23 02:51:04 2002
++++ doc/Makefile.in	Mon Feb 17 02:01:16 2003
+@@ -72,3 +72,3 @@
  LN_S = @LN_S@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  NM = @NM@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
+@@ -85,4 +85,4 @@
+ AUTOMAKE_OPTIONS = gnits
+-info_TEXINFOS = libtool.texi
+-libtool_TEXINFOS = PLATFORMS fdl.texi
++info_TEXINFOS = libtool14.texi
++libtool14_TEXINFOS = PLATFORMS fdl.texi
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -90,6 +90,6 @@
+ TEXI2DVI = texi2dvi
+-INFO_DEPS = libtool.info
+-DVIS = libtool.dvi
+-TEXINFOS = libtool.texi
+-DIST_COMMON =  $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \
++INFO_DEPS = libtool14.info
++DVIS = libtool14.dvi
++TEXINFOS = libtool14.texi
++DIST_COMMON =  $(libtool14_TEXINFOS) Makefile.am Makefile.in mdate-sh \
+ stamp-vti texinfo.tex version.texi
+@@ -115,4 +115,4 @@
+ 
+-$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in
+-	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp
++$(srcdir)/stamp-vti: libtool14.texi $(top_srcdir)/configure.in
++	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool14.texi`" > vti.tmp
+ 	@echo "@set EDITION $(VERSION)" >> vti.tmp
+@@ -135,4 +135,4 @@
+ 
+-libtool.info: libtool.texi version.texi $(libtool_TEXINFOS)
+-libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS)
++libtool14.info: libtool14.texi version.texi $(libtool14_TEXINFOS)
++libtool14.dvi: libtool14.texi version.texi $(libtool14_TEXINFOS)
+ 
+@@ -235,6 +235,6 @@
+ mostlyclean-aminfo:
+-	-rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \
+-	  libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \
+-	  libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \
+-	  libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn
++	-rm -f libtool14.aux libtool14.cp libtool14.cps libtool14.dvi libtool14.fn \
++	  libtool14.fns libtool14.ky libtool14.kys libtool14.ps libtool14.log \
++	  libtool14.pg libtool14.toc libtool14.tp libtool14.tps libtool14.vr \
++	  libtool14.vrs libtool14.op libtool14.tr libtool14.cv libtool14.cn
+ 
diff --git a/devel/libtool15/files/patch-ac b/devel/libtool15/files/patch-ac
deleted file mode 100644
index 3a1894e10003..000000000000
--- a/devel/libtool15/files/patch-ac
+++ /dev/null
@@ -1,157 +0,0 @@
-
-$FreeBSD$
-
---- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Sat Jun  8 11:48:12 2002
-@@ -169,7 +169,7 @@
- # Constants:
- PROGRAM=ltconfig
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-@@ -185,6 +185,8 @@
- # which needs '.lib').
- enable_static=yes
- enable_fast_install=yes
-+install_ltlibs=yes
-+release_suffix=yes
- enable_dlopen=unknown
- enable_win32_dll=no
- ltmain=
-@@ -242,10 +244,14 @@
- 
- Generate a system-specific libtool script.
- 
-+    --build                no-op to keep compatability with configure scripts generated for 1.4
-     --debug                enable verbose shell tracing
-     --disable-shared       do not build shared libraries
-     --disable-static       do not build static libraries
-     --disable-fast-install do not optimize for fast installation
-+    --disable-ltlibs       don't install the .la archives
-+    --release-ignore       don't use -release specification
-+    --release-suffix       use -release suffix for all files
-     --enable-dlopen        enable dlopen support
-     --enable-win32-dll     enable building dlls on win32 hosts
-     --help                 display this help and exit
-@@ -268,6 +274,8 @@
-   exit 0
-   ;;
- 
-+  --build=*) ;;
-+
-   --debug)
-     echo "$progname: enabling shell trace mode"
-     set -x
-@@ -279,6 +287,12 @@
- 
-   --disable-fast-install) enable_fast_install=no ;;
- 
-+  --disable-ltlibs) install_ltlibs=no ;;
-+
-+  --release-ignore) release_suffix=no ;;
-+
-+  --release-suffix) release_suffix=all ;;
-+
-   --enable-dlopen) enable_dlopen=yes ;;
- 
-   --enable-win32-dll) enable_win32_dll=yes ;;
-@@ -971,11 +985,11 @@
-   $rm conftest.dat
-   if ln -s X conftest.dat 2>/dev/null; then
-     $rm conftest.dat
--    LN_S="ln -s"
-+    LN_S="ln -sf"
-   else
-     LN_S=ln
-   fi
--  if test "$LN_S" = "ln -s"; then
-+  if test "$LN_S" = "ln -sf"; then
-     echo "$ac_t"yes 1>&6
-   else
-     echo "$ac_t"no 1>&6
-@@ -1226,8 +1240,8 @@
- 
-   *)
-     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-     else
-       ld_shlibs=no
-     fi
-@@ -1353,14 +1367,6 @@
-     hardcode_shlibpath_var=no
-     ;;
- 
--  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
--    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
--
-   hpux9* | hpux10* | hpux11*)
-     case "$host_os" in
-     hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1781,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+sys_lib_search_path_spec="/lib /usr/lib"
- file_magic_cmd=
- file_magic_test_file=
- deplibs_check_method='unknown'
-@@ -1873,19 +1879,22 @@
-   version_type=freebsd-$objformat
-   case "$version_type" in
-     freebsd-elf*)
--      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
--      file_magic_cmd=/usr/bin/file
--      file_magic_test_file=`echo /usr/lib/libc.so*`
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
--      need_version=no
--      need_lib_prefix=no
-+      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
-       ;;
-     freebsd-*)
--      deplibs_check_method=unknown
--      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
--      need_version=yes
-+      deplibs_check_method='file_magic FreeBSD.* shared library'
-       ;;
-   esac
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test "$release_suffix" = all; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
-+  fi 
-+  need_version=no
-+  need_lib_prefix=no
-+  finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   case "$host_os" in
-   freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2785,15 @@
- 
- # Shell to use when invoking shell scripts.
- SHELL=$LTSHELL
-+
-+# Whether to waste disk space.
-+install_ltlibs=$install_ltlibs 
-+
-+# What to do with -release.
-+#  yes - only for shared archive
-+#  no  - ingnore
-+#  all - for all archives
-+release_suffix=$release_suffix
- 
- # Whether or not to build shared libraries.
- build_libtool_libs=$enable_shared
diff --git a/devel/libtool15/files/patch-ad b/devel/libtool15/files/patch-ad
index 3ec71700ffbb..c04c4dd4a24c 100644
--- a/devel/libtool15/files/patch-ad
+++ b/devel/libtool15/files/patch-ad
@@ -1,226 +1,32 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Tue Dec  7 23:50:49 1999
-+++ ltmain.sh	Thu May  2 10:24:05 2002
-@@ -23,6 +23,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
+--- ltmain.sh.orig	Mon Sep 10 22:33:26 2001
++++ ltmain.sh	Wed Jan 23 16:39:22 2002
+@@ -1062,6 +1062,12 @@
  
-+EXPR_COMPAT=1
-+export EXPR_COMPAT
-+
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-   # Discard the --no-reexec flag, and continue.
-@@ -54,7 +57,7 @@
- # Constants.
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- 
- default_mode=
-@@ -952,7 +955,11 @@
- 	  continue
- 	  ;;
- 	release)
--	  release="-$arg"
-+	  if test "$release_suffix" = all; then
-+	    release="$arg"
-+	  elif test "$release_suffix" = yes; then
-+	    release="-$arg"
-+	  fi
- 	  prev=
- 	  continue
- 	  ;;
-@@ -1005,6 +1012,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -1091,6 +1099,10 @@
- 	deplibs="$deplibs $arg"
- 	;;
- 
-+      -?thread)
-+	deplibs="$deplibs $arg"
-+	;;
-+
        -module)
  	module=yes
++	case $host in
++	*-*-freebsd*)
++	  # Do not build the useless static library
++	  build_old_libs=no
++	  ;;
++	esac
  	continue
-@@ -1168,7 +1180,7 @@
- 
-       *.o | *.obj | *.a | *.lib)
- 	# A standard object.
--	objs="$objs $arg"
-+	libobjs="$libobjs $arg"
  	;;
  
-       *.lo)
-@@ -1603,12 +1615,6 @@
- 	exit 1
-       fi
- 
--      # How the heck are we supposed to write a wrapper for a shared library?
--      if test -n "$link_against_libtool_libs"; then
--	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
--	 exit 1
--      fi
--
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
-       fi
-@@ -1795,6 +1801,9 @@
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
+@@ -2444,6 +2450,9 @@
+ 	  *-*-openbsd*)
+ 	    # 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.
- 	  deplibs="$deplibs -lc"
-@@ -1802,6 +1811,94 @@
- 	esac
-       fi
- 
-+      if test -n "$rpath$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	for libdir in $rpath $xrpath; do
-+	  # This is the magic to use -rpath.
-+	  case "$compile_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) compile_rpath="$compile_rpath $libdir" ;;
-+	  esac
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+      fi
-+
-+      # Now hardcode the library paths
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $compile_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      compile_rpath="$rpath"
-+
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$finalize_perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      finalize_rpath="$rpath"
-+
-       # Create the output directory, or remove our outputs if we need to.
-       if test -d $output_objdir; then
- 	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-@@ -1817,7 +1914,11 @@
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	if test "$release_suffix" = all; then
-+	 oldlibs="$oldlibs $output_objdir/$libname$release.$libext"
-+	else
-+	 oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	fi
- 
- 	# Transform .lo files to .o files.
- 	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-@@ -2011,7 +2112,11 @@
- 	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
--	      oldlibs="$output_objdir/$libname.$libext"
-+	      if test "$release_suffix" = all; then
-+	        oldlibs="$output_objdir/$libname$release.$libext"
-+	      else
-+	        oldlibs="$output_objdir/$libname.$libext"
-+	      fi
- 	      build_libtool_libs=module
- 	      build_old_libs=yes
- 	    else
-@@ -3059,7 +3164,11 @@
-     case "$output" in
-     *.la)
-       old_library=
--      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      if test "$release_suffix" = all; then
-+        test "$build_old_libs" = yes && old_library="$libname$release.$libext"
-+      else
-+        test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      fi
-       $show "creating $output"
- 
-       if test -n "$xrpath"; then
-@@ -3348,10 +3457,12 @@
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4210,10 +4219,17 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
@@ -228,20 +34,17 @@ $FreeBSD$
 -	instname="$dir/$name"i
 -	$show "$install_prog $instname $destdir/$name"
 -	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	if test "$install_ltlibs" = yes; then
++	case $host in
++	*-*-freebsd*)
++	  # Do not install the useless pseudo-library
++	  ;;
++	*)
 +	  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
++	  ;;
++	esac
  
  	# Maybe install the static library, too.
  	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-@@ -3440,7 +3551,6 @@
- 	    fi
- 	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
--	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- 	      finalize=no
- 	    fi
- 	  done
diff --git a/devel/libtool15/files/patch-ae b/devel/libtool15/files/patch-ae
index c92b003b58cd..62aeecd4ae60 100644
--- a/devel/libtool15/files/patch-ae
+++ b/devel/libtool15/files/patch-ae
@@ -1,13 +1,14 @@
---- configure.orig	Fri Jul  2 09:01:56 1999
-+++ configure	Tue Aug 31 23:45:29 1999
-@@ -1853,10 +1853,6 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
+--- configure.orig	Wed Oct 23 02:26:05 2002
++++ configure	Mon Feb 17 02:04:57 2003
+@@ -865,3 +865,3 @@
+ 
+-PACKAGE=libtool
++PACKAGE=libtool14
+ 
+@@ -6089,6 +6089,2 @@
        esac
 -  case "$ac_given_INSTALL" in
 -        [/$]*) INSTALL="$ac_given_INSTALL" ;;
 -        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 -        esac
  
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/devel/libtool15/files/patch-af b/devel/libtool15/files/patch-af
index beb6be3b456f..1298dce981e1 100644
--- a/devel/libtool15/files/patch-af
+++ b/devel/libtool15/files/patch-af
@@ -1,13 +1,11 @@
---- libltdl/Makefile.in.orig	Tue Dec  7 13:03:38 1999
-+++ libltdl/Makefile.in	Mon Jan 17 16:35:34 2000
-@@ -326,17 +326,16 @@
- distdir: $(DISTFILES)
- 	-rm -rf $(distdir)
+--- libltdl/Makefile.in.orig	Wed Oct 23 02:26:07 2002
++++ libltdl/Makefile.in	Mon Feb 17 02:06:58 2003
+@@ -342,3 +342,3 @@
  	mkdir $(distdir)
 -	-chmod 777 $(distdir)
 +	-chmod 555 $(distdir)
  	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
+@@ -346,9 +346,8 @@
  	  if test -d $$d/$$file; then \
 -	    cp -pr $$d/$$file $(distdir)/$$file; \
 +	    echo no copy dir $$d/$$file; \
@@ -20,5 +18,20 @@
  	done
 +	-chmod a+x $(distdir)/configure
  info-am:
- info: info-am
- dvi-am:
+@@ -452,4 +451,4 @@
+ local-install-files: $(DISTFILES)
+-	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
++	-rm -rf $(DESTDIR)$(datadir)/libtool14/libltdl
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool14/libltdl
+ 	@for file in $(DISTFILES); do \
+@@ -457,6 +456,6 @@
+ 	  if test -d $$d/$$file; then \
+-	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
++	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file; \
+ 	  else \
+-	    test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
+-	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
++	    test -f $(DESTDIR)$(datadir)/libtool14/libltdl/$$file \
++	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file || :; \
+ 	  fi; \
diff --git a/devel/libtool15/files/patch-ag b/devel/libtool15/files/patch-ag
deleted file mode 100644
index 5fdcd1924641..000000000000
--- a/devel/libtool15/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libltdl/configure	2001/01/31 10:58:38	1.1
-+++ libltdl/configure	2001/01/31 10:59:14
-@@ -1455,7 +1455,7 @@
- esac
- 
- # Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
-+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
diff --git a/devel/libtool15/files/patch-libtoolize.in b/devel/libtool15/files/patch-libtoolize.in
new file mode 100644
index 000000000000..b92bbeb9d8e9
--- /dev/null
+++ b/devel/libtool15/files/patch-libtoolize.in
@@ -0,0 +1,9 @@
+--- libtoolize.in.orig	Sun Oct 13 16:21:38 2002
++++ libtoolize.in	Mon Feb 17 01:56:19 2003
+@@ -39,4 +39,4 @@
+ 
+-libtool_m4="$aclocaldir/libtool.m4"
+-ltdl_m4="$aclocaldir/ltdl.m4"
++libtool_m4="$aclocaldir/libtool14.m4"
++ltdl_m4="$aclocaldir/ltdl14.m4"
+ 
diff --git a/devel/libtool15/pkg-descr.libltdl b/devel/libtool15/pkg-descr.libltdl
new file mode 100644
index 000000000000..e57b99f21a5c
--- /dev/null
+++ b/devel/libtool15/pkg-descr.libltdl
@@ -0,0 +1,9 @@
+This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
+
+It supports the following dlopen interfaces:
+* dlopen (Solaris, Linux and various BSD flavors)
+* shl_load (HP-UX)
+* LoadLibrary (Win16 and Win32)
+* load_add_on (BeOS)
+* GNU DLD (emulates dynamic linking for static libraries)
+* libtool's dlpreopen
diff --git a/devel/libtool15/pkg-plist b/devel/libtool15/pkg-plist
index f057cdf134b2..c0510d95ad88 100644
--- a/devel/libtool15/pkg-plist
+++ b/devel/libtool15/pkg-plist
@@ -1,29 +1,28 @@
-bin/libtool
-bin/libtoolize
-include/ltdl.h
-@unexec install-info --delete %D/info/libtool.info %D/info/dir
-info/libtool.info
-@exec install-info %D/info/libtool.info %D/info/dir
-lib/libltdl.a
-lib/libltdl.so
-lib/libltdl.so.1
-share/aclocal/libtool.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
-share/libtool/libltdl/acinclude.m4
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.in
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/stamp-h.in
-share/libtool/ltconfig
-share/libtool/ltmain.sh
-@dirrm share/libtool/libltdl
-@dirrm share/libtool
+@comment $FreeBSD$
+bin/libtool14
+bin/libtoolize14
+libexec/libtool14/libtool
+libexec/libtool14/libtoolize
+@unexec install-info --delete %D/info/libtool14.info %D/info/dir
+info/libtool14.info
+@exec install-info %D/info/libtool14.info %D/info/dir
+share/aclocal/libtool14.m4
+share/aclocal/ltdl14.m4
+share/libtool14/config.guess
+share/libtool14/config.sub
+share/libtool14/libltdl/COPYING.LIB
+share/libtool14/libltdl/Makefile.am
+share/libtool14/libltdl/Makefile.in
+share/libtool14/libltdl/README
+share/libtool14/libltdl/acinclude.m4
+share/libtool14/libltdl/aclocal.m4
+share/libtool14/libltdl/config-h.in
+share/libtool14/libltdl/configure
+share/libtool14/libltdl/configure.in
+share/libtool14/libltdl/ltdl.c
+share/libtool14/libltdl/ltdl.h
+share/libtool14/libltdl/stamp-h.in
+share/libtool14/ltmain.sh
+@dirrm share/libtool14/libltdl
+@dirrm share/libtool14
+@dirrm libexec/libtool14
diff --git a/devel/libtool15/pkg-plist.libltdl b/devel/libtool15/pkg-plist.libltdl
new file mode 100644
index 000000000000..1a8458d1a65c
--- /dev/null
+++ b/devel/libtool15/pkg-plist.libltdl
@@ -0,0 +1,5 @@
+@comment $FreeBSD$
+include/ltdl.h
+lib/libltdl.a
+lib/libltdl.so
+lib/libltdl.so.4
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index 172a5fb091e1..a658f6bb44c7 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -13,11 +13,15 @@ MASTER_SITES=	ftp://gdal.velocet.ca/pub/outgoing/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C API for reading and writing ArcView Shapefiles
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
-
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	# none
 ALL_TARGET=	lib
 INSTALLS_SHLIB=	yes
 
+# no configure script, but we need the libtool environment
+do-configure:
+	@${CP} ${LIBTOOL} ${WRKSRC}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/.libs/libshp.so.1 ${PREFIX}/lib
 	${LN} -sf libshp.so.1 ${PREFIX}/lib/libshp.so
diff --git a/devel/shapelib/files/patch-aa b/devel/shapelib/files/patch-aa
index 1efd1a0cff62..add8dee42a54 100644
--- a/devel/shapelib/files/patch-aa
+++ b/devel/shapelib/files/patch-aa
@@ -1,11 +1,6 @@
-
-$FreeBSD$
-
---- Makefile.orig	Tue Mar 28 18:36:27 2000
-+++ Makefile	Thu May 31 13:19:38 2001
-@@ -89,33 +89,32 @@
- 
- # -----------------------------------------------------------------------------
+--- Makefile.orig	Tue Mar 28 15:36:27 2000
++++ Makefile	Wed Feb 19 20:32:54 2003
+@@ -91,23 +91,23 @@
  # The following is contributed by Jan-Oliver Wagner, and should allow for
 -# creating shared libraries on most platforms with gcc, and libtool installed.
 +# creating shared libraries on most platforms with $(CC), and libtool installed.
@@ -19,12 +14,12 @@ $FreeBSD$
 -	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shpopen.c
 -	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
 -	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1
-+	/bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c shpopen.c
++	/bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c shpopen.c
 +	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c  -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
 +	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shpopen.c -o shpopen.o >/dev/null 2>&1
  	mv -f .libs/shpopen.lo shpopen.lo
 -	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shptree.c
-+	/bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c shptree.c
++	/bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c shptree.c
  	rm -f .libs/shptree.lo
 -	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shptree.c -o .libs/shptree.lo
 -	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1
@@ -32,7 +27,7 @@ $FreeBSD$
 +	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shptree.c -o shptree.o >/dev/null 2>&1
  	mv -f .libs/shptree.lo shptree.lo
 -	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c dbfopen.c
-+	/bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c dbfopen.c
++	/bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c dbfopen.c
  	rm -f .libs/dbfopen.lo
 -	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo
 -	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1
@@ -40,22 +35,9 @@ $FreeBSD$
 +	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c dbfopen.c -o dbfopen.o >/dev/null 2>&1
  	mv -f .libs/dbfopen.lo dbfopen.lo
 -	/bin/sh ./libtool --mode=link gcc  -g -O2  -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo  
-+	/bin/sh /usr/local/bin/libtool --mode=link $(CC)  $(CFLAGS)  -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo  
++	/bin/sh ./libtool --mode=link $(CC) $(CFLAGS) -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo  
  	rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
- 	rm -fr .libs/libshp.lax
- 	mkdir .libs/libshp.lax
- 	/usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)  shpopen.lo shptree.lo dbfopen.lo  -lc
+@@ -117,3 +117,2 @@
  
 -	(cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
  	(cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)
- 	ar cru .libs/libshp.a  shpopen.o shptree.o dbfopen.o 
- 	ranlib .libs/libshp.a
-@@ -125,7 +124,7 @@
- lib_install:
- 	cp .libs/libshp.la .libs/libshp.lai
- 	/bin/sh ./mkinstalldirs /usr/local/lib
--	/bin/sh ./libtool  --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la
-+	/bin/sh /usr/local/bin/libtool  --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la
- 	/usr/bin/install -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION)
- 	(cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
- 	(cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)
diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index e8223bd846d5..1419ee5094a2 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -26,6 +26,7 @@ USE_JAVA=	1.3+
 USE_GMAKE=	yes
 USE_XPM=	yes
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
 		--with-tclincludedir=${PREFIX}/include/tcl8.3 \
@@ -33,11 +34,18 @@ CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
 		--with-tclscriptdir=${PREFIX}/lib/tcl8.3 \
 		--with-tkscriptdir=${PREFIX}/lib/tk8.3 \
 		--enable-subdirs
+PLIST_SUB=	JAVA="@comment "
 .if defined(WITH_JAVA)
 CONFIGURE_ARGS+=	--with-jdkdir=${JAVA_HOME}
-PLIST=		${PKGDIR}/pkg-plist.withjava
+PLIST_SUB=	JAVA=""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
+		${WRKSRC}/configure
+
 pre-everything::
 .if !defined(WITH_JAVA)
 	@${ECHO_MSG} "===>"
@@ -50,6 +58,9 @@ pre-everything::
 	@${ECHO_MSG} "===>"
 .endif
 
+post-patch:
+
+
 post-install:
 	${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
 
diff --git a/devel/swarm/files/patch-ac b/devel/swarm/files/patch-ac
index 75ad8b68b286..f84028b72499 100644
--- a/devel/swarm/files/patch-ac
+++ b/devel/swarm/files/patch-ac
@@ -15,8 +15,8 @@
  DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
 -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs %%LTMAIN%% $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  
  # Reload cache, that may have been modified by ltconfig
@@ -25,7 +25,7 @@
  
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig /usr/local/share/libtool/ltmain.sh"
++LIBTOOL_DEPS="%%LTCONFIG%% %%LTMAIN%%"
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/swarm/pkg-plist b/devel/swarm/pkg-plist
index 0700c7067185..f591680c2bc8 100644
--- a/devel/swarm/pkg-plist
+++ b/devel/swarm/pkg-plist
@@ -1,3 +1,5 @@
+%%JAVA%%bin/javaswarm
+%%JAVA%%bin/javacswarm
 bin/libtool-swarm
 bin/m2h
 bin/make-h2x
@@ -238,6 +240,12 @@ lib/swarm/libcollections.so.3
 lib/swarm/libdefobj.a
 lib/swarm/libdefobj.so
 lib/swarm/libdefobj.so.4
+%%JAVA%%lib/swarm/libjavaswarm.a
+%%JAVA%%lib/swarm/libjavaswarm.so
+%%JAVA%%lib/swarm/libjavaswarm.so.1
+%%JAVA%%lib/swarm/libjavaswarmstubs.a
+%%JAVA%%lib/swarm/libjavaswarmstubs.so
+%%JAVA%%lib/swarm/libjavaswarmstubs.so.0
 lib/swarm/libmisc.a
 lib/swarm/libmisc.so
 lib/swarm/libmisc.so.2
@@ -269,6 +277,8 @@ lib/swarm/libtclobjc.so.1
 lib/swarm/libtkobjc.a
 lib/swarm/libtkobjc.so
 lib/swarm/libtkobjc.so.5
+%%JAVA%%share/swarm/swarm.jar
+%%JAVA%%@dirrm share/swarm
 @dirrm etc/swarm
 @dirrm include/swarm/activity
 @dirrm include/swarm/analysis
diff --git a/devel/swarm/pkg-plist.withjava b/devel/swarm/pkg-plist.withjava
deleted file mode 100644
index a38ce40261c8..000000000000
--- a/devel/swarm/pkg-plist.withjava
+++ /dev/null
@@ -1,297 +0,0 @@
-bin/javaswarm
-bin/javacswarm
-bin/libtool-swarm
-bin/m2h
-bin/make-h2x
-etc/swarm/Makefile.appl
-etc/swarm/Makefile.common
-etc/swarm/Makefile.lib
-etc/swarm/Makefile.rules
-etc/swarm/config.swarm
-include/swarm/activity.h
-include/swarm/activity/Action.h
-include/swarm/activity/ActionGroup.h
-include/swarm/activity/CompoundAction.h
-include/swarm/activity/Schedule.h
-include/swarm/activity/SwarmProcess.h
-include/swarm/activity/XActivity.h
-include/swarm/activity/classes.h
-include/swarm/activity/types.h
-include/swarm/analysis.h
-include/swarm/analysis/ActiveGraph.h
-include/swarm/analysis/ActiveOutFile.h
-include/swarm/analysis/Averager.h
-include/swarm/analysis/EZBin.h
-include/swarm/analysis/EZDistribution.h
-include/swarm/analysis/EZGraph.h
-include/swarm/analysis/Entropy.h
-include/swarm/analysis/FunctionGraph.h
-include/swarm/collections.h
-include/swarm/collections/Array.h
-include/swarm/collections/Collection.h
-include/swarm/collections/InputStream.h
-include/swarm/collections/List.h
-include/swarm/collections/ListShuffler.h
-include/swarm/collections/List_GEN.h
-include/swarm/collections/List_linked.h
-include/swarm/collections/List_mlinks.h
-include/swarm/collections/Map.h
-include/swarm/collections/OrderedSet.h
-include/swarm/collections/OutputStream.h
-include/swarm/collections/Permutation.h
-include/swarm/collections/Set.h
-include/swarm/collections/Stream.h
-include/swarm/collections/StringObject.h
-include/swarm/collections/classes.h
-include/swarm/collections/collections.h
-include/swarm/collections/predicates.h
-include/swarm/collections/types.h
-include/swarm/defobj.h
-include/swarm/defobj/Archiver.h
-include/swarm/defobj/Arguments.h
-include/swarm/defobj/Create.h
-include/swarm/defobj/Customize.h
-include/swarm/defobj/DefClass.h
-include/swarm/defobj/DefObject.h
-include/swarm/defobj/FArguments.h
-include/swarm/defobj/FCall.h
-include/swarm/defobj/HDF5Archiver.h
-include/swarm/defobj/HDF5Object.h
-include/swarm/defobj/JavaCollection.h
-include/swarm/defobj/JavaCollectionIndex.h
-include/swarm/defobj/JavaProxy.h
-include/swarm/defobj/LispArchiver.h
-include/swarm/defobj/Program.h
-include/swarm/defobj/Symbol.h
-include/swarm/defobj/Zone.h
-include/swarm/defobj/classes.h
-include/swarm/defobj/defalloc.h
-include/swarm/defobj/deftype.h
-include/swarm/defobj/directory.h
-include/swarm/defobj/javavars.h
-include/swarm/defobj/types.h
-include/swarm/defobj/version.h
-include/swarm/externvar.h
-include/swarm/gui.h
-include/swarm/misc.h
-include/swarm/misc/argp.h
-include/swarm/misc/avl.h
-include/swarm/misc/getopt.h
-include/swarm/objc/NXConstStr.h
-include/swarm/objc/Object.h
-include/swarm/objc/Protocol.h
-include/swarm/objc/encoding.h
-include/swarm/objc/externvar.h
-include/swarm/objc/hash.h
-include/swarm/objc/mframe.h
-include/swarm/objc/objc-api.h
-include/swarm/objc/objc-list.h
-include/swarm/objc/objc.h
-include/swarm/objc/runtime.h
-include/swarm/objc/sarray.h
-include/swarm/objc/thr.h
-include/swarm/objc/typedstream.h
-include/swarm/objectbase.h
-include/swarm/objectbase/ActivityControl.h
-include/swarm/objectbase/CompleteProbeMap.h
-include/swarm/objectbase/CompleteVarMap.h
-include/swarm/objectbase/CustomProbeMap.h
-include/swarm/objectbase/DefaultProbeMap.h
-include/swarm/objectbase/EmptyProbeMap.h
-include/swarm/objectbase/MessageProbe.h
-include/swarm/objectbase/Probe.h
-include/swarm/objectbase/ProbeLibrary.h
-include/swarm/objectbase/ProbeMap.h
-include/swarm/objectbase/Swarm.h
-include/swarm/objectbase/SwarmObject.h
-include/swarm/objectbase/VarProbe.h
-include/swarm/objectbase/probing.h
-include/swarm/objectbase/swarm_rts_routines.h
-include/swarm/random.h
-include/swarm/random/ACGgen.h
-include/swarm/random/BernoulliDist.h
-include/swarm/random/C2LCGXgen.h
-include/swarm/random/C2MRG3gen.h
-include/swarm/random/C2TAUSgen.h
-include/swarm/random/C3MWCgen.h
-include/swarm/random/C4LCGXgen.h
-include/swarm/random/ExponentialDist.h
-include/swarm/random/GammaDist.h
-include/swarm/random/LCGgen.h
-include/swarm/random/LogNormalDist.h
-include/swarm/random/MRGgen.h
-include/swarm/random/MT19937gen.h
-include/swarm/random/MWCAgen.h
-include/swarm/random/MWCBgen.h
-include/swarm/random/NormalDist.h
-include/swarm/random/PMMLCGgen.h
-include/swarm/random/PSWBgen.h
-include/swarm/random/RWC2gen.h
-include/swarm/random/RWC8gen.h
-include/swarm/random/RandomBitDist.h
-include/swarm/random/SCGgen.h
-include/swarm/random/SWBgen.h
-include/swarm/random/TGFSRgen.h
-include/swarm/random/UniformDoubleDist.h
-include/swarm/random/UniformIntegerDist.h
-include/swarm/random/UniformUnsignedDist.h
-include/swarm/random/distributions.h
-include/swarm/random/generators.h
-include/swarm/random/randomdefs.h
-include/swarm/random/randomvars.h
-include/swarm/simtools.h
-include/swarm/simtools/AppendFile.h
-include/swarm/simtools/InFile.h
-include/swarm/simtools/NSelect.h
-include/swarm/simtools/ObjectLoader.h
-include/swarm/simtools/ObjectSaver.h
-include/swarm/simtools/OutFile.h
-include/swarm/simtools/QSort.h
-include/swarm/simtools/UName.h
-include/swarm/simtools/initSwarm.h
-include/swarm/simtoolsgui.h
-include/swarm/simtoolsgui/ActionCache.h
-include/swarm/simtoolsgui/ActionHolder.h
-include/swarm/simtoolsgui/ClassDisplayWidget.h
-include/swarm/simtoolsgui/CommonProbeDisplay.h
-include/swarm/simtoolsgui/CompleteProbeDisplay.h
-include/swarm/simtoolsgui/ControlPanel.h
-include/swarm/simtoolsgui/GUIComposite.h
-include/swarm/simtoolsgui/GUISwarm.h
-include/swarm/simtoolsgui/MessageProbeWidget.h
-include/swarm/simtoolsgui/MultiVarProbeDisplay.h
-include/swarm/simtoolsgui/MultiVarProbeWidget.h
-include/swarm/simtoolsgui/ProbeDisplay.h
-include/swarm/simtoolsgui/ProbeDisplayManager.h
-include/swarm/simtoolsgui/SimpleProbeDisplay.h
-include/swarm/simtoolsgui/SingleProbeDisplay.h
-include/swarm/simtoolsgui/VarProbeWidget.h
-include/swarm/space.h
-include/swarm/space/Ca2d.h
-include/swarm/space/ConwayLife2d.h
-include/swarm/space/DblBuffer2d.h
-include/swarm/space/Diffuse2d.h
-include/swarm/space/Discrete2d.h
-include/swarm/space/Grid2d.h
-include/swarm/space/Int2dFiler.h
-include/swarm/space/Object2dDisplay.h
-include/swarm/space/Value2dDisplay.h
-include/swarm/swarmconfig.h
-include/swarm/tclobjc/TclInterp.h
-include/swarm/tclobjc/TkInterp.h
-include/swarm/tclobjc/tclObjc.h
-include/swarm/tkobjc.h
-include/swarm/tkobjc/ArchivedGeometryWidget.h
-include/swarm/tkobjc/Button.h
-include/swarm/tkobjc/ButtonPanel.h
-include/swarm/tkobjc/Canvas.h
-include/swarm/tkobjc/CanvasAbstractItem.h
-include/swarm/tkobjc/CanvasItem.h
-include/swarm/tkobjc/CheckButton.h
-include/swarm/tkobjc/Circle.h
-include/swarm/tkobjc/ClassDisplayHideButton.h
-include/swarm/tkobjc/ClassDisplayLabel.h
-include/swarm/tkobjc/Colormap.h
-include/swarm/tkobjc/CompleteProbeDisplayLabel.h
-include/swarm/tkobjc/CompositeItem.h
-include/swarm/tkobjc/Entry.h
-include/swarm/tkobjc/Form.h
-include/swarm/tkobjc/Frame.h
-include/swarm/tkobjc/Graph.h
-include/swarm/tkobjc/Histogram.h
-include/swarm/tkobjc/InputWidget.h
-include/swarm/tkobjc/Label.h
-include/swarm/tkobjc/Line.h
-include/swarm/tkobjc/LinkItem.h
-include/swarm/tkobjc/MessageProbeEntry.h
-include/swarm/tkobjc/NodeItem.h
-include/swarm/tkobjc/OvalNodeItem.h
-include/swarm/tkobjc/Pixmap.h
-include/swarm/tkobjc/ProbeCanvas.h
-include/swarm/tkobjc/Raster.h
-include/swarm/tkobjc/Rectangle.h
-include/swarm/tkobjc/RectangleNodeItem.h
-include/swarm/tkobjc/ScheduleItem.h
-include/swarm/tkobjc/SimpleProbeDisplayHideButton.h
-include/swarm/tkobjc/SuperButton.h
-include/swarm/tkobjc/TextItem.h
-include/swarm/tkobjc/TkExtra.h
-include/swarm/tkobjc/VarProbeEntry.h
-include/swarm/tkobjc/VarProbeLabel.h
-include/swarm/tkobjc/Widget.h
-include/swarm/tkobjc/WindowGeometryRecord.h
-include/swarm/tkobjc/ZoomRaster.h
-include/swarm/tkobjc/common.h
-include/swarm/tkobjc/global.h
-include/swarm/tkobjc/internal.h
-include/swarm/tkobjc/win32dib.h
-@unexec install-info --delete %D/info/objc-features.info %D/info/dir
-info/objc-features.info
-@exec install-info %D/info/objc-features.info %D/info/dir
-lib/swarm/libactivity.a
-lib/swarm/libactivity.so
-lib/swarm/libactivity.so.5
-lib/swarm/libanalysis.a
-lib/swarm/libanalysis.so
-lib/swarm/libanalysis.so.4
-lib/swarm/libcollections.a
-lib/swarm/libcollections.so
-lib/swarm/libcollections.so.3
-lib/swarm/libdefobj.a
-lib/swarm/libdefobj.so
-lib/swarm/libdefobj.so.4
-lib/swarm/libmisc.a
-lib/swarm/libjavaswarm.a
-lib/swarm/libjavaswarm.so
-lib/swarm/libjavaswarm.so.1
-lib/swarm/libjavaswarmstubs.a
-lib/swarm/libjavaswarmstubs.so
-lib/swarm/libjavaswarmstubs.so.0
-lib/swarm/libmisc.so
-lib/swarm/libmisc.so.2
-lib/swarm/libobjc.a
-lib/swarm/libobjc.la
-lib/swarm/libobjc.so
-lib/swarm/libobjc.so.0
-lib/swarm/libobjectbase.a
-lib/swarm/libobjectbase.so
-lib/swarm/libobjectbase.so.4
-lib/swarm/librandom.a
-lib/swarm/librandom.so
-lib/swarm/librandom.so.1
-lib/swarm/libsimtools.a
-lib/swarm/libsimtools.so
-lib/swarm/libsimtools.so.4
-lib/swarm/libsimtoolsgui.a
-lib/swarm/libsimtoolsgui.so
-lib/swarm/libsimtoolsgui.so.5
-lib/swarm/libspace.a
-lib/swarm/libspace.so
-lib/swarm/libspace.so.2
-lib/swarm/libswarm.a
-lib/swarm/libswarm.so
-lib/swarm/libswarm.so.0
-lib/swarm/libtclobjc.a
-lib/swarm/libtclobjc.so
-lib/swarm/libtclobjc.so.1
-lib/swarm/libtkobjc.a
-lib/swarm/libtkobjc.so
-lib/swarm/libtkobjc.so.5
-share/swarm/swarm.jar
-@dirrm etc/swarm
-@dirrm include/swarm/activity
-@dirrm include/swarm/analysis
-@dirrm include/swarm/collections
-@dirrm include/swarm/defobj
-@dirrm include/swarm/misc
-@dirrm include/swarm/objc
-@dirrm include/swarm/objectbase
-@dirrm include/swarm/random
-@dirrm include/swarm/simtools
-@dirrm include/swarm/simtoolsgui
-@dirrm include/swarm/space
-@dirrm include/swarm/tclobjc
-@dirrm include/swarm/tkobjc
-@dirrm include/swarm
-@dirrm lib/swarm
-@dirrm share/swarm
diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile
index e70395d5bb65..242ded0c1476 100644
--- a/devel/xparam/Makefile
+++ b/devel/xparam/Makefile
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A general-purpose tool for parameter handling in C++
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index dde57ea1f663..3b2da9c0c49e 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The next generation graphic library for enlightenment package
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		ltdl.1:${PORTSDIR}/devel/libtool \
+		ltdl.4:${PORTSDIR}/devel/libltdl \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index ba35d93d61ea..36a031c21d30 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -13,12 +13,11 @@ MASTER_SITES=	http://math.smsu.edu/~erik/files/
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	An image viewer for X
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgnugetopt" \
 		ac_cv_func_getopt_long=yes
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index c3392496edef..514ac2c41fc3 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -114,7 +114,7 @@ CONFIGURE_ARGS+= --with-libkwnn=-lkwnn --with-kwnn-libraries="${PREFIX}/lib"
 .endif
 
 post-extract:
-	${CP} ${LOCALBASE}/share/libtool/libltdl/aclocal.m4 ${WRKSRC}
+	${CP} ${LIBTOOL_SHAREDIR}/libltdl/aclocal.m4 ${WRKSRC}
 	${CP} ${AUTOCONF_DIR}/config.sub ${WRKSRC}
 	${CP} ${AUTOCONF_DIR}/config.guess ${WRKSRC}
 
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index ce4df00272c0..1d40c7fc2a6b 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sablevm
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=sablevm
@@ -20,7 +21,8 @@ COMMENT=	Java VM created by McGill University's Sable Research Group
 BUILD_DEPENDS=	jikes:${PORTSDIR}/java/jikes
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		ffi.2:${PORTSDIR}/devel/libffi \
-		gmp.6:${PORTSDIR}/math/libgmp4
+		gmp.6:${PORTSDIR}/math/libgmp4 \
+		ltdl.4:${PORTSDIR}/devel/libltdl
 
 PATCH_WRKSRC=	${WRKDIR}
 PATCH_STRIP=	-p1
@@ -30,9 +32,12 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 CONFIGURE_ENV=	CFLAGS="-D__XSI_VISIBLE -D__BSD_VISIBLE -D_P1003_1B_VISIBLE -pthread -I${PREFIX}/include -L${PREFIX}/lib"
+
 .if defined(WITH_GNOMELIBS) || exists(${X11BASE}/include/gnome-1.0/libart_lgpl/art_misc.h)
 USE_GNOME=	gnomelibs
-PLIST=		${PKGDIR}/pkg-plist.gnome
+PLIST_SUB+=	GNOME:=""
+.else
+PLIST_SUB+=	GNOME:="@comment "
 .endif
 
 # Directories for the three SableVM source components
diff --git a/java/sablevm/pkg-plist b/java/sablevm/pkg-plist
index 89d4a4678c9f..7d0a08c43803 100644
--- a/java/sablevm/pkg-plist
+++ b/java/sablevm/pkg-plist
@@ -1979,6 +1979,9 @@ lib/sablevm/libclasspath.so
 lib/sablevm/libfdlibm-%%PORTVERSION%%.so
 lib/sablevm/libfdlibm.la
 lib/sablevm/libfdlibm.so
+%%GNOME:%%lib/sablevm/libgnu-java-awt-peer-gtk-%%PORTVERSION%%.so
+%%GNOME:%%lib/sablevm/libgnu-java-awt-peer-gtk.la
+%%GNOME:%%lib/sablevm/libgnu-java-awt-peer-gtk.so
 lib/sablevm/libjava-io-%%PORTVERSION%%.so
 lib/sablevm/libjava-io.la
 lib/sablevm/libjava-io.so
diff --git a/java/sablevm/pkg-plist.gnome b/java/sablevm/pkg-plist.gnome
deleted file mode 100644
index 7aa22eb8c6fb..000000000000
--- a/java/sablevm/pkg-plist.gnome
+++ /dev/null
@@ -1,2128 +0,0 @@
-bin/sablevm
-include/jni.h
-include/jni_system_specific.h
-lib/libsablevm.la
-lib/libsablevm.so
-lib/libsablevm.so.1
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/ClassDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/ConstructorDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/Doc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/DocErrorReporter.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/Doclet.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/ExecutableMemberDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/FieldDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/MemberDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/MethodDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/PackageDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/ParamTag.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/Parameter.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/ProgramElementDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/RootDoc.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/SeeTag.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/SerialFieldTag.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/Tag.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/ThrowsTag.class
-lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc/Type.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/classpath/Configuration.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/BitMaskExtent.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/Buffers.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/ComponentDataBlitOp.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/EventModifier.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/GLightweightPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/image/GdkPixbufDecoder.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/image/GtkOffScreenDecoder.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/image/ImageDecoder.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/image/XBMDecoder.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GdkFontMetrics.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GdkGraphics.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkArg.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkArgList.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkButtonPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkCanvasPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkCheckboxPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkChoicePeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkClipboard.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkComponentPeer$1PrepareImage.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkComponentPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkContainerPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkDialogPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkFileDialogPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkFontPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkFramePeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkGenericPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkImage.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkImagePainter.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkLabelPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkListPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkMainThread.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkMenuBarPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkMenuItemPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkMenuPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkOffScreenImage.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkPanelPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkScrollPanePeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkScrollbarPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkTextAreaPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkTextComponentPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkTextFieldPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkToolkit.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/GtkWindowPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk/font.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/BeanInfoEmbryo.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/DoubleKey.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/EmptyBeanInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/ExplicitBeanInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/IntrospectionIncubator.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/ColorEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/FontEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/NativeBooleanEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/NativeByteEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/NativeDoubleEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/NativeFloatEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/NativeIntEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/NativeLongEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/NativeShortEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors/StringEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/info/ComponentBeanInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/ClassLoaderObjectInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/EncodingManager.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/NullOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/ObjectIdentityWrapper.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/PlatformHelper.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode/Decoder.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode/Decoder8859_1.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode/Decoder8859_2.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode/Decoder8859_3.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode/Decoder8859_4.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode/Decoder8859_5.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode/DecoderEightBitLookup.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode/DecoderUTF8.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode/Encoder.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode/Encoder8859_1.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode/Encoder8859_2.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode/Encoder8859_3.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode/Encoder8859_4.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode/Encoder8859_5.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode/EncoderEightBitLookup.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode/EncoderUTF8.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/ArrayHelper.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/CharData.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/ClassHelper.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/ClassLoaderHelper.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/ExecutionStack.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/MainThread.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/StackFrame.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/SystemClassLoader.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/reflect/TypeSignature.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/Calendar.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/Calendar_de.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/Calendar_en.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/Calendar_nl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_af_ZA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_AE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_BH.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_DZ.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_EG.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_IN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_IQ.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_JO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_KW.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_LB.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_LY.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_MA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_OM.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_QA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_SD.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_SY.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_TN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ar_YE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_be_BY.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_bn_IN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_br_FR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_bs_BA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ca_ES.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_cs_CZ.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_cy_GB.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_da_DK.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_de.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_de_AT.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_de_BE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_de_CH.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_de_DE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_de_LU.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_el_GR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_AU.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_BW.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_CA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_DK.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_GB.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_HK.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_IE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_IN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_NZ.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_PH.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_SG.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_US.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_ZA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_en_ZW.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_AR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_BO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_CL.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_CO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_CR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_DO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_EC.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_ES.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_GT.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_HN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_MX.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_NI.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_PA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_PE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_PR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_PY.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_SV.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_US.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_UY.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_es_VE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_et_EE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_eu_ES.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_fa_IR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_fi_FI.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_fo_FO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_fr_BE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_fr_CA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_fr_CH.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_fr_FR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_fr_LU.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ga_IE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_gd_GB.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_gl_ES.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_gv_GB.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_he_IL.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_hi_IN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_hr_HR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_hu_HU.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_id_ID.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_it_CH.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_it_IT.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_iw_IL.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ja_JP.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ka_GE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_kl_GL.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ko_KR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_kw_GB.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_lt_LT.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_lv_LV.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_mi_NZ.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_mk_MK.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_mr_IN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_mt_MT.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_nl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_nl_BE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_nl_NL.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_nn_NO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_no_NO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_oc_FR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_pl_PL.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_pt_BR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_pt_PT.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ro_RO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ru_RU.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ru_UA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_se_NO.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_sk_SK.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_sl_SI.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_sq_AL.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_sr_YU.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_sv_FI.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_sv_SE.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ta_IN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_te_IN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_tg_TJ.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_tl_PH.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_tr_TR.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_uk_UA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_ur_PK.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_uz_UZ.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_vi_VN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_yi_US.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_zh_CN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_zh_HK.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_zh_SG.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/LocaleInformation_zh_TW.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso3166-a3.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso3166.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso3166_de.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso639-a2-old.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso639-a3.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso639.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso639_de.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso639_fr.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale/iso639_ga.properties
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/math/MPN.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/HeaderFieldHelper.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/content/text/plain.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/file/FileURLConnection$1$1.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/file/FileURLConnection$1.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/file/FileURLConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/file/Handler.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/http/Handler.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/http/HttpURLConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/jar/Handler.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/jar/JarURLConnection$JarFileCache.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/jar/JarURLConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/ByteBufferImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/CharBufferImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/DatagramChannelImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/DoubleBufferImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/FileChannelImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/FloatBufferImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/IntBufferImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/LongBufferImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/MappedByteFileBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/MappedCharFileBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/MappedDoubleFileBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/MappedFloatFileBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/MappedIntFileBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/MappedLongFileBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/MappedShortFileBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/PipeImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/SelectionKeyImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/SelectorImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/SelectorProviderImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/ServerSocketChannelImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/ShortBufferImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio/SocketChannelImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/RMIMarshalledObjectInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/RMIMarshalledObjectOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/dgc/DGCImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/dgc/DGCImpl_Skel.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/dgc/DGCImpl_Stub.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/registry/RegistryImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/registry/RegistryImpl_Skel.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/registry/RegistryImpl_Stub.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/rmic/Compile_gcj.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/rmic/Compiler.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/rmic/CompilerProcess.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/rmic/RMIC$MethodRef.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/rmic/RMIC.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/rmic/TabbedWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/ConnectionRunnerPool.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/ProtocolConstants.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/RMIDefaultSocketFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/RMIHashes.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/RMIObjectInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/RMIObjectOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/TripleKey.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastConnectionManager.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastRef.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastRemoteCall.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastRemoteStub.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastServer.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server/UnicastServerRef.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/DefaultPermissionCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/der/DEREncodingException.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/DERReader.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/DERWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/DSAKeyPairGenerator.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/DSAParameterGenerator.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/DSAParameters.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/DSASignature.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/DefaultPolicy.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/Gnu.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/GnuDSAPrivateKey.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/GnuDSAPublicKey.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/MD5.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/SHA.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider/SHA1PRNG.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/util/Prime.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/text/BaseBreakIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/text/CharacterBreakIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/text/LineBreakIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/text/SentenceBreakIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/text/WordBreakIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util/DoubleEnumeration.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util/EmptyEnumeration.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util/prefs/FileBasedFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util/prefs/MemoryBasedFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util/prefs/MemoryBasedPreferences.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util/prefs/NodeReader.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util/prefs/NodeWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/javax/swing/plaf/gtk/GtkIconFactory$1.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/javax/swing/plaf/gtk/GtkIconFactory$RadioButtonIcon.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/javax/swing/plaf/gtk/GtkIconFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/javax/swing/plaf/gtk/GtkLookAndFeel.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/Fail.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/Pass.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/Result.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/Test.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/Unresolved.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/Unsupported.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/Untested.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/XFail.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/test/XPass.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/vm/stack/StackFrame.class
-lib/sablevm/classes-%%PORTVERSION%%/gnu/vm/stack/StackTrace.class
-lib/sablevm/classes-%%PORTVERSION%%/java/applet/Applet$AccessibleApplet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/applet/Applet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/applet/AppletContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/applet/AppletStub.class
-lib/sablevm/classes-%%PORTVERSION%%/java/applet/AudioClip.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTEventMulticaster.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTKeyStroke$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTKeyStroke$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTKeyStroke$3.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTKeyStroke.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AWTPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/ActiveEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Adjustable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AlphaComposite$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AlphaComposite.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/AttributeValue.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/BasicStroke.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/BorderLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/BufferCapabilities$FlipContents.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/BufferCapabilities.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Button.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Canvas.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/CardLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Checkbox.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/CheckboxGroup.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/CheckboxMenuItem.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Choice.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Color.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/ColorPaintContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Component$AccessibleAWTComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Component$BltBufferStrategy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Component$FlipBufferStrategy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Component.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/ComponentOrientation.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Composite.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/CompositeContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Container$AccessibleAWTContainer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Container$GfxPaintAllVisitor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Container$GfxPaintVisitor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Container$GfxPrintAllVisitor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Container$GfxPrintVisitor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Container$GfxVisitor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Container.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/ContainerOrderFocusTraversalPolicy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Cursor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/DefaultFocusTraversalPolicy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/DefaultKeyboardFocusManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Dialog.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Dimension.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/DisplayMode.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Event.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/EventDispatchThread.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/EventQueue.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/FileDialog.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/FlowLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/FocusTraversalPolicy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Font.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/FontFormatException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/FontMetrics.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Frame.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/GradientPaint.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Graphics.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Graphics2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/GraphicsConfigTemplate.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/GraphicsConfiguration.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/GraphicsDevice.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/GraphicsEnvironment.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/GridBagConstraints.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/GridBagLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/GridLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/HeadlessException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/IllegalComponentStateException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Image.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/ImageCapabilities.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Insets.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/ItemSelectable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/JobAttributes$DefaultSelectionType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/JobAttributes$DestinationType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/JobAttributes$DialogType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/JobAttributes$MultipleDocumentHandlingType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/JobAttributes$SidesType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/JobAttributes.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/KeyEventDispatcher.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/KeyEventPostProcessor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/KeyboardFocusManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Label.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/LayoutManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/LayoutManager2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/LightweightDispatcher.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/List.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/MediaTracker$MediaEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/MediaTracker.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Menu.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/MenuBar.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/MenuComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/MenuContainer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/MenuItem.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/MenuShortcut.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PageAttributes$ColorType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PageAttributes$MediaType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PageAttributes$OrientationRequestedType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PageAttributes$OriginType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PageAttributes$PrintQualityType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PageAttributes.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Paint.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PaintContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Panel$AccessibleAWTPanel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Panel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Point.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Polygon$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Polygon.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PopupMenu.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PrintGraphics.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/PrintJob.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Rectangle.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/RenderingHints$Key.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/RenderingHints$KeyImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/RenderingHints.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Robot.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/ScrollPane.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/ScrollPaneAdjustable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Scrollbar.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Shape.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Stroke.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/SystemColor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/TextArea.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/TextComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/TextField.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/TexturePaint.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Toolkit.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Transparency.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/Window.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/color/CMMException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/color/ColorSpace.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/color/ICC_ColorSpace.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/color/ICC_Profile.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/color/ProfileDataException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/Clipboard.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/ClipboardOwner.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/DataFlavor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/FlavorMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/FlavorTable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/MimeTypeParseException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/StringSelection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/SystemFlavorMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/Transferable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer/UnsupportedFlavorException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DnDConstants.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragGestureEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragGestureListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragGestureRecognizer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragSource.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragSourceAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragSourceContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragSourceDragEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragSourceEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragSourceListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DragSourceMotionListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/DropTarget.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/InvalidDnDOperationException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/peer/DragSourceContextPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/AWTEventListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/AWTEventListenerProxy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ActionEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ActionListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/AdjustmentEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/AdjustmentListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ComponentAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ComponentEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ComponentListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ContainerAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ContainerEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ContainerListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/FocusAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/FocusEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/FocusListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/HierarchyBoundsAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/HierarchyBoundsListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/HierarchyEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/HierarchyListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/InputEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/InputMethodEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/InputMethodListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/InvocationEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ItemEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/ItemListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/KeyAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/KeyEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/KeyListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/MouseAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/MouseEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/MouseListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/MouseMotionAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/MouseMotionListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/MouseWheelEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/MouseWheelListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/PaintEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/TextEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/TextListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/WindowAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/WindowEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/WindowFocusListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/WindowListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/event/WindowStateListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/font/TextHitInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/AffineTransform.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Arc2D$ArcIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Arc2D$Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Arc2D$Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Arc2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Area.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/CubicCurve2D$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/CubicCurve2D$Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/CubicCurve2D$Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/CubicCurve2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Dimension2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Ellipse2D$Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Ellipse2D$Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Ellipse2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/FlatteningPathIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/GeneralPath$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/GeneralPath.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/IllegalPathStateException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Line2D$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Line2D$Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Line2D$Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Line2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/NoninvertibleTransformException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/PathIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Point2D$Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Point2D$Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Point2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/QuadCurve2D$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/QuadCurve2D$Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/QuadCurve2D$Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/QuadCurve2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Rectangle2D$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Rectangle2D$Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Rectangle2D$Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/Rectangle2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/RectangularShape.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/RoundRectangle2D$Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/RoundRectangle2D$Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom/RoundRectangle2D.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/im/InputContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/im/InputMethodHighlight.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/im/InputMethodRequests.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/im/InputSubset.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/im/spi/InputMethod.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/im/spi/InputMethodContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/im/spi/InputMethodDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/AreaAveragingScaleFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/BufferStrategy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/BufferedImage.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/BufferedImageOp.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ColorModel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ComponentColorModel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ComponentSampleModel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/CropImageFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/DataBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/DataBufferByte.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/DataBufferInt.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/DataBufferUShort.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/DirectColorModel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/FilteredImageSource.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ImageConsumer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ImageFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ImageObserver.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ImageProducer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ImagingOpException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/IndexColorModel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/MemoryImageSource.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/PackedColorModel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/PixelGrabber.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/RGBImageFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/Raster.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/RasterFormatException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/RasterOp.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/RenderedImage.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/ReplicateScaleFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/SampleModel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/SinglePixelPackedSampleModel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/TileObserver.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/VolatileImage.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/WritableRaster.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/WritableRenderedImage.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/renderable/ContextualRenderedImageFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/renderable/ParameterBlock.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/renderable/RenderContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/renderable/RenderableImage.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/renderable/RenderableImageOp.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/renderable/RenderableImageProducer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/renderable/RenderedImageFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/ButtonPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/CanvasPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/CheckboxMenuItemPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/CheckboxPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/ChoicePeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/ComponentPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/ContainerPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/DialogPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/FileDialogPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/FontPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/FramePeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/LabelPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/LightweightPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/ListPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/MenuBarPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/MenuComponentPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/MenuItemPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/MenuPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/PanelPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/PopupMenuPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/ScrollPanePeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/ScrollbarPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/TextAreaPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/TextComponentPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/TextFieldPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer/WindowPeer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/Book.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/PageFormat.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/Pageable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/Paper.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/Printable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/PrinterAbortException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/PrinterException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/PrinterGraphics.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/PrinterIOException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/awt/print/PrinterJob.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/AppletInitializer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/BeanDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/BeanInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/Beans.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/Customizer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/DesignMode.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/EventSetDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/ExceptionListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/ExplicitInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/FeatureDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/IndexedPropertyDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/IntrospectionException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/Introspector.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/MethodDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/ParameterDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyChangeEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyChangeListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyChangeListenerProxy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyChangeSupport.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyEditorManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyEditorSupport.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/PropertyVetoException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/SimpleBeanInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/VetoableChangeListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/VetoableChangeListenerProxy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/VetoableChangeSupport.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/Visibility.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextChild.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextChildComponentProxy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextChildSupport.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextContainerProxy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextMembershipEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextMembershipListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextProxy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextServiceAvailableEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextServiceProvider.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextServiceProviderBeanInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextServiceRevokedEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextServiceRevokedListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextServices.class
-lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext/BeanContextServicesListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/BufferedInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/BufferedOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/BufferedReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/BufferedWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ByteArrayInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ByteArrayOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/CharArrayReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/CharArrayWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/CharConversionException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/DataInput.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/DataInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/DataOutput.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/DataOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/EOFException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/Externalizable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/File.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FileDescriptor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FileFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FileInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FileNotFoundException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FileOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FilePermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FileReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FileWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FilenameFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FilterInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FilterOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FilterReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/FilterWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/IOException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/InputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/InputStreamReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/InterfaceComparator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/InterruptedIOException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/InvalidClassException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/InvalidObjectException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/LineNumberInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/LineNumberReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/MemberComparator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/NotActiveException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/NotSerializableException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectInput.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectInputStream$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectInputStream$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectInputStream$3.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectInputStream$GetField.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectInputValidation.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectOutput.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectOutputStream$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectOutputStream$PutField.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectStreamClass.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectStreamConstants.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectStreamException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ObjectStreamField.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/OptionalDataException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/OutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/OutputStreamWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/PipedInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/PipedOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/PipedReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/PipedWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/PrintStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/PrintWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/PushbackInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/PushbackReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/RandomAccessFile.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/Reader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/SequenceInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/Serializable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/SerializablePermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/StreamCorruptedException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/StreamTokenizer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/StringBufferInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/StringReader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/StringWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/SyncFailedException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/UTFDataFormatException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/UnsupportedEncodingException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/ValidatorAndPriority.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/WriteAbortedException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/io/Writer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/AbstractMethodError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ArithmeticException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ArrayIndexOutOfBoundsException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ArrayStoreException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/AssertionError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Boolean.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Byte.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/CharSequence.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Character$Subset.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Character$UnicodeBlock.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Character.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Class$StaticData.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Class.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ClassCastException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ClassCircularityError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ClassFormatError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ClassLoader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ClassNotFoundException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/CloneNotSupportedException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Cloneable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Comparable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Compiler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Double.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Error.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Exception.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ExceptionInInitializerError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Float.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/IllegalAccessError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/IllegalAccessException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/IllegalArgumentException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/IllegalMonitorStateException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/IllegalStateException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/IllegalThreadStateException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/IncompatibleClassChangeError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/IndexOutOfBoundsException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/InheritableThreadLocal.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/InstantiationError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/InstantiationException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Integer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/InternalError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/InterruptedException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/LinkageError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Long.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Math.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/NegativeArraySizeException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/NoClassDefFoundError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/NoSuchFieldError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/NoSuchFieldException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/NoSuchMethodError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/NoSuchMethodException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/NullPointerException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Number.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/NumberFormatException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Object.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/OutOfMemoryError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Package.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Process.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ProcessImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Runnable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Runtime.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/RuntimeException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/RuntimePermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/SecurityContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/SecurityException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/SecurityManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Short.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/StackOverflowError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/StackTraceElement.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/StrictMath.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/String$CaseInsensitiveComparator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/String.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/StringBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/StringCreator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/StringIndexOutOfBoundsException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/System.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Thread.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ThreadDeath.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ThreadGroup.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ThreadLocal.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Throwable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/UnknownError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/UnsatisfiedLinkError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/UnsupportedClassVersionError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/UnsupportedOperationException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/VMClassLoader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/VMObject.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/VMSecurityManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/VMSystem.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/VerifyError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/VirtualMachine.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/VirtualMachineError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/Void.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ref/PhantomReference.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ref/Reference.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ref/ReferenceQueue.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ref/SoftReference.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/ref/WeakReference.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/AccessibleObject.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Array.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Constructor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Field.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/InvocationHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/InvocationTargetException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Member.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Method.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Modifier.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Proxy$ClassFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Proxy$ProxyData.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Proxy$ProxySignature.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Proxy$ProxyType.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/Proxy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/ReflectPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/ReflectUtil.class
-lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect/UndeclaredThrowableException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/math/BigDecimal.class
-lib/sablevm/classes-%%PORTVERSION%%/java/math/BigInteger.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/Authenticator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/BindException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/ConnectException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/ContentHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/ContentHandlerFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/DatagramPacket.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/DatagramSocket.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/DatagramSocketImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/FileNameMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/HttpURLConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/InetAddress.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/InetSocketAddress.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/JarURLConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/MalformedURLException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/MimeTypeMapper.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/MulticastSocket.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/NetPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/NoRouteToHostException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/PasswordAuthentication.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/PlainDatagramSocketImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/PlainSocketImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/PortUnreachableException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/ProtocolException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/ServerSocket.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/Socket.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketAddress.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketImpl.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketImplFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketOptions.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/SocketTimeoutException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/URISyntaxException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/URL.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/URLClassLoader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/URLConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/URLDecoder.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/URLEncoder.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/URLStreamHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/URLStreamHandlerFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/UnknownHostException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/net/UnknownServiceException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/Buffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/ByteBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/ByteOrder.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/CharBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/DoubleBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/FloatBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/IntBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/LongBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/MappedByteBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/ShortBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/AlreadyConnectedException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/ByteChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/Channel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/Channels.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/ClosedChannelException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/DatagramChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/FileChannel$MapMode.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/FileChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/FileLock.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/GatheringByteChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/InterruptibleChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/Pipe$SinkChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/Pipe$SourceChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/Pipe.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/ReadableByteChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/ScatteringByteChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/SelectableChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/SelectionKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/Selector.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/ServerSocketChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/SocketChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/WritableByteChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/spi/AbstractChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/spi/AbstractInterruptibleChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/spi/AbstractSelectableChannel.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/spi/AbstractSelectionKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/spi/AbstractSelector.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/spi/SelectorProvider.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/CharacterCodingException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/Charset$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/Charset$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/Charset.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/CharsetDecoder.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/CharsetEncoder.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/CoderResult.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/CodingErrorAction.class
-lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/spi/CharsetProvider.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/AccessException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/AlreadyBoundException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/ConnectException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/ConnectIOException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/MarshalException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/MarshalledObject.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/Naming.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/NoSuchObjectException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/NotBoundException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/RMISecurityException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/RMISecurityManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/Remote.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/RemoteException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/ServerError.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/ServerException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/ServerRuntimeException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/StubNotFoundException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/UnexpectedException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/UnknownHostException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/UnmarshalException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/Activatable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivateFailedException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationDesc.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationGroup.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationGroupDesc$CommandEnvironment.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationGroupDesc.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationGroupID.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationID.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationInstantiator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationMonitor.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/ActivationSystem.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/Activator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/UnknownGroupException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation/UnknownObjectException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/dgc/DGC.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/dgc/Lease.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/dgc/VMID.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/registry/LocateRegistry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/registry/Registry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/registry/RegistryHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/ExportException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/LoaderHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/LogStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/ObjID.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/Operation.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RMIClassLoader$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RMIClassLoader$MyClassLoader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RMIClassLoader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RMIClientSocketFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RMIFailureHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RMIServerSocketFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RMISocketFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RemoteCall.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RemoteObject.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RemoteRef.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RemoteServer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/RemoteStub.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/ServerCloneException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/ServerNotActiveException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/ServerRef.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/Skeleton.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/SkeletonMismatchException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/SkeletonNotFoundException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/SocketSecurityException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/UID.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/UnicastRemoteObject.class
-lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server/Unreferenced.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AccessControlContext.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AccessControlException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AccessController.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AlgorithmParameterGenerator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AlgorithmParameterGeneratorSpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AlgorithmParameters.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AlgorithmParametersSpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AllPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/AllPermissionCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/BasicPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/BasicPermissionCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Certificate.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/CodeSource.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/DigestException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/DigestInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/DigestOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/DomainCombiner.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/DummyKeyPairGenerator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/DummyMessageDigest.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/DummySignature.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/GeneralSecurityException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Guard.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/GuardedObject.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Identity.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/IdentityScope.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/InvalidAlgorithmParameterException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/InvalidKeyException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/InvalidParameterException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Key.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyFactorySpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyManagementException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyPair.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyPairGenerator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyPairGeneratorSpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyStore.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyStoreException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/KeyStoreSpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/MessageDigest.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/MessageDigestSpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/NoSuchAlgorithmException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/NoSuchProviderException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Permission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/PermissionCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Permissions$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Permissions.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/PermissionsHash.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Policy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Principal.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/PrivateKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/PrivilegedAction.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/PrivilegedActionException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/PrivilegedExceptionAction.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/ProtectionDomain.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Provider.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/ProviderException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/PublicKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/SecureClassLoader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/SecureRandom.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/SecureRandomSpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Security.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/SecurityPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Signature.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/SignatureException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/SignatureSpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/SignedObject.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/Signer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/UnrecoverableKeyException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/UnresolvedPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/UnresolvedPermissionCollection$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/UnresolvedPermissionCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/acl/Acl.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/acl/AclEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/acl/AclNotFoundException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/acl/Group.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/acl/LastOwnerException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/acl/NotOwnerException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/acl/Owner.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/acl/Permission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CRL.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CRLException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertPath$CertPathRep.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertPath.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertPathBuilderException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertPathValidatorException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertStoreException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/Certificate$CertificateRep.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/Certificate.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertificateEncodingException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertificateException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertificateExpiredException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertificateFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertificateFactorySpi.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertificateNotYetValidException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/CertificateParsingException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/X509CRL.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/X509CRLEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/X509Certificate.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/cert/X509Extension.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/classpath.security
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/DSAKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/DSAKeyPairGenerator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/DSAParams.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/DSAPrivateKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/DSAPublicKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/RSAKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/RSAPrivateCrtKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/RSAPrivateKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces/RSAPublicKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/AlgorithmParameterSpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/DSAParameterSpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/DSAPrivateKeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/DSAPublicKeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/EncodedKeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/InvalidKeySpecException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/InvalidParameterSpecException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/KeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/PKCS8EncodedKeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/RSAKeyGenParameterSpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/RSAPrivateCrtKeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/RSAPrivateKeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/RSAPublicKeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/security/spec/X509EncodedKeySpec.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Array.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/BatchUpdateException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Blob.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/CallableStatement.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Clob.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Connection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/DataTruncation.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/DatabaseMetaData.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Date.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Driver.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/DriverManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/DriverPropertyInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/ParameterMetaData.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/PreparedStatement.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Ref.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/ResultSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/ResultSetMetaData.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/SQLData.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/SQLException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/SQLInput.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/SQLOutput.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/SQLPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/SQLWarning.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Savepoint.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Statement.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Struct.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Time.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Timestamp.class
-lib/sablevm/classes-%%PORTVERSION%%/java/sql/Types.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/Annotation.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/AttributedCharacterIterator$Attribute.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/AttributedCharacterIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/AttributedString$AttributeRange.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/AttributedString.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/AttributedStringIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/BreakIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/CharacterIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/ChoiceFormat.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/CollationElementIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/CollationKey.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/Collator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/DateFormat.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/DateFormatSymbols.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/DecimalFormat.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/DecimalFormatSymbols.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/FieldPosition.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/Format.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/MessageFormat.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/MessageFormatElement.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/NumberFormat.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/ParseException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/ParsePosition.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/RuleBasedCollator$CollationElement.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/RuleBasedCollator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/SimpleDateFormat$FieldSizePair.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/SimpleDateFormat.class
-lib/sablevm/classes-%%PORTVERSION%%/java/text/StringCharacterIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractList$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractList$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractMap$1$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractMap$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractMap$2$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractMap$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractMap$BasicMapEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractSequentialList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/AbstractSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/ArrayList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Arrays$ArrayList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Arrays.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/BitSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Calendar.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$CopiesList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$EmptyList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$EmptyMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$EmptySet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$ReverseComparator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SingletonList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SingletonMap$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SingletonMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SingletonSet$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SingletonSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedListIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedMap$1SynchronizedMapEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedMap$2$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedMap$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedRandomAccessList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedSortedMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$SynchronizedSortedSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableListIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$1$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableRandomAccessList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableSortedMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections$UnmodifiableSortedSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Collections.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Comparator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/ConcurrentModificationException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Date.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Dictionary.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/EmptyStackException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Enumeration.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/EventListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/EventListenerProxy.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/EventObject.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/GregorianCalendar.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/HashMap$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/HashMap$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/HashMap$3.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/HashMap$HashEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/HashMap$HashIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/HashMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/HashSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Hashtable$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Hashtable$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Hashtable$3.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Hashtable$Enumerator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Hashtable$HashEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Hashtable$HashIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Hashtable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/IdentityHashMap$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/IdentityHashMap$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/IdentityHashMap$3.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/IdentityHashMap$IdentityEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/IdentityHashMap$IdentityIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/IdentityHashMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Iterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/LinkedHashMap$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/LinkedHashMap$LinkedHashEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/LinkedHashMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/LinkedHashSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/LinkedList$Entry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/LinkedList$LinkedListItr.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/LinkedList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/List.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/ListIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/ListResourceBundle.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Locale.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Map$Entry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Map.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/MissingResourceException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/NoSuchElementException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Observable.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Observer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Properties.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/PropertyPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/PropertyPermissionCollection.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/PropertyResourceBundle.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Random.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/RandomAccess.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/RandomAccessSubList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/ResourceBundle$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/ResourceBundle$Security.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/ResourceBundle.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Set.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/SimpleTimeZone.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/SortedMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/SortedSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Stack.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/StringTokenizer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/SubList$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/SubList.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TimeZone.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Timer$Scheduler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Timer$TaskQueue.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Timer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TimerTask.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TooManyListenersException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$3.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$Node.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$SubMap$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$SubMap$2.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$SubMap$3.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$SubMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap$TreeIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/TreeSet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Vector$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/Vector.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/WeakHashMap$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/WeakHashMap$WeakBucket$WeakEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/WeakHashMap$WeakBucket.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/WeakHashMap$WeakEntrySet$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/WeakHashMap$WeakEntrySet.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/WeakHashMap.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso3166-a3.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso3166.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso3166_de.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso639-a2-old.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso639-a3.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso639.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso639_de.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso639_fr.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/iso639_ga.properties
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/Attributes$Name.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/Attributes.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/JarEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/JarException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/JarFile$JarEnumeration.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/JarFile.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/JarInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/JarOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/jar/Manifest.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/ConsoleHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/ErrorManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/FileHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/Filter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/Formatter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/Handler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/Level.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/LogManager.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/LogRecord.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/Logger.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/LoggingPermission.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/MemoryHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/SimpleFormatter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/SocketHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/StreamHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/logging/XMLFormatter.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/AbstractPreferences.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/BackingStoreException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/InvalidPreferencesFormatException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/NodeChangeEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/NodeChangeListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/PreferenceChangeEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/PreferenceChangeListener.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/Preferences$1.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/Preferences.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs/PreferencesFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/regex/Matcher.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/regex/Pattern.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/regex/PatternSyntaxException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/Adler32.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/CRC32.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/CheckedInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/CheckedOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/Checksum.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/DataFormatException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/Deflater.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/DeflaterConstants.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/DeflaterEngine.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/DeflaterHuffman$Tree.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/DeflaterHuffman.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/DeflaterOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/DeflaterPending.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/GZIPInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/GZIPOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/Inflater.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/InflaterDynHeader.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/InflaterHuffmanTree.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/InflaterInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/OutputWindow.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/PendingBuffer.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/StreamManipulator.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/ZipConstants.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/ZipEntry.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/ZipException.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/ZipFile$PartialInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/ZipFile$ZipEntryEnumeration.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/ZipFile.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/ZipInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/java/util/zip/ZipOutputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/Accessible.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleBundle.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleContext.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleEditableText.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleExtendedComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleExtendedTable.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleHyperlink.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleHypertext.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleIcon.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleKeyBinding.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleRelation.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleRelationSet.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleResourceBundle.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleRole.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleSelection.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleState.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleStateSet.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleTable.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleTableModelChange.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleText.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility/AccessibleValue.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/naming/BinaryRefAddr.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/naming/InvalidNameException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/naming/Name.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/naming/NamingException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/naming/RefAddr.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/naming/StringRefAddr.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/ConnectionEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/ConnectionEventListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/ConnectionPoolDataSource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/DataSource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/PooledConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/RowSet.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/RowSetEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/RowSetInternal.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/RowSetListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/RowSetMetaData.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/RowSetReader.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/RowSetWriter.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/XAConnection.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/sql/XADataSource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractButton$1.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractButton$2.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractButton$3.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractButton$AccessibleAbstractButton.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractButton$JFocusListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractButton.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractCellEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractListModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/AbstractSet.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/Action.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ActionMap.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/BorderFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/BoundedRangeModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/Box.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/BoxLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ButtonGroup.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ButtonModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/CellEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/CellRendererPane$AccessibleCellRendererPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/CellRendererPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ComboBoxEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ComboBoxModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ComponentInputMap.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DebugGraphics.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultBoundedRangeModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultButtonModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultCellEditor$EditorDelegate.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultCellEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultCellRenderer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultComboBoxModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultDesktopManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultFocusManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultListCellRenderer$UIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultListCellRenderer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultListModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultListSelectionModel$Range.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultListSelectionModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DefaultSingleSelectionModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/DesktopManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/FocusManager$DisabledFocusManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/FocusManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/GrayFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/Icon.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ImageIcon.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/InputMap.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/InputVerifier.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JApplet.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JButton.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JCheckBox.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JCheckBoxMenuItem.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JColorChooser$AccessibleJColorChooser.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JColorChooser.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JComboBox$AccessibleJComboBox.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JComboBox$KeySelectionManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JComboBox.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JComponent$AccessibleJComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JDesktopPane$AccessibleJDesktopPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JDesktopPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JDialog.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JEditorPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JFileChooser$AccessibleJFileChooser.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JFileChooser.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JFrame.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JInternalFrame.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JLabel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JLayeredPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JList$1AL.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JList$2ALData.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JList$3.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JList.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JMenu$AccessibleJMenu.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JMenu$WinListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JMenu.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JMenuBar.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JMenuItem$AccessibleJMenuItem.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JMenuItem.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JOptionPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JPanel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JPasswordField$AccessibleJPasswordField.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JPasswordField.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JPopupMenu$AccessibleJPopupMenu.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JPopupMenu$Separator.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JPopupMenu.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JProgressBar$AccessibleJProgressBar.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JProgressBar.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JRadioButton.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JRadioButtonMenuItem.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JRootPane$AccessibleJRootPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JRootPane$RootLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JRootPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JScrollBar.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JScrollPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JSeparator$AccessibleJSeparator.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JSeparator.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JSlider$AccessibleJSlider.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JSlider$ModelListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JSlider.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JSplitPane$AccessibleJSplitPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JSplitPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JTabbedPane$Tab.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JTabbedPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JTable.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JTextField$AccessibleJTextField.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JTextField.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JTextPane.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JToggleButton.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JToolBar$AccessibleJToolBar.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JToolBar$Separator.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JToolBar.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JToolTip.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JTree.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JViewport.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/JWindow.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/KeyStroke.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ListCellRenderer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ListModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ListSelectionModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/LookAndFeel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/MenuElement.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/MenuSelectionManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/MutableComboBoxModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/OverlayLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ProgressMonitor.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ProgressMonitorInputStream.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/Renderer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/RepaintManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/RootPaneContainer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ScrollPaneConstants.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ScrollPaneLayout$UIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ScrollPaneLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/Scrollable.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/SingleSelectionModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/SizeRequirements.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/SizeSequence.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/SwingConstants.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/SwingUtilities.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/Timer$Waker.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/Timer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ToggleButtonModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ToolTipManager$insideTimerAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ToolTipManager$outsideTimerAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ToolTipManager$stillInsideTimerAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ToolTipManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/UIDefaults$ActiveValue.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/UIDefaults$LazyInputMap.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/UIDefaults$LazyValue.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/UIDefaults$ProxyLazyValue.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/UIDefaults.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/UIManager$LookAndFeelInfo.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/UIManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/UnsupportedLookAndFeelException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/ViewportLayout.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/WindowConstants.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/AbstractBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/BevelBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/Border.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/CompoundBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/EmptyBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/EtchedBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/LineBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/MatteBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border/TitledBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/colorchooser/AbstractColorChooserPanel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/colorchooser/ColorChooserComponentFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/colorchooser/ColorSelectionModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/colorchooser/DefaultColorSelectionModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/AncestorEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/AncestorListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/CaretEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/CaretListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/CellEditorListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/ChangeEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/ChangeListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/DocumentEvent$ElementChange.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/DocumentEvent$EventType.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/DocumentEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/DocumentListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/EventListenerList.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/HyperlinkEvent$EventType.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/HyperlinkEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/HyperlinkListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/InternalFrameAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/InternalFrameEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/InternalFrameListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/ListDataEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/ListDataListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/ListSelectionEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/ListSelectionListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/MenuDragMouseEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/MenuDragMouseListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/MenuEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/MenuKeyEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/MenuKeyListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/MenuListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/MouseInputAdapter.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/MouseInputListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/PopupMenuEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/PopupMenuListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/SwingPropertyChangeSupport.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TableColumnModelEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TableColumnModelListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TableModelEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TableModelListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TreeExpansionEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TreeExpansionListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TreeModelEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TreeModelListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TreeSelectionEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TreeSelectionListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/TreeWillExpandListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/UndoableEditEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event/UndoableEditListener.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/filechooser/FileFilter.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/filechooser/FileSystemView.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/filechooser/FileView.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ActionMapUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/BorderUIResource$LineBorderUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/BorderUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ButtonUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ColorChooserUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ColorUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ComboBoxUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ComponentInputMapUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ComponentUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/DesktopIconUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/DesktopPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/DimensionUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/FileChooserUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/FontUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/IconUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/InputMapUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/InsetsUIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/InternalFrameUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/LabelUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ListUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/MenuBarUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/MenuItemUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/OptionPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/PanelUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/PopupMenuUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ProgressBarUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/RootPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ScrollBarUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ScrollPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/SeparatorUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/SliderUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/SplitPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/TabbedPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/TableHeaderUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/TableUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/TextUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ToolBarUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ToolTipUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/TreeUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/UIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/ViewportUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders$ButtonBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders$FieldBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders$MarginBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicBorders.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicButtonUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicCheckBoxUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicDefaults.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicGraphicsUtils.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicIconFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicLabelUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicListUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicLookAndFeel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicOptionPaneUI$1.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicOptionPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicPanelUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicRadioButtonUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicScrollPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicTabbedPaneUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicTextUI$RootView.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicTextUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicToggleButtonUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicTreeUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/BasicViewportUI.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic/PanelBorder.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/metal/MetalLookAndFeel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/AbstractTableModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/DefaultTableCellRenderer$UIResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/DefaultTableCellRenderer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/DefaultTableColumnModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/DefaultTableModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/TableCellEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/TableCellRenderer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/TableColumn.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/TableColumnModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table/TableModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument$1.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument$AbstractElement.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument$AttributeContext.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument$BranchElement.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument$Content.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument$DefaultDocumentEvent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument$ElementEdit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument$LeafElement.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AbstractDocument.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/AttributeSet.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/BadLocationException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/Caret.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/CharacterIterator.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/ComponentView.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/DefaultCaret.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/DefaultEditorKit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/Document.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/EditorKit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/Element.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/GapContent$1.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/GapContent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/JTextComponent$AccessibleJTextComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/JTextComponent$KeyBinding.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/JTextComponent.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/Keymap.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/MutableAttributeSet.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/PlainDocument.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/PlainEditorKit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/Position$Bias.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/Position.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/Segment.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/Style.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledDocument.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$AlignmentAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$AttributeTracker.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$BoldAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$FontFamilyAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$FontSizeAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$ForegroundAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$ItalicAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$StyledTextAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$StyledViewFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit$UnderlineAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/StyledEditorKit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/TextAction.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/View.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/ViewFactory.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/html/HTML$Tag.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/html/HTML$UnknownTag.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/html/HTML.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/html/parser/ParserDelegator.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/AbstractLayoutCache$NodeDimensions.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/AbstractLayoutCache.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/DefaultMutableTreeNode.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/DefaultTreeCellEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/DefaultTreeCellRenderer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/DefaultTreeModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/DefaultTreeSelectionModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/ExpandVetoException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/FixedHeightLayoutCache.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/MutableTreeNode.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/RowMapper.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/TreeCellEditor.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/TreeCellRenderer.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/TreeModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/TreeNode.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/TreePath.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/TreeSelectionModel.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree/VariableHeightLayoutCache.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/AbstractUndoableEdit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/CannotRedoException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/CannotUndoException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/CompoundEdit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/StateEdit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/StateEditable.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/UndoManager.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/UndoableEdit.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo/UndoableEditSupport.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/transaction/InvalidTransactionException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/transaction/TransactionRequiredException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/transaction/TransactionRolledbackException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/transaction/xa/XAException.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/transaction/xa/XAResource.class
-lib/sablevm/classes-%%PORTVERSION%%/javax/transaction/xa/Xid.class
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/awt/peer/gtk/font.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso3166-a3.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso3166.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso3166_de.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso639-a2-old.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso639-a3.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso639.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso639_de.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso639_fr.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale/iso639_ga.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/security/classpath.security
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso3166-a3.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso3166.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso3166_de.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso639-a2-old.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso639-a3.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso639.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso639_de.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso639_fr.properties
-lib/sablevm/classes-%%PORTVERSION%%/resource/java/util/iso639_ga.properties
-lib/sablevm/lib/security/classpath.security
-lib/sablevm/libclasspath-%%PORTVERSION%%.so
-lib/sablevm/libclasspath.la
-lib/sablevm/libclasspath.so
-lib/sablevm/libfdlibm-%%PORTVERSION%%.so
-lib/sablevm/libfdlibm.la
-lib/sablevm/libfdlibm.so
-lib/sablevm/libgnu-java-awt-peer-gtk-%%PORTVERSION%%.so
-lib/sablevm/libgnu-java-awt-peer-gtk.la
-lib/sablevm/libgnu-java-awt-peer-gtk.so
-lib/sablevm/libjava-io-%%PORTVERSION%%.so
-lib/sablevm/libjava-io.la
-lib/sablevm/libjava-io.so
-lib/sablevm/libjava-lang-%%PORTVERSION%%.so
-lib/sablevm/libjava-lang.la
-lib/sablevm/libjava-lang.so
-lib/sablevm/libjava-net-%%PORTVERSION%%.so
-lib/sablevm/libjava-net.la
-lib/sablevm/libjava-net.so
-lib/sablevm/libjava-util-%%PORTVERSION%%.so
-lib/sablevm/libjava-util.la
-lib/sablevm/libjava-util.so
-share/sablevm/AUTHORS
-share/sablevm/COPYING.LIB
-share/sablevm/LICENSE
-@dirrm share/sablevm
-@dirrm lib/sablevm/lib/security
-@dirrm lib/sablevm/lib
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/java/util
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/java/security
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/java
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/locale
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/awt/peer/gtk
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/awt/peer
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java/awt
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/gnu/java
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource/gnu
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/resource
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/transaction/xa
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/transaction
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/undo
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/tree
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/html/parser
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text/html
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/text
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/table
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/metal
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf/basic
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/plaf
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/filechooser
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/event
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/colorchooser
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing/border
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/swing
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/sql
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/naming
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax/accessibility
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/javax
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/util/zip
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/util/regex
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/util/prefs
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/util/logging
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/util/jar
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/util
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/text
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/sql
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/security/spec
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/security/interfaces
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/security/cert
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/security/acl
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/security
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/rmi/server
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/rmi/registry
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/rmi/dgc
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/rmi/activation
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/rmi
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset/spi
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/nio/charset
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels/spi
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/nio/channels
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/nio
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/net
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/math
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/lang/reflect
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/lang/ref
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/lang
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/io
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/beans/beancontext
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/beans
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/print
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/peer
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/image/renderable
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/image
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/im/spi
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/im
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/geom
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/font
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/event
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd/peer
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/dnd
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/datatransfer
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt/color
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/awt
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java/applet
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/java
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/vm/stack
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/vm
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/test
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/javax/swing/plaf/gtk
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/javax/swing/plaf
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/javax/swing
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/javax
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util/prefs
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/util
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/text
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/util
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/provider
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security/der
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/security
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/server
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/rmic
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/registry
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi/dgc
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/rmi
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/nio
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/jar
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/http
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol/file
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/protocol
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/content/text
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net/content
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/net
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/math
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/locale
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang/reflect
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/lang
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/encode
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io/decode
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/io
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/info
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans/editors
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/beans
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer/gtk
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/peer
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt/image
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java/awt
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/java
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu/classpath
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/gnu
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/com/sun/javadoc
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/com/sun
-@dirrm lib/sablevm/classes-%%PORTVERSION%%/com
-@dirrm lib/sablevm/classes-%%PORTVERSION%%
-@dirrm lib/sablevm
diff --git a/korean/eterm/files/patch-ag b/korean/eterm/files/patch-ag
deleted file mode 100644
index c575e57687d9..000000000000
--- a/korean/eterm/files/patch-ag
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.orig	Mon Apr 19 16:47:32 1999
-+++ configure	Sat Mar 30 19:11:43 2002
-@@ -2135,8 +2135,8 @@
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
- DLLTOOL="$DLLTOOL" AS="$AS" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs ${LOCALBASE}/share/libtool/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
-@@ -2150,10 +2150,8 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL_DEPS="${LOCALBASE}/share/libtool/ltconfig --disable-ltlibs ${LOCALBASE}/share/libtool/ltmain.sh"
-+LIBTOOL="${LOCALBASE}/bin/libtool"
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index a5816a9f2399..a0d8b5545b8b 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -28,7 +28,6 @@ MAINTAINER=	housel@acm.org
 COMMENT=	CMU Gwydion project interpreter and compiler for the Dylan language
 
 LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
-RUN_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 39d3ea8f76d3..282c00e60fd9 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guile
 PORTVERSION=	1.6.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	guile
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 
-LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index 39f81d001e96..d05cf4605a41 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open-source COBOL compiler
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
-		ltdl.1:${PORTSDIR}/devel/libtool \
+		ltdl.4:${PORTSDIR}/devel/libltdl \
 		gmp.6:${PORTSDIR}/math/libgmp4
 
 GNU_CONFIGURE=	yes
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index 39f81d001e96..d05cf4605a41 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open-source COBOL compiler
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
-		ltdl.1:${PORTSDIR}/devel/libtool \
+		ltdl.4:${PORTSDIR}/devel/libltdl \
 		gmp.6:${PORTSDIR}/math/libgmp4
 
 GNU_CONFIGURE=	yes
diff --git a/lang/php4/bsd.php.mk b/lang/php4/bsd.php.mk
index 9a3c5c13acd2..f315c3c4d1fb 100644
--- a/lang/php4/bsd.php.mk
+++ b/lang/php4/bsd.php.mk
@@ -87,5 +87,5 @@ configure-message: phpize
 
 phpize:
 	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@(cd ${WRKSRC}; phpize)
+	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
 .endif
diff --git a/lang/php5/bsd.php.mk b/lang/php5/bsd.php.mk
index 9a3c5c13acd2..f315c3c4d1fb 100644
--- a/lang/php5/bsd.php.mk
+++ b/lang/php5/bsd.php.mk
@@ -87,5 +87,5 @@ configure-message: phpize
 
 phpize:
 	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@(cd ${WRKSRC}; phpize)
+	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
 .endif
diff --git a/lang/php53/bsd.php.mk b/lang/php53/bsd.php.mk
index 9a3c5c13acd2..f315c3c4d1fb 100644
--- a/lang/php53/bsd.php.mk
+++ b/lang/php53/bsd.php.mk
@@ -87,5 +87,5 @@ configure-message: phpize
 
 phpize:
 	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@(cd ${WRKSRC}; phpize)
+	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
 .endif
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index b1ddd612b9a1..eabd32edff90 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	balsa2
 PORTVERSION=	2.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
@@ -21,7 +21,8 @@ LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
 		aspell.15:${PORTSDIR}/textproc/aspell \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		esmtp.6:${PORTSDIR}/mail/libesmtp \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+		gdbm.3:${PORTSDIR}/databases/gdbm \
+		ltdl.4:${PORTSDIR}/devel/libltdl
 RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
 
 USE_BZIP2=	yes
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 22390d15e953..f0b0e974210f 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -23,6 +23,6 @@ MAN5=		pop3lite.conf.5
 MAN8=		pop3lite.8
 
 pre-build:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/libtool
+	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 .include <bsd.port.mk>
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 54932f32ce0c..194092df034e 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -102,7 +102,7 @@ post-patch:
 .endif
 
 pre-build:
-	${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool
+	${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 54932f32ce0c..194092df034e 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -102,7 +102,7 @@ post-patch:
 .endif
 
 pre-build:
-	${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool
+	${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 54932f32ce0c..194092df034e 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -102,7 +102,7 @@ post-patch:
 .endif
 
 pre-build:
-	${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool
+	${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 54932f32ce0c..194092df034e 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -102,7 +102,7 @@ post-patch:
 .endif
 
 pre-build:
-	${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool
+	${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 42925080a284..9b9cbf4afe2f 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -18,8 +18,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-rc1
 MAINTAINER=	mikeh@FreeBSD.org
 COMMENT=	An X Window System application for receiving electronic mail
 
-BUILD_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf
-
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
@@ -32,10 +30,6 @@ USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
-AUTOCONF=	autoconf
-AUTOHEADER=	autoheader
-ACLOCAL=	aclocal
-
 # XXX: Disable patching for libtool until we can generate the files
 LIBTOOLFILES=
 
@@ -82,7 +76,7 @@ pre-everything::
 	@echo
 
 pre-configure:
-	@(cd ${WRKSRC} && ${SH} autogen.sh);	\
+	@(cd ${WRKSRC} && ${ENV} ${SCRIPTS_ENV} ${SH} autogen.sh);	\
 	${MAKE} LIBTOOLFILES=aclocal.m4 patch-libtool
 
 .include <bsd.port.post.mk>
diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index 6c5317728f69..b2f1daa762e8 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -17,10 +17,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for dealing with Microsoft ITSS/CHM format files
 
-# use libtool, but no configure
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
-
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	#
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+do-configure::
+	# nothing (but we need the libtool dependency)
+
 .include <bsd.port.mk>
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index fc2f55ad4579..e063ebb0d877 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
 MAINTAINER=	thierry@pompo.net
 COMMENT=	Modular Calendar Access Library
 
-LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
 HAS_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 47cf7f7c70d8..7565625b12b0 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -273,7 +273,7 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${LN} -sf ${LIBTOOL} ${WRKSRC}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index b2ee81ee7321..7c169cdf31db 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -42,7 +42,7 @@ post-patch:
 		${WRKSRC}/dvdread/dvd_input.c
 
 post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${LN} -sf ${LIBTOOL} ${WRKSRC}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 08812385f11a..0acfd165b5ae 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Standards-based system to encode, stream and play MPEG-4 audio/video
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool \
-		nasm:${PORTSDIR}/devel/nasm \
+BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
 		pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 537e9349c5ef..c33b4d0fe796 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	everybuddy
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
 
@@ -14,7 +15,8 @@ MAINTAINER=	jim@FreeBSD.org
 COMMENT=	A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 6b99f0126982..854cd062ffc9 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -31,7 +31,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/libtool/libltdl
+	cd ${WRKSRC} && ${ACLOCAL} -I ${LIBTOOL_SHAREDIR}/libltdl
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index 134e86083f2b..8f545ac37237 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -34,7 +34,7 @@ post-patch:
 		${WRKSRC}/libicq2000-config.in
 
 post-configure:
-	@${CP} ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${CP} ${LIBTOOL} ${WRKSRC}
 	@${REINPLACE_CMD} -E -e 's|^(install_ltlibs=).+$$|\1no|' \
 		${WRKSRC}/libtool
 
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index cd631c8b6a3a..b9570ee4d32c 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -101,7 +101,9 @@ SHLIB_VERSION=	5
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/aclocal.m4
 
 post-configure:
diff --git a/net-mgmt/net-snmp-devel/files/patch-aclocal.m4 b/net-mgmt/net-snmp-devel/files/patch-aclocal.m4
index c466d9e1f68c..eb2e519aa7f0 100644
--- a/net-mgmt/net-snmp-devel/files/patch-aclocal.m4
+++ b/net-mgmt/net-snmp-devel/files/patch-aclocal.m4
@@ -12,8 +12,8 @@
 +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
 +|| AC_MSG_ERROR([libtool configure failed])
 +
 +# Reload cache, that may have been modified by ltconfig
@@ -21,7 +21,7 @@
 +
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -42,7 +42,7 @@
  # which needs '.lib').
  libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
  ofile="$default_ofile"
  with_gnu_ld="$lt_cv_prog_gnu_ld"
  need_locks="$enable_libtool_lock"
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index cd631c8b6a3a..b9570ee4d32c 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -101,7 +101,9 @@ SHLIB_VERSION=	5
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/aclocal.m4
 
 post-configure:
diff --git a/net-mgmt/net-snmp/files/patch-aclocal.m4 b/net-mgmt/net-snmp/files/patch-aclocal.m4
index c466d9e1f68c..eb2e519aa7f0 100644
--- a/net-mgmt/net-snmp/files/patch-aclocal.m4
+++ b/net-mgmt/net-snmp/files/patch-aclocal.m4
@@ -12,8 +12,8 @@
 +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
 +|| AC_MSG_ERROR([libtool configure failed])
 +
 +# Reload cache, that may have been modified by ltconfig
@@ -21,7 +21,7 @@
 +
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -42,7 +42,7 @@
  # which needs '.lib').
  libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
  ofile="$default_ofile"
  with_gnu_ld="$lt_cv_prog_gnu_ld"
  need_locks="$enable_libtool_lock"
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index f9f900a73eed..8aca1d7a88c2 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ucd-snmp
 PORTVERSION=	4.2.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ucd-snmp.ucdavis.edu/ \
@@ -87,7 +87,9 @@ pre-everything::
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/aclocal.m4
 
 post-install:
diff --git a/net-mgmt/net-snmp4/files/patch-aclocal.m4 b/net-mgmt/net-snmp4/files/patch-aclocal.m4
index c466d9e1f68c..eb2e519aa7f0 100644
--- a/net-mgmt/net-snmp4/files/patch-aclocal.m4
+++ b/net-mgmt/net-snmp4/files/patch-aclocal.m4
@@ -12,8 +12,8 @@
 +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
 +|| AC_MSG_ERROR([libtool configure failed])
 +
 +# Reload cache, that may have been modified by ltconfig
@@ -21,7 +21,7 @@
 +
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -42,7 +42,7 @@
  # which needs '.lib').
  libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
  ofile="$default_ofile"
  with_gnu_ld="$lt_cv_prog_gnu_ld"
  need_locks="$enable_libtool_lock"
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index cd631c8b6a3a..b9570ee4d32c 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -101,7 +101,9 @@ SHLIB_VERSION=	5
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/aclocal.m4
 
 post-configure:
diff --git a/net-mgmt/net-snmp53/files/patch-aclocal.m4 b/net-mgmt/net-snmp53/files/patch-aclocal.m4
index c466d9e1f68c..eb2e519aa7f0 100644
--- a/net-mgmt/net-snmp53/files/patch-aclocal.m4
+++ b/net-mgmt/net-snmp53/files/patch-aclocal.m4
@@ -12,8 +12,8 @@
 +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
 +|| AC_MSG_ERROR([libtool configure failed])
 +
 +# Reload cache, that may have been modified by ltconfig
@@ -21,7 +21,7 @@
 +
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -42,7 +42,7 @@
  # which needs '.lib').
  libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
  ofile="$default_ofile"
  with_gnu_ld="$lt_cv_prog_gnu_ld"
  need_locks="$enable_libtool_lock"
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index 537e9349c5ef..c33b4d0fe796 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	everybuddy
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
 
@@ -14,7 +15,8 @@ MAINTAINER=	jim@FreeBSD.org
 COMMENT=	A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 52f539464924..c0d9a3e5d369 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dictd
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES+=	net textproc
 MASTER_SITES=	ftp://ftp.dict.org/pub/dict/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,6 +17,8 @@ MASTER_SITE_SUBDIR=		dict
 MAINTAINER?=	dd@FreeBSD.org
 COMMENT=	Dict protocol (RFC 2229) server
 
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
+
 MAN1=		dictzip.1
 MAN8=		dictd.8
 
diff --git a/net/everybuddy/Makefile b/net/everybuddy/Makefile
index 537e9349c5ef..c33b4d0fe796 100644
--- a/net/everybuddy/Makefile
+++ b/net/everybuddy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	everybuddy
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
 
@@ -14,7 +15,8 @@ MAINTAINER=	jim@FreeBSD.org
 COMMENT=	A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
diff --git a/net/gale/Makefile b/net/gale/Makefile
index 6b99f0126982..854cd062ffc9 100644
--- a/net/gale/Makefile
+++ b/net/gale/Makefile
@@ -31,7 +31,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/libtool/libltdl
+	cd ${WRKSRC} && ${ACLOCAL} -I ${LIBTOOL_SHAREDIR}/libltdl
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/net/libicq2000/Makefile b/net/libicq2000/Makefile
index 134e86083f2b..8f545ac37237 100644
--- a/net/libicq2000/Makefile
+++ b/net/libicq2000/Makefile
@@ -34,7 +34,7 @@ post-patch:
 		${WRKSRC}/libicq2000-config.in
 
 post-configure:
-	@${CP} ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${CP} ${LIBTOOL} ${WRKSRC}
 	@${REINPLACE_CMD} -E -e 's|^(install_ltlibs=).+$$|\1no|' \
 		${WRKSRC}/libtool
 
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 4c24e0360b1f..05d3b9fa0b50 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -17,12 +17,11 @@ COMMENT=	A C++ wrapper library to the sockets
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOMAKE=	yes
 USE_AUTOMAKE_VER=	15
 USE_LIBTOOL=	yes
 
 post-patch:
-	cd ${WRKSRC}; ./autogen
+	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./autogen)
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index cd631c8b6a3a..b9570ee4d32c 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -101,7 +101,9 @@ SHLIB_VERSION=	5
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/aclocal.m4
 
 post-configure:
diff --git a/net/net-snmp/files/patch-aclocal.m4 b/net/net-snmp/files/patch-aclocal.m4
index c466d9e1f68c..eb2e519aa7f0 100644
--- a/net/net-snmp/files/patch-aclocal.m4
+++ b/net/net-snmp/files/patch-aclocal.m4
@@ -12,8 +12,8 @@
 +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
 +|| AC_MSG_ERROR([libtool configure failed])
 +
 +# Reload cache, that may have been modified by ltconfig
@@ -21,7 +21,7 @@
 +
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -42,7 +42,7 @@
  # which needs '.lib').
  libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
  ofile="$default_ofile"
  with_gnu_ld="$lt_cv_prog_gnu_ld"
  need_locks="$enable_libtool_lock"
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index f9f900a73eed..8aca1d7a88c2 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ucd-snmp
 PORTVERSION=	4.2.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ucd-snmp.ucdavis.edu/ \
@@ -87,7 +87,9 @@ pre-everything::
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/aclocal.m4
 
 post-install:
diff --git a/net/net-snmp4/files/patch-aclocal.m4 b/net/net-snmp4/files/patch-aclocal.m4
index c466d9e1f68c..eb2e519aa7f0 100644
--- a/net/net-snmp4/files/patch-aclocal.m4
+++ b/net/net-snmp4/files/patch-aclocal.m4
@@ -12,8 +12,8 @@
 +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
 +|| AC_MSG_ERROR([libtool configure failed])
 +
 +# Reload cache, that may have been modified by ltconfig
@@ -21,7 +21,7 @@
 +
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -42,7 +42,7 @@
  # which needs '.lib').
  libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
  ofile="$default_ofile"
  with_gnu_ld="$lt_cv_prog_gnu_ld"
  need_locks="$enable_libtool_lock"
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index e2a6afb4a1ba..536d42df4631 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -16,9 +16,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
 
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext \
-		iconv:${PORTSDIR}/converters/libiconv \
-		ltdl:${PORTSDIR}/devel/libtool
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_REINPLACE=	yes
 USE_GNOME=	glib12 gtk12
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 731172e6b677..1e9c961806a8 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -84,7 +84,7 @@ post-patch:
 		${WRKSRC}/lib/silccrypt/Makefile.in
 
 post-configure:
-	@${CP} ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${CP} ${LIBTOOL} ${WRKSRC}
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index fd9921c25d6b..b19b938710be 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -82,7 +82,7 @@ post-patch:
 		${WRKSRC}/lib/silccrypt/Makefile.in
 
 post-configure:
-	@${CP} ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${CP} ${LIBTOOL} ${WRKSRC}
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 192572c92762..5c0ef6f3cb20 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -27,7 +27,6 @@ CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-MAKE_ARGS+=	LIBTOOL=libtool
 
 .include "${.CURDIR}/manpages.mk"
 
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 192572c92762..5c0ef6f3cb20 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -27,7 +27,6 @@ CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-MAKE_ARGS+=	LIBTOOL=libtool
 
 .include "${.CURDIR}/manpages.mk"
 
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index b0c550266ba7..6b6df54002a4 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -19,8 +19,7 @@ MASTER_SITE_SUBDIR=	freetype2
 MAINTAINER=	kanou@khdd.net
 COMMENT=	Demo programs for FreeType2
 
-BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
-BUILD_DEPENDS+=	${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:configure
+BUILD_DEPENDS+=	${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:build
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_XLIB=	yes
diff --git a/security/libgcrypt-devel/files/patch-aclocal.m4 b/security/libgcrypt-devel/files/patch-aclocal.m4
deleted file mode 100644
index 0b69ac6169f5..000000000000
--- a/security/libgcrypt-devel/files/patch-aclocal.m4
+++ /dev/null
@@ -1,14 +0,0 @@
---- aclocal.m4.orig	Fri Sep 20 13:11:18 2002
-+++ aclocal.m4	Thu Oct 10 16:57:09 2002
-@@ -1701,9 +1701,10 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) ${LOCALBASE}/bin/libtool'
- AC_SUBST(LIBTOOL)dnl
- 
- # Prevent multiple expansion
diff --git a/security/libgcrypt/files/patch-aclocal.m4 b/security/libgcrypt/files/patch-aclocal.m4
deleted file mode 100644
index 0b69ac6169f5..000000000000
--- a/security/libgcrypt/files/patch-aclocal.m4
+++ /dev/null
@@ -1,14 +0,0 @@
---- aclocal.m4.orig	Fri Sep 20 13:11:18 2002
-+++ aclocal.m4	Thu Oct 10 16:57:09 2002
-@@ -1701,9 +1701,10 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) ${LOCALBASE}/bin/libtool'
- AC_SUBST(LIBTOOL)dnl
- 
- # Prevent multiple expansion
diff --git a/security/libksba/files/patch-aclocal.m4 b/security/libksba/files/patch-aclocal.m4
deleted file mode 100644
index ad9f9d53c003..000000000000
--- a/security/libksba/files/patch-aclocal.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Wed Jul 17 17:13:45 2002
-+++ aclocal.m4	Wed Jul 17 17:14:40 2002
-@@ -589,7 +589,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) ${LOCALBASE}/bin/libtool'
- AC_SUBST(LIBTOOL)dnl
- 
- # Prevent multiple expansion
diff --git a/security/libksba/files/patch-configure b/security/libksba/files/patch-configure
deleted file mode 100644
index b8436dcffff7..000000000000
--- a/security/libksba/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Sat Nov 23 20:33:48 2002
-+++ configure	Sat Nov 23 20:34:29 2002
-@@ -7729,9 +7729,10 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='libtool'
- 
- # Prevent multiple expansion
- 
diff --git a/security/libksba/pkg-plist b/security/libksba/pkg-plist
index c81a96c361cd..a95b68ddf7f9 100644
--- a/security/libksba/pkg-plist
+++ b/security/libksba/pkg-plist
@@ -5,7 +5,6 @@ info/ksba.info
 info/ksba.info-1
 info/ksba.info-2
 @exec install-info %D/info/ksba.info %D/info/dir
-lib/libksba.la
 lib/libksba.so.7
 lib/libksba.so
 lib/libksba.a
diff --git a/security/nessus-libnasl/files/patch-aa b/security/nessus-libnasl/files/patch-aa
deleted file mode 100644
index 03f5d8af5f66..000000000000
--- a/security/nessus-libnasl/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Thu Oct 18 06:16:47 2001
-+++ configure	Thu Oct 18 06:18:59 2001
-@@ -5065,7 +5065,8 @@
- LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(PREFIX)/bin/libtool'
- 
- # Prevent multiple expansion
- 
diff --git a/security/nessus-libraries-devel/files/patch-ab b/security/nessus-libraries-devel/files/patch-ab
deleted file mode 100644
index 472a39e0f390..000000000000
--- a/security/nessus-libraries-devel/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Tue Oct 16 19:56:40 2001
-+++ configure	Thu Oct 18 06:13:41 2001
-@@ -5074,7 +5074,8 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(PREFIX)/bin/libtool'
- 
- # Prevent multiple expansion
- 
diff --git a/security/nessus-libraries/files/patch-ab b/security/nessus-libraries/files/patch-ab
index 472a39e0f390..ca079833ef92 100644
--- a/security/nessus-libraries/files/patch-ab
+++ b/security/nessus-libraries/files/patch-ab
@@ -6,7 +6,7 @@
  # Always use our own libtool.
 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(PREFIX)/bin/libtool'
++LIBTOOL='libtool'
  
  # Prevent multiple expansion
  
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 9baba213ebef..8ff2dd69a2eb 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dict
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.dict.org/pub/dict/
 DISTNAME=	${PORTNAME}d-${PORTVERSION}
@@ -15,9 +16,11 @@ DISTNAME=	${PORTNAME}d-${PORTVERSION}
 MAINTAINER=	dd@FreeBSD.org
 COMMENT=	Dictionary Server Protocol (RFC2229) client
 
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
+
 USE_BISON=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	14
 CFLAGS+=	-I${PREFIX}/include
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 		--with-etcdir=${PREFIX}/etc
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 3e5671e308a2..78209a69add0 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dictfmt
 PORTVERSION=	1.9.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dict
@@ -15,7 +16,7 @@ DISTNAME=	dictd-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Formats a DICT protocol dictionary database
 
-LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	253
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index bda0caa93c96..903641181a16 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -37,7 +37,7 @@ APACHE_VER?=	1.3
 PLIST_SUB=	APACHE2=${APACHE2}
 
 post-patch:
-	cd ${WRKSRC}; ${ACLOCAL}; ${LOCALBASE}/bin/libtoolize
+	cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}
 
 do-install:
 	${APXS} -i -A -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index db2b7ad20fa3..f24123644d4c 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -18,10 +18,11 @@ COMMENT=	Apache module mounts Tomcat web applications
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \
 		${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \
-		${AUTOCONF}:${PORTSDIR}/devel/autoconf \
-		${LIBTOOL}:${PORTSDIR}/devel/libtool
+		${AUTOCONF}:${PORTSDIR}/devel/autoconf
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	# none
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
@@ -38,7 +39,6 @@ APR_LIB?=	${LOCALBASE}/lib/
 APR_INCLUDE?=	${LOCALBASE}/include/apr-0/
 APACHE_MODULES?= libexec/apache/
 APR_SRC?=	${WRKDIRPREFIX}${PORTSDIR}/devel/apr/work/apr-?\.?\.?/
-LIBTOOL?=	${LOCALBASE}/bin/libtool
 AUTOCONF?=	${LOCALBASE}/bin/autoconf
 
 # If the user's changed the modules directory, pack things correctly.
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index 93fd9386fce9..62d86779aa72 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -56,7 +56,7 @@ post-patch:
 .else
 	@${CP} -R -f ${WRKSRC}/build/gnuauto/* ${WRKSRC}
 	(cd ${WRKSRC}	\
-	&& ${LOCALBASE}/bin/libtoolize --force --copy	\
+	&& ${LIBTOOLIZE} --force --copy	\
 	&& ${ACLOCAL})
 .endif
 
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index db525cf87a5d..0b58b28473f8 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -15,14 +15,14 @@ DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 MAINTAINER=	rzheka@users.sourceforge.net
 COMMENT=	Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
-		libtool:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
 USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
 
 RH_SUBVERSION=	1
 THEMES_SUBDIRS= ${WRKSRC}/art/gtk/Bluecurve1
@@ -57,6 +57,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/gtk/Bluecurve1/Makefile
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/gtk/Bluecurve/Makefile
 
+do-configure:
+	@${DO_NADA}
+
 do-build:
 	@for theme_dir in ${THEMES_SUBDIRS};do \
 		(cd $$theme_dir; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}); \
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index 305ceb0591c4..a94dcd776712 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -15,10 +15,11 @@ DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 MAINTAINER=	rzheka@users.sourceforge.net
 COMMENT=	Bluecurve unified-look theme for QT3 from RedHat 8.0
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
-		libtool:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
+USE_LIBTOOL=	yes
+#LIBTOOLFILES=	# none
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
@@ -37,6 +38,10 @@ do-extract:
 		fi
 	${CP} ${FILESDIR}/Makefile-qt3 ${WRKSRC}/art/qt/Bluecurve/Makefile
 
+# There's no configure script, but we need libtool to build
+do-configure:
+	@${DO_NADA}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/qt/Bluecurve/Makefile
 	@${RM} ${THEMES_SUBDIRS}/bluecurve.moc
diff --git a/x11-toolkits/gtk-bluecurve-theme/Makefile b/x11-toolkits/gtk-bluecurve-theme/Makefile
index db525cf87a5d..0b58b28473f8 100644
--- a/x11-toolkits/gtk-bluecurve-theme/Makefile
+++ b/x11-toolkits/gtk-bluecurve-theme/Makefile
@@ -15,14 +15,14 @@ DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 MAINTAINER=	rzheka@users.sourceforge.net
 COMMENT=	Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
-		libtool:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
 USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
 
 RH_SUBVERSION=	1
 THEMES_SUBDIRS= ${WRKSRC}/art/gtk/Bluecurve1
@@ -57,6 +57,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/gtk/Bluecurve1/Makefile
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/gtk/Bluecurve/Makefile
 
+do-configure:
+	@${DO_NADA}
+
 do-build:
 	@for theme_dir in ${THEMES_SUBDIRS};do \
 		(cd $$theme_dir; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}); \
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index 320f6841fd3b..12b53f9954cf 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	0.5.2
-PORTREVISION= 	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -27,6 +27,8 @@ RUN_DEPENDS=	php:${PORTSDIR}/lang/php4-cli
 
 # Don't call autoconf directly, ./buildconf does this
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	# none
 USE_AUTOCONF=	no
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
@@ -66,7 +68,7 @@ CONFIGURE_ENV=  CPPFLAGS="${ENVSCE}"
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-PIC2FIX=	acinclude.m4 aclocal.m4 autom4te.cache configure
+PIC2FIX=	acinclude.m4 aclocal.m4 configure
 
 EXAMPLES=	combobutton.php fileselection.php gtk.php hello.php list.php \
 		piemenu.php scribble.php scrollpane.php spaned.php sqpane.php \
@@ -86,7 +88,7 @@ pre-everything::
 pre-configure:
 	@php ${SCRIPTDIR}/memlim.php
 	@${ECHO_MSG} "===>  Building configuration files for ${PKGNAME}"
-	@(cd ${WRKSRC} && ./buildconf)
+	@(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ./buildconf)
 .for FILE in ${PIC2FIX}
 	@${REINPLACE_CMD} -e "s|-prefer-pic|${CFLAGS}|g" ${WRKSRC}/${FILE}
 .endfor
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index 320f6841fd3b..12b53f9954cf 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	0.5.2
-PORTREVISION= 	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -27,6 +27,8 @@ RUN_DEPENDS=	php:${PORTSDIR}/lang/php4-cli
 
 # Don't call autoconf directly, ./buildconf does this
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	# none
 USE_AUTOCONF=	no
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
@@ -66,7 +68,7 @@ CONFIGURE_ENV=  CPPFLAGS="${ENVSCE}"
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-PIC2FIX=	acinclude.m4 aclocal.m4 autom4te.cache configure
+PIC2FIX=	acinclude.m4 aclocal.m4 configure
 
 EXAMPLES=	combobutton.php fileselection.php gtk.php hello.php list.php \
 		piemenu.php scribble.php scrollpane.php spaned.php sqpane.php \
@@ -86,7 +88,7 @@ pre-everything::
 pre-configure:
 	@php ${SCRIPTDIR}/memlim.php
 	@${ECHO_MSG} "===>  Building configuration files for ${PKGNAME}"
-	@(cd ${WRKSRC} && ./buildconf)
+	@(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ./buildconf)
 .for FILE in ${PIC2FIX}
 	@${REINPLACE_CMD} -e "s|-prefer-pic|${CFLAGS}|g" ${WRKSRC}/${FILE}
 .endfor
diff --git a/x11-toolkits/qt-bluecurve-theme/Makefile b/x11-toolkits/qt-bluecurve-theme/Makefile
index 305ceb0591c4..a94dcd776712 100644
--- a/x11-toolkits/qt-bluecurve-theme/Makefile
+++ b/x11-toolkits/qt-bluecurve-theme/Makefile
@@ -15,10 +15,11 @@ DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 MAINTAINER=	rzheka@users.sourceforge.net
 COMMENT=	Bluecurve unified-look theme for QT3 from RedHat 8.0
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
-		libtool:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
+USE_LIBTOOL=	yes
+#LIBTOOLFILES=	# none
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
@@ -37,6 +38,10 @@ do-extract:
 		fi
 	${CP} ${FILESDIR}/Makefile-qt3 ${WRKSRC}/art/qt/Bluecurve/Makefile
 
+# There's no configure script, but we need libtool to build
+do-configure:
+	@${DO_NADA}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/qt/Bluecurve/Makefile
 	@${RM} ${THEMES_SUBDIRS}/bluecurve.moc
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index cee83c5cee41..4c2b6035a6e9 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -14,13 +14,11 @@ MASTER_SITES=	http://www.xs4all.nl/~ripley/XmHTML/dist/
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
 COMMENT=	A Motif widget set for displaying HTML 3.2 documents
 
-# BUILD_DEPENDS is used instead of USE_LIBTOOL in order to avoid
-# GNU_CONFIGURE being set.
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-#USE_LIBTOOL=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	# none
 USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -30,6 +28,9 @@ INSTALLS_SHLIB=	yes
 EXMP_DIR=	${PREFIX}/share/examples/${PORTNAME}
 DOCS_DIR=	${PREFIX}/share/doc/${PORTNAME}
 
+do-configure:
+	@${DO_NADA}
+
 post-build:
 	${RM} -rf ${WRKSRC}/examples/.libs ${WRKSRC}/examples/*.lo ${WRKSRC}/examples/*.o
 	${RM} -rf ${WRKSRC}/book/.libs ${WRKSRC}/book/*.lo ${WRKSRC}/book/*.o
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index c2315a8570a8..8c0afeaba68c 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -22,7 +22,7 @@ DISTNAME=	rxvt-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A low memory usage xterm replacement that supports color
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
+USE_LIBTOOL=	yes
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes