Conversion to a single libtool environment.

Approved by: portmgr (kris)
author: Ade Lovett <ade@FreeBSD.org> 2006-02-23 10:40:44 +0000
committer: Ade Lovett <ade@FreeBSD.org> 2006-02-23 10:40:44 +0000
commit: 8503536d3896846d823f7f76be54e0a99da8d8b6 (patch)
tree: 1a89e4038216ead71b008f2a5091474964e1c341 /textproc
parent: Unbreak: make it fetchable again (diff)
117 files changed, 339 insertions, 128 deletions
diff --git a/textproc/aiksaurus-gtk/Makefile b/textproc/aiksaurus-gtk/Makefile
index ee439c118212..5da033a5069d 100644
--- a/textproc/aiksaurus-gtk/Makefile
+++ b/textproc/aiksaurus-gtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc deskutils
 PKGNAMESUFFIX=	-gtk
 
diff --git a/textproc/aiksaurus-gtk/pkg-plist b/textproc/aiksaurus-gtk/pkg-plist
index fd7b8afbc2e6..85cce81ae6b9 100644
--- a/textproc/aiksaurus-gtk/pkg-plist
+++ b/textproc/aiksaurus-gtk/pkg-plist
@@ -3,6 +3,6 @@ include/Aiksaurus/AiksaurusGTK-C.h
 include/Aiksaurus/AiksaurusGTK.h
 lib/libAiksaurusGTK-1.2.so
 lib/libAiksaurusGTK-1.2.so.0
-lib/libAiksaurusGTK.a
+lib/libAiksaurusGTK.la
 lib/libAiksaurusGTK.so
 libdata/pkgconfig/gaiksaurus-1.0.pc
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 1d5f7503c06e..438b3fad8cd8 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aiksaurus
 PORTVERSION=	1.2.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aiksaurus
@@ -19,7 +19,7 @@ USE_GMAKE=	yes
 USE_GNOME?=	gnomehack gnometarget
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--without-gtk
 
 .include <bsd.port.mk>
diff --git a/textproc/aiksaurus/pkg-plist b/textproc/aiksaurus/pkg-plist
index 26e086a91b39..95d33f26fef7 100644
--- a/textproc/aiksaurus/pkg-plist
+++ b/textproc/aiksaurus/pkg-plist
@@ -4,7 +4,7 @@ include/Aiksaurus/Aiksaurus.h
 include/Aiksaurus/AiksaurusC.h
 lib/libAiksaurus-1.2.so
 lib/libAiksaurus-1.2.so.0
-lib/libAiksaurus.a
+lib/libAiksaurus.la
 lib/libAiksaurus.so
 libdata/pkgconfig/aiksaurus-1.0.pc
 share/aiksaurus/meanings.dat
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 1a0036d86bf7..233ef043905b 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	aspell
 PORTVERSION=	0.60.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	aspell
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	aspell-0.60.4.tar.gz
 MAINTAINER?=	thierry@FreeBSD.org
 COMMENT?=	Spelling checker with better suggestion logic than ispell
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-docdir=${DOCSDIR}	\
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index c741da3b0c72..84f0aa000b31 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -69,9 +69,11 @@ lib/aspell-%%VER%%/spell
 lib/aspell-%%VER%%/split.kbd
 lib/aspell-%%VER%%/standard.kbd
 lib/libaspell.a
+lib/libaspell.la
 lib/libaspell.so
 lib/libaspell.so.16
 lib/libpspell.a
+lib/libpspell.la
 lib/libpspell.so
 lib/libpspell.so.16
 %%DATADIR%%/ccpp.amf
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 35ef0b30957c..55e67928f28f 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cole
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://arturo.directmail.org/filters/archive/
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR=	sobomax
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free C OLE library
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/textproc/cole/pkg-plist b/textproc/cole/pkg-plist
index b222c03b308b..361ad820f3ae 100644
--- a/textproc/cole/pkg-plist
+++ b/textproc/cole/pkg-plist
@@ -5,6 +5,7 @@ bin/cole_isfs_fast
 bin/cole_tree
 include/cole/cole.h
 lib/libcole.a
+lib/libcole.la
 lib/libcole.so
 lib/libcole.so.2
 share/aclocal/cole.m4
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index d170c3730de0..1e613b4afc1f 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Dictionary Server Protocol (RFC2229) client
 
 USE_BISON=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 		--with-etcdir=${PREFIX}/etc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index c382c6e788b5..bce56af02c5c 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enchant
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www.abisource.com/downloads/enchant/${PORTVERSION}/
 #		${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +19,7 @@ COMMENT=	Dictionary/spellchecking framework
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=  libtool:15
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget glib20 ltverhack
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/enchant/pkg-plist b/textproc/enchant/pkg-plist
index c93af8c62874..335debd09054 100644
--- a/textproc/enchant/pkg-plist
+++ b/textproc/enchant/pkg-plist
@@ -4,18 +4,23 @@ include/enchant/enchant++.h
 include/enchant/enchant-provider.h
 include/enchant/enchant.h
 %%ASPELL%%lib/enchant/libenchant_aspell.a
+%%ASPELL%%lib/enchant/libenchant_aspell.la
 %%ASPELL%%lib/enchant/libenchant_aspell.so
 %%ASPELL%%lib/enchant/libenchant_aspell.so.1
 %%HSPELL%%lib/enchant/libenchant_hspell.a
+%%HSPELL%%lib/enchant/libenchant_hspell.la
 %%HSPELL%%lib/enchant/libenchant_hspell.so
 %%HSPELL%%lib/enchant/libenchant_hspell.so.1
 lib/enchant/libenchant_ispell.a
+lib/enchant/libenchant_ispell.la
 lib/enchant/libenchant_ispell.so
 lib/enchant/libenchant_ispell.so.1
 lib/enchant/libenchant_myspell.a
+lib/enchant/libenchant_myspell.la
 lib/enchant/libenchant_myspell.so
 lib/enchant/libenchant_myspell.so.1
 lib/libenchant.a
+lib/libenchant.la
 lib/libenchant.so
 lib/libenchant.so.1
 libdata/pkgconfig/enchant.pc
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 7f14740b415d..b0bade8ad04d 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	expat
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	expat
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	expat
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	XML 1.0 parser written in C
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	default
 INSTALLS_SHLIB=	yes
diff --git a/textproc/expat2/pkg-plist b/textproc/expat2/pkg-plist
index 098e651e8f58..765003325fa6 100644
--- a/textproc/expat2/pkg-plist
+++ b/textproc/expat2/pkg-plist
@@ -2,5 +2,6 @@ bin/xmlwf
 include/expat.h
 include/expat_external.h
 lib/libexpat.a
+lib/libexpat.la
 lib/libexpat.so
 lib/libexpat.so.%%SHLIB_MAJOR%%
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index a5a4f71472b8..23fb3f1135b6 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -18,8 +18,9 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GNOME=	glib20 gnomehack
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
-CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" CPPFLAGS="-I${LOCALBASE}/include"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 PLIST_SUB=	DOCSDIR="share/doc/${DISTNAME}"
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 6c009b5f247d..160c568a6a44 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomespell
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
@@ -23,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/gnome-spell/pkg-plist b/textproc/gnome-spell/pkg-plist
index 2d3c5fae2aed..b06e57d5d1ac 100644
--- a/textproc/gnome-spell/pkg-plist
+++ b/textproc/gnome-spell/pkg-plist
@@ -1,5 +1,6 @@
 lib/gnome-spell/libgnome-spell-component-0.3.so
 lib/gnome-spell/libgnome-spell-component.a
+lib/gnome-spell/libgnome-spell-component.la
 lib/gnome-spell/libgnome-spell-component.so
 libdata/bonobo/servers/GNOME_Spell.server
 share/gnome/control-center-2.0/icons/spell-checker.png
diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile
index 6c009b5f247d..160c568a6a44 100644
--- a/textproc/gnomespell/Makefile
+++ b/textproc/gnomespell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomespell
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
@@ -23,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/gnomespell/pkg-plist b/textproc/gnomespell/pkg-plist
index 2d3c5fae2aed..b06e57d5d1ac 100644
--- a/textproc/gnomespell/pkg-plist
+++ b/textproc/gnomespell/pkg-plist
@@ -1,5 +1,6 @@
 lib/gnome-spell/libgnome-spell-component-0.3.so
 lib/gnome-spell/libgnome-spell-component.a
+lib/gnome-spell/libgnome-spell-component.la
 lib/gnome-spell/libgnome-spell-component.so
 libdata/bonobo/servers/GNOME_Spell.server
 share/gnome/control-center-2.0/icons/spell-checker.png
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 7ca1c9b14ea0..c126a90e0c82 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkspell2
 PORTVERSION=	2.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://gtkspell.sourceforge.net/download/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gtkspell/pkg-plist b/textproc/gtkspell/pkg-plist
index cbd47c558bc1..ae1202c56b5a 100644
--- a/textproc/gtkspell/pkg-plist
+++ b/textproc/gtkspell/pkg-plist
@@ -1,5 +1,6 @@
 include/gtkspell-2.0/gtkspell/gtkspell.h
 lib/libgtkspell.a
+lib/libgtkspell.la
 lib/libgtkspell.so
 lib/libgtkspell.so.0
 libdata/pkgconfig/gtkspell-2.0.pc
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index 7ca1c9b14ea0..c126a90e0c82 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkspell2
 PORTVERSION=	2.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://gtkspell.sourceforge.net/download/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gtkspell2/pkg-plist b/textproc/gtkspell2/pkg-plist
index cbd47c558bc1..ae1202c56b5a 100644
--- a/textproc/gtkspell2/pkg-plist
+++ b/textproc/gtkspell2/pkg-plist
@@ -1,5 +1,6 @@
 include/gtkspell-2.0/gtkspell/gtkspell.h
 lib/libgtkspell.a
+lib/libgtkspell.la
 lib/libgtkspell.so
 lib/libgtkspell.so.0
 libdata/pkgconfig/gtkspell-2.0.pc
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 2ab4d428834b..cd423f8b60ca 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	htdig
 PORTVERSION=	3.2.0.b6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www
 MASTER_SITES=	http://htdig.sourceforge.net/files/ \
 		http://www.htdig.org/files/ \
@@ -22,8 +22,6 @@ COMMENT=	A www indexing and searching system
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}
 
-USE_AUTOTOOLS=	libtool:15
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-config-dir=${PREFIX}/etc/htdig \
 		--with-default-config-file=${PREFIX}/etc/htdig/htdig.conf \
diff --git a/textproc/htdig/pkg-plist b/textproc/htdig/pkg-plist
index 0e7d93df5374..eda4e9b5c5c8 100644
--- a/textproc/htdig/pkg-plist
+++ b/textproc/htdig/pkg-plist
@@ -133,18 +133,23 @@ include/htdig_db/xa.h
 include/htdig_db/xa_ext.h
 lib/htdig/libcommon-3.2.0.so
 lib/htdig/libcommon.a
+lib/htdig/libcommon.la
 lib/htdig/libcommon.so
 lib/htdig/libfuzzy-3.2.0.so
 lib/htdig/libfuzzy.a
+lib/htdig/libfuzzy.la
 lib/htdig/libfuzzy.so
 lib/htdig/libht-3.2.0.so
 lib/htdig/libht.a
+lib/htdig/libht.la
 lib/htdig/libht.so
 lib/htdig/libhtnet-3.2.0.so
 lib/htdig/libhtnet.a
+lib/htdig/libhtnet.la
 lib/htdig/libhtnet.so
 lib/htdig/libhtword-3.2.0.so
 lib/htdig/libhtword.a
+lib/htdig/libhtword.la
 lib/htdig/libhtword.so
 lib/htdig_db/libhtdb-3.2.0.so
 lib/htdig_db/libhtdb.a
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
index e069a637ace3..3efdd256befb 100644
--- a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
@@ -9,7 +9,7 @@
 -#AUTOCONF = autoconf
 +ACLOCAL = aclocal19
 +AUTOMAKE = automake19 --add-missing --copy
-+LIBTOOLIZE = libtoolize15 --force --copy
++LIBTOOLIZE = libtoolize --force --copy
 +AUTOHEADER = autoheader259
 +AUTOCONF = autoconf259
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index a01d2565ce4a..9b72dcfd0fd7 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/textproc/iiimf-gtk/files/patch-Makefile b/textproc/iiimf-gtk/files/patch-Makefile
index 70065ec45e00..4942c07fafd7 100644
--- a/textproc/iiimf-gtk/files/patch-Makefile
+++ b/textproc/iiimf-gtk/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Mon May  9 15:32:45 2005
-+++ Makefile	Mon May  9 15:35:03 2005
-@@ -1,29 +1,31 @@
+--- Makefile.orig	Tue Apr 19 15:38:18 2005
++++ Makefile	Fri Feb  3 20:09:51 2006
+@@ -1,7 +1,7 @@
  ## deprecated in favour of AUTORECONF
 -#ACLOCAL = aclocal
 -#AUTOMAKE = automake --add-missing --copy
@@ -9,19 +9,16 @@
 -#AUTOCONF = autoconf
 +ACLOCAL = aclocal19
 +AUTOMAKE = automake19 --add-missing --copy
-+LIBTOOLIZE = libtoolize15 --force --copy
++LIBTOOLIZE = libtoolize --force --copy
 +AUTOHEADER = autoheader259
 +AUTOCONF = autoconf259
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
- #             $(LIBTOOLIZE) && \
- #             $(AUTOHEADER) && \
- #             $(AUTOMAKE) && \
- #             $(AUTOCONF)
+@@ -12,3 +12,3 @@
  
 -AUTORECONF = autoreconf
 +AUTORECONF = autoreconf259
  BOOTSTRAP = $(AUTORECONF) --install --force
- INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
+@@ -16,12 +16,14 @@
  
 -CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 +CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
@@ -43,5 +40,3 @@
 +CONFIGDIRS = $(BUILDDIRS)
 +#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
  
- all: compile
- 
diff --git a/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist
index ba9b38b4047b..bfb380a1d982 100644
--- a/textproc/iiimf-gtk/pkg-plist
+++ b/textproc/iiimf-gtk/pkg-plist
@@ -1,3 +1,5 @@
+lib/gtk-2.0/2.4.0/immodules/im-iiim.a
+lib/gtk-2.0/2.4.0/immodules/im-iiim.la
 lib/gtk-2.0/2.4.0/immodules/im-iiim.so
 @exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 4fd0088cad87..3feb8da41c66 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -25,7 +25,7 @@ CONFLICTS=	sp-1.*
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog
 PLIST_SUB=	XMLCATMGR=${XMLCATMGR}
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index c9f38b5c1419..859510ab3885 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	roam@FreeBSD.org
 COMMENT=	An English-to-Bulgarian and Bulgarian-to-English dictionary
 
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS+=	--with-kde
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 USE_KDELIBS_VER=	3
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 684fa3d99ab9..08070d729021 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdiff3
 PORTVERSION=	0.9.88
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A KDE3 graphical frontend for diff
 
-USE_KDELIBS_VER=	3
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+USE_KDELIBS_VER=3
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist
index db6149b0f412..6bfd11b0506d 100644
--- a/textproc/kdiff3/pkg-plist
+++ b/textproc/kdiff3/pkg-plist
@@ -1,4 +1,5 @@
 bin/kdiff3
+lib/kde3/libkdiff3part.a
 lib/kde3/libkdiff3part.la
 lib/kde3/libkdiff3part.so
 share/applnk/Development/kdiff3.desktop
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
index db3614df3c8f..5bd63704565f 100644
--- a/textproc/latte/Makefile
+++ b/textproc/latte/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	latte
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.latte.org/ \
 		ftp://ftp.brasslantern.com/pub/zanshin/latte/
@@ -17,7 +18,7 @@ COMMENT=	Simple language for marking up text in a very expressive way
 USE_BISON=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:213 libtool:13:inc
+USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/textproc/latte/pkg-plist b/textproc/latte/pkg-plist
index b6452600d509..7bd8dda559a4 100644
--- a/textproc/latte/pkg-plist
+++ b/textproc/latte/pkg-plist
@@ -19,6 +19,7 @@ include/latte/restorer.h
 include/latte/shdeque.h
 include/latte/shstring.h
 lib/liblatte.a
+lib/liblatte.la
 lib/liblatte.so
 lib/liblatte.so.5
 share/emacs/site-lisp/latte.el
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 5222e8b6cbc7..63673992656e 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libcroco
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
@@ -17,7 +17,7 @@ COMMENT=	CSS2 parsing library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack lthack glib20 libxml2
 
diff --git a/textproc/libcroco/pkg-plist b/textproc/libcroco/pkg-plist
index 4b37f5f3eb42..940a8ca6099e 100644
--- a/textproc/libcroco/pkg-plist
+++ b/textproc/libcroco/pkg-plist
@@ -29,6 +29,7 @@ include/libcroco-%%VERSION%%/libcroco/cr-utils.h
 include/libcroco-%%VERSION%%/libcroco/libcroco-config.h
 include/libcroco-%%VERSION%%/libcroco/libcroco.h
 lib/libcroco-%%VERSION%%.a
+lib/libcroco-%%VERSION%%.la
 lib/libcroco-%%VERSION%%.so
 lib/libcroco-%%VERSION%%.so.3
 libdata/pkgconfig/libcroco-%%VERSION%%.pc
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index e67f8212fdbc..dfc4ef97833f 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	0.5.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://gnunet.org/libextractor/download/ \
 		${MASTER_SITE_GNU}
@@ -18,7 +19,8 @@ COMMENT=	Library for keyword extraction
 USE_GCC=	3.4+
 USE_GNOME=	glib20
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	libtool:15:inc libltdl:15
+USE_AUTOTOOLS=	libltdl:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-ltdl-install
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/libextractor/pkg-plist b/textproc/libextractor/pkg-plist
index 19e1160b4829..3d066c0e2fb8 100644
--- a/textproc/libextractor/pkg-plist
+++ b/textproc/libextractor/pkg-plist
@@ -1,49 +1,93 @@
 bin/extract
 include/extractor.h
+lib/libextractor.la
 lib/libextractor.so
 lib/libextractor.so.2
+lib/libextractor/libextractor_asf.la
 lib/libextractor/libextractor_asf.so
+lib/libextractor/libextractor_deb.la
 lib/libextractor/libextractor_deb.so
+lib/libextractor/libextractor_dvi.la
 lib/libextractor/libextractor_dvi.so
+lib/libextractor/libextractor_elf.la
 lib/libextractor/libextractor_elf.so
+lib/libextractor/libextractor_exiv2.la
 lib/libextractor/libextractor_exiv2.so
+lib/libextractor/libextractor_filename.la
 lib/libextractor/libextractor_filename.so
+lib/libextractor/libextractor_gif.la
 lib/libextractor/libextractor_gif.so
+lib/libextractor/libextractor_hash_md5.la
 lib/libextractor/libextractor_hash_md5.so
+lib/libextractor/libextractor_hash_rmd160.la
 lib/libextractor/libextractor_hash_rmd160.so
+lib/libextractor/libextractor_hash_sha1.la
 lib/libextractor/libextractor_hash_sha1.so
+lib/libextractor/libextractor_html.la
 lib/libextractor/libextractor_html.so
+lib/libextractor/libextractor_id3v2.la
 lib/libextractor/libextractor_id3v2.so
+lib/libextractor/libextractor_id3v23.la
 lib/libextractor/libextractor_id3v23.so
+lib/libextractor/libextractor_id3v24.la
 lib/libextractor/libextractor_id3v24.so
+lib/libextractor/libextractor_jpeg.la
 lib/libextractor/libextractor_jpeg.so
+lib/libextractor/libextractor_lower.la
 lib/libextractor/libextractor_lower.so
+lib/libextractor/libextractor_man.la
 lib/libextractor/libextractor_man.so
+lib/libextractor/libextractor_mime.la
 lib/libextractor/libextractor_mime.so
+lib/libextractor/libextractor_mp3.la
 lib/libextractor/libextractor_mp3.so
+lib/libextractor/libextractor_mpeg.la
 lib/libextractor/libextractor_mpeg.so
+%%VORBIS:%%lib/libextractor/libextractor_ogg.la
 %%VORBIS:%%lib/libextractor/libextractor_ogg.so
+lib/libextractor/libextractor_oo.la
 lib/libextractor/libextractor_oo.so
+lib/libextractor/libextractor_pdf.la
 lib/libextractor/libextractor_pdf.so
+lib/libextractor/libextractor_png.la
 lib/libextractor/libextractor_png.so
+lib/libextractor/libextractor_printable_da.la
 lib/libextractor/libextractor_printable_da.so
+lib/libextractor/libextractor_printable_de.la
 lib/libextractor/libextractor_printable_de.so
+lib/libextractor/libextractor_printable_en.la
 lib/libextractor/libextractor_printable_en.so
+lib/libextractor/libextractor_printable_es.la
 lib/libextractor/libextractor_printable_es.so
+lib/libextractor/libextractor_printable_it.la
 lib/libextractor/libextractor_printable_it.so
+lib/libextractor/libextractor_printable_no.la
 lib/libextractor/libextractor_printable_no.so
+lib/libextractor/libextractor_printable_pt.la
 lib/libextractor/libextractor_printable_pt.so
+lib/libextractor/libextractor_ps.la
 lib/libextractor/libextractor_ps.so
+lib/libextractor/libextractor_qt.la
 lib/libextractor/libextractor_qt.so
+lib/libextractor/libextractor_real.la
 lib/libextractor/libextractor_real.so
+lib/libextractor/libextractor_riff.la
 lib/libextractor/libextractor_riff.so
+lib/libextractor/libextractor_rpm.la
 lib/libextractor/libextractor_rpm.so
+lib/libextractor/libextractor_split.la
 lib/libextractor/libextractor_split.so
+lib/libextractor/libextractor_tar.la
 lib/libextractor/libextractor_tar.so
+%%IMAGEMAGICK:%%lib/libextractor/libextractor_thumbnail.la
 %%IMAGEMAGICK:%%lib/libextractor/libextractor_thumbnail.so
+lib/libextractor/libextractor_tiff.la
 lib/libextractor/libextractor_tiff.so
+lib/libextractor/libextractor_translit.la
 lib/libextractor/libextractor_translit.so
+lib/libextractor/libextractor_wav.la
 lib/libextractor/libextractor_wav.so
+lib/libextractor/libextractor_zip.la
 lib/libextractor/libextractor_zip.so
 share/locale/de/LC_MESSAGES/libextractor.mo
 share/locale/ga/LC_MESSAGES/libextractor.mo
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 0544b8ac227b..ab86b025093c 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	liblingoteach
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lingoteach
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=	lingoteach
 MAINTAINER=	mva@sysfault.org
 COMMENT=	A library for parsing lesson files based on the LingoTeach DTD
 
-USE_GMAKE=		yes
-USE_GNOME=		gnomehack gnometarget libxml2
-USE_AUTOTOOLS=	libtool:13:inc
-INSTALLS_SHLIB=		yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget libxml2
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
 
 .if defined(WITH_COMP)
 CONFIGURE_ARGS+=	--with-compression
diff --git a/textproc/liblingoteach/pkg-plist b/textproc/liblingoteach/pkg-plist
index 0a85aa997a89..5e55c1e7d350 100644
--- a/textproc/liblingoteach/pkg-plist
+++ b/textproc/liblingoteach/pkg-plist
@@ -1,6 +1,7 @@
 include/lingoteach/lingdefs.h
 include/lingoteach/lingoteach.h
 lib/liblingoteach.a
+lib/liblingoteach.la
 lib/liblingoteach.so
 lib/liblingoteach.so.3
 libdata/pkgconfig/liblingoteach.pc
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 7d36debd3606..f2f0015d7f5e 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	liblrdf
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lrdf
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	raptor.2:${PORTSDIR}/textproc/raptor
 
 USE_GNOME=	gnomehack gnometarget
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/liblrdf/pkg-plist b/textproc/liblrdf/pkg-plist
index a8f6a2e42c24..0d9c53e8cebe 100644
--- a/textproc/liblrdf/pkg-plist
+++ b/textproc/liblrdf/pkg-plist
@@ -1,6 +1,7 @@
 include/lrdf.h
 include/lrdf_types.h
 lib/liblrdf.a
+lib/liblrdf.la
 lib/liblrdf.so
 lib/liblrdf.so.2
 libdata/pkgconfig/lrdf.pc
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 9bb77ef675e9..097bb940fd3b 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libparsifal
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.saunalahti.fi/~samiuus/toni/xmlproc/
 
@@ -16,7 +17,7 @@ COMMENT=	Lightweight XML Parser
 
 USE_ICONV=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/libparsifal/pkg-plist b/textproc/libparsifal/pkg-plist
index 61b81a160faf..374a7238120f 100644
--- a/textproc/libparsifal/pkg-plist
+++ b/textproc/libparsifal/pkg-plist
@@ -10,6 +10,7 @@ include/libparsifal/xmlsbuf.h
 include/libparsifal/xmlvect.h
 lib/libparsifal-%%VERSION%%.so
 lib/libparsifal.a
+lib/libparsifal.la
 lib/libparsifal.so
 %%PORTDOCS%%%%DOCSDIR%%/conformance.html
 %%PORTDOCS%%%%DOCSDIR%%/csrchtml/canonxml_c.html
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index 062242cbfc1d..c624ac0ac5d7 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/xerces-c2:extract
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 XERCESCROOT=	`cd ${PORTSDIR}/textproc/xerces-c2; ${MAKE} -V WRKSRC`
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index bea352972d91..04111d6f5e7f 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libtre
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://laurikari.net/tre/
 DISTNAME=	tre-${PORTVERSION}
@@ -17,7 +18,7 @@ COMMENT=	A lightweight fully POSIX compliant regexp matching library
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig lthack
-USE_GETOPT_LONG=	yes
+USE_GETOPT_LONG=yes
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/textproc/libtre/pkg-plist b/textproc/libtre/pkg-plist
index 0c8778f1fc37..f06b1e71c42a 100644
--- a/textproc/libtre/pkg-plist
+++ b/textproc/libtre/pkg-plist
@@ -3,6 +3,7 @@ bin/agrep
 include/tre/regex.h
 include/tre/tre-config.h
 lib/libtre.a
+lib/libtre.la
 lib/libtre.so
 lib/libtre.so.6
 libdata/pkgconfig/tre.pc
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 7fec52672e6c..99d0eba89daa 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libwpd
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libwpd
@@ -15,7 +16,7 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libwpd/pkg-plist b/textproc/libwpd/pkg-plist
index b559b8bd349b..c5ce7db3f379 100644
--- a/textproc/libwpd/pkg-plist
+++ b/textproc/libwpd/pkg-plist
@@ -11,10 +11,10 @@ include/libwpd-0.8/libwpd/WPXStream.h
 include/libwpd-0.8/libwpd/WPXString.h
 include/libwpd-0.8/libwpd/libwpd.h
 include/libwpd-0.8/libwpd/libwpd_types.h
-lib/libwpd-0.8.a
+lib/libwpd-0.8.la
 lib/libwpd-0.8.so
 lib/libwpd-0.8.so.8
-lib/libwpd-stream-0.8.a
+lib/libwpd-stream-0.8.la
 lib/libwpd-stream-0.8.so
 lib/libwpd-stream-0.8.so.8
 libdata/pkgconfig/libwpd-0.8.pc
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 7fec52672e6c..99d0eba89daa 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libwpd
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libwpd
@@ -15,7 +16,7 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libwpd08/pkg-plist b/textproc/libwpd08/pkg-plist
index b559b8bd349b..c5ce7db3f379 100644
--- a/textproc/libwpd08/pkg-plist
+++ b/textproc/libwpd08/pkg-plist
@@ -11,10 +11,10 @@ include/libwpd-0.8/libwpd/WPXStream.h
 include/libwpd-0.8/libwpd/WPXString.h
 include/libwpd-0.8/libwpd/libwpd.h
 include/libwpd-0.8/libwpd/libwpd_types.h
-lib/libwpd-0.8.a
+lib/libwpd-0.8.la
 lib/libwpd-0.8.so
 lib/libwpd-0.8.so.8
-lib/libwpd-stream-0.8.a
+lib/libwpd-stream-0.8.la
 lib/libwpd-stream-0.8.so
 lib/libwpd-stream-0.8.so.8
 libdata/pkgconfig/libwpd-0.8.pc
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 229173d74bbd..eb918482472a 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libxml++
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -16,7 +17,7 @@ MAINTAINER=	bland@FreeBSD.org
 COMMENT=	XML API for C++
 
 USE_GNOME=	gnomehack gnometarget libxml2 pkgconfig
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml++/pkg-plist b/textproc/libxml++/pkg-plist
index 56815ca5ce4c..10d818f57ca5 100644
--- a/textproc/libxml++/pkg-plist
+++ b/textproc/libxml++/pkg-plist
@@ -23,6 +23,7 @@ include/libxml++-1.0/libxml++/parsers/domparser.h
 include/libxml++-1.0/libxml++/parsers/parser.h
 include/libxml++-1.0/libxml++/parsers/saxparser.h
 lib/libxml++-1.0.a
+lib/libxml++-1.0.la
 lib/libxml++-1.0.so
 lib/libxml++-1.0.so.1
 libdata/pkgconfig/libxml++-1.0.pc
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 847966b3fd8c..6e77d71582c0 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	libxml++
 PORTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -24,7 +25,7 @@ LATEST_LINK=	libxml++26
 USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_GNOME=	gnomehack gnometarget libxml2 pkgconfig
-USE_AUTOTOOLS=	libtool:15:inc
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
@@ -44,13 +45,4 @@ post-configure:
 	@${TOUCH} ${WRKSRC}/docs/reference/${PORTVERSION:R}/html/index.html
 .endif
 
-patch-autotools::
-	@(cd ${PATCH_WRKSRC}; \
-	for file in ${LIBTOOLFILES}; do \
-		${CP} $$file $$file.tmp; \
-		${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
-			$$file.tmp > $$file; \
-		${RM} $$file.tmp; \
-	done);
-
 .include <bsd.port.mk>
diff --git a/textproc/libxml++26/pkg-plist b/textproc/libxml++26/pkg-plist
index f0882c6d310e..751e9f275d61 100644
--- a/textproc/libxml++26/pkg-plist
+++ b/textproc/libxml++26/pkg-plist
@@ -27,6 +27,7 @@ include/libxml++-%%API_VERSION%%/libxml++/parsers/textreader.h
 include/libxml++-%%API_VERSION%%/libxml++/validators/dtdvalidator.h
 include/libxml++-%%API_VERSION%%/libxml++/validators/validator.h
 lib/libxml++-%%VERSION%%.a
+lib/libxml++-%%VERSION%%.la
 lib/libxml++-%%VERSION%%.so
 lib/libxml++-%%VERSION%%.so.2
 libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 5b620beb2dfb..f37a28a3be42 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libxml/1.8
@@ -18,7 +18,7 @@ COMMENT=	XML parser library for GNOME
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 pre-patch:
diff --git a/textproc/libxml/pkg-plist b/textproc/libxml/pkg-plist
index d8e47c349db3..b99527f7309a 100644
--- a/textproc/libxml/pkg-plist
+++ b/textproc/libxml/pkg-plist
@@ -19,6 +19,7 @@ include/gnome-xml/xmlIO.h
 include/gnome-xml/xmlmemory.h
 include/gnome-xml/xpath.h
 lib/libxml.a
+lib/libxml.la
 lib/libxml.so
 lib/libxml.so.5
 libdata/pkgconfig/libxml.pc
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 7cd9bdde1ab0..d5ad1ab3a230 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -13,7 +13,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.6.23
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
@@ -25,7 +25,7 @@ COMMENT?=	XML parser library for GNOME
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME?=	gnomehack gnometarget pkgconfig
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 90f4c89ba005..5ce3cd6a305a 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -50,6 +50,7 @@ include/libxml2/libxml/xpath.h
 include/libxml2/libxml/xpathInternals.h
 include/libxml2/libxml/xpointer.h
 lib/libxml2.a
+lib/libxml2.la
 lib/libxml2.so
 lib/libxml2.so.5
 libdata/pkgconfig/libxml-2.0.pc
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 97ef252a728f..b29875324a8c 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libxode
 PORTVERSION=	0.71
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	An XML library which wraps expat
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/libxode/pkg-plist b/textproc/libxode/pkg-plist
index be966cdf9cbf..aa8b90a5b178 100644
--- a/textproc/libxode/pkg-plist
+++ b/textproc/libxode/pkg-plist
@@ -1,5 +1,6 @@
 bin/libxode-config
 include/libxode.h
 lib/libxode.a
+lib/libxode.la
 lib/libxode.so
 lib/libxode.so.2
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index f59695094307..f9af25eff937 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxslt
 PORTVERSION=	1.1.15
+PORTREVISION=	1
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
@@ -17,7 +18,7 @@ COMMENT?=	The XSLT C library for GNOME
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME?=	gnomehack gnometarget libxml2
 USE_REINPLACE=	yes
diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist
index 58279068fc57..c0aa5a6f6b87 100644
--- a/textproc/libxslt/pkg-plist
+++ b/textproc/libxslt/pkg-plist
@@ -25,9 +25,11 @@ include/libxslt/xsltconfig.h
 include/libxslt/xsltexports.h
 include/libxslt/xsltutils.h
 lib/libexslt.a
+lib/libexslt.la
 lib/libexslt.so
 lib/libexslt.so.8
 lib/libxslt.a
+lib/libxslt.la
 lib/libxslt.so
 lib/libxslt.so.2
 libdata/pkgconfig/libexslt.pc
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 0af15ec31f4e..4f533d5bcb8c 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	link-grammar
 PORTVERSION=	4.1.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 
@@ -17,7 +18,7 @@ USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 DOCS=		LICENSE README
 
diff --git a/textproc/link-grammar/pkg-plist b/textproc/link-grammar/pkg-plist
index 258d1204119e..8bbdf8cf44dd 100644
--- a/textproc/link-grammar/pkg-plist
+++ b/textproc/link-grammar/pkg-plist
@@ -30,6 +30,7 @@ include/link-grammar/tokenize.h
 include/link-grammar/utilities.h
 include/link-grammar/word-file.h
 lib/liblink-grammar.a
+lib/liblink-grammar.la
 lib/liblink-grammar.so
 lib/liblink-grammar.so.5
 libdata/pkgconfig/link-grammar.pc
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index c0de473a8cfe..9ccf24896263 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mifluz
 PORTVERSION=	0.23.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +17,8 @@ COMMENT=	C++ library to build and query a full text inverted index
 
 USE_ICONV=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
-		--without-unac
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} --without-unac
 INSTALLS_SHLIB=	yes
 
 USE_BISON=	yes
diff --git a/textproc/mifluz/pkg-plist b/textproc/mifluz/pkg-plist
index cc8b62bbcda2..14ccc5a7afd4 100644
--- a/textproc/mifluz/pkg-plist
+++ b/textproc/mifluz/pkg-plist
@@ -89,6 +89,7 @@ include/mifluz/unac.h
 include/mifluz/xa.h
 include/mifluz/xa_ext.h
 lib/libmifluz.a
+lib/libmifluz.la
 lib/libmifluz.so
 lib/libmifluz.so.0
 @dirrm include/mifluz
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index 7f2de3155b02..ea715194c794 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	minidom
 PORTVERSION=	0.1.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 
@@ -20,14 +20,14 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-libxml2=yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lglib|-lglib12|g ; \
+	@${REINPLACE_CMD} -e 's|-lglib|-lglib-12|g ; \
 		s|glib-config|${GLIB_CONFIG}|g ; \
 		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
diff --git a/textproc/minidom/pkg-plist b/textproc/minidom/pkg-plist
index 100342b4a747..353d2564acd1 100644
--- a/textproc/minidom/pkg-plist
+++ b/textproc/minidom/pkg-plist
@@ -1,6 +1,7 @@
 bin/minidom-config
 include/minidom/minidom.h
 lib/libminidom.a
+lib/libminidom.la
 lib/libminidom.so
 lib/libminidom.so.1
 @dirrm include/minidom
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index db696421f332..309481031fff 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	modlogan
 PORTVERSION=	0.8.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www
 MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -33,9 +33,7 @@ LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 # Please don't remove the comments, as soon as autoconf/libtool get's
 # updated in the ports collection the comments may be removed.
 # They serve as a reminder.
-USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
-#LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-ltdl-install=no --with-gd=${LOCALBASE}/include \
diff --git a/textproc/modlogan/pkg-plist b/textproc/modlogan/pkg-plist
index 3e8a87ec7fc1..71a072a2d428 100644
--- a/textproc/modlogan/pkg-plist
+++ b/textproc/modlogan/pkg-plist
@@ -17,44 +17,83 @@ etc/modlogan/modlogan.css-dist
 @unexec if cmp -s %D/etc/modlogan/modlogan.def.conf %D/etc/modlogan/modlogan.def.conf-dist; then rm -f %D/etc/modlogan/modlogan.def.conf; fi
 etc/modlogan/modlogan.def.conf-dist
 @dirrm etc/modlogan
+lib/libmla_input_bsdftpd.a
 lib/libmla_input_bsdftpd.so
+lib/libmla_input_clf.a
 lib/libmla_input_clf.so
+lib/libmla_input_cp_ims_login.a
 lib/libmla_input_cp_ims_login.so
+lib/libmla_input_cp_ims_smtp.a
 lib/libmla_input_cp_ims_smtp.so
+lib/libmla_input_flowraw.a
 lib/libmla_input_flowraw.so
+lib/libmla_input_ipchains.a
 lib/libmla_input_ipchains.so
+lib/libmla_input_ippl.a
 lib/libmla_input_ippl.so
+lib/libmla_input_isdn4bsd.a
 lib/libmla_input_isdn4bsd.so
+lib/libmla_input_isdnlog.a
 lib/libmla_input_isdnlog.so
+lib/libmla_input_mod_log_sql.a
 lib/libmla_input_mod_log_sql.so
+lib/libmla_input_msiis.a
 lib/libmla_input_msiis.so
+lib/libmla_input_msmedia.a
 lib/libmla_input_msmedia.so
+lib/libmla_input_netscape.a
 lib/libmla_input_netscape.so
+lib/libmla_input_null.a
 lib/libmla_input_null.so
+lib/libmla_input_postfix.a
 lib/libmla_input_postfix.so
+lib/libmla_input_pureftpd.a
 lib/libmla_input_pureftpd.so
+lib/libmla_input_qmail.a
 lib/libmla_input_qmail.so
+lib/libmla_input_qmailscanner.a
 lib/libmla_input_qmailscanner.so
+lib/libmla_input_qtss.a
 lib/libmla_input_qtss.so
+lib/libmla_input_realserver.a
 lib/libmla_input_realserver.so
+lib/libmla_input_rsync.a
 lib/libmla_input_rsync.so
+lib/libmla_input_sendmail.a
 lib/libmla_input_sendmail.so
+lib/libmla_input_shoutcast.a
 lib/libmla_input_shoutcast.so
+lib/libmla_input_squid.a
 lib/libmla_input_squid.so
+lib/libmla_input_viruswall.a
 lib/libmla_input_viruswall.so
+lib/libmla_input_wuftpd.a
 lib/libmla_input_wuftpd.so
+lib/libmla_output_csv.a
 lib/libmla_output_csv.so
+lib/libmla_output_modlogan.a
 lib/libmla_output_modlogan.so
+lib/libmla_output_null.a
 lib/libmla_output_null.so
+lib/libmla_output_template.a
 lib/libmla_output_template.so
+lib/libmla_output_text.a
 lib/libmla_output_text.so
+lib/libmla_output_webalizer.a
 lib/libmla_output_webalizer.so
+lib/libmla_processor_accounting.a
 lib/libmla_processor_accounting.so
+lib/libmla_processor_firewall.a
 lib/libmla_processor_firewall.so
+lib/libmla_processor_ippl.a
 lib/libmla_processor_ippl.so
+lib/libmla_processor_mail.a
 lib/libmla_processor_mail.so
+lib/libmla_processor_null.a
 lib/libmla_processor_null.so
+lib/libmla_processor_telecom.a
 lib/libmla_processor_telecom.so
+lib/libmla_processor_web.a
 lib/libmla_processor_web.so
 %%PORTDOCS%%share/doc/modlogan/faq.txt
 %%PORTDOCS%%share/doc/modlogan/glosar
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index e90ef86c2291..ed40dab281a2 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openjade
 PORTVERSION=	1.3.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,8 +18,8 @@ COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 LIB_DEPENDS=	osp.3:${PORTSDIR}/textproc/opensp
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-USE_GMAKE=	YES
-USE_AUTOTOOLS=	libtool:13:inc
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${PREFIX}/share/sgml/openjade
diff --git a/textproc/openjade/pkg-plist b/textproc/openjade/pkg-plist
index eed25e906f57..66a8c72e93bd 100644
--- a/textproc/openjade/pkg-plist
+++ b/textproc/openjade/pkg-plist
@@ -1,12 +1,15 @@
 @comment $FreeBSD$
 bin/openjade
 lib/libogrove.a
+lib/libogrove.la
 lib/libogrove.so
 lib/libogrove.so.0
 lib/libospgrove.a
+lib/libospgrove.la
 lib/libospgrove.so
 lib/libospgrove.so.0
 lib/libostyle.a
+lib/libostyle.la
 lib/libostyle.so
 lib/libostyle.so.0
 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove openjade/catalog
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 291310daf58b..f206835daeb5 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	OpenSP
 PORTVERSION=	1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openjade
@@ -19,7 +19,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	YES
 USE_ICONV=	yes
 USE_REINPLACE=	YES
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${PREFIX}/share/sgml/openjade
diff --git a/textproc/opensp/pkg-plist b/textproc/opensp/pkg-plist
index 220181371a4c..ef4f7538fc0b 100644
--- a/textproc/opensp/pkg-plist
+++ b/textproc/opensp/pkg-plist
@@ -143,6 +143,7 @@ include/OpenSP/types.h
 include/OpenSP/xnew.h
 lib/charset.alias
 lib/libosp.a
+lib/libosp.la
 lib/libosp.so
 lib/libosp.so.3
 %%PORTDOCS%%%%DOCSDIR%%/archform.htm
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index c7b61fea437e..c54543a887fa 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openvanilla-modules
 PORTVERSION=	0.7.1.20050902
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.csie.org/~llwang/	\
 		http://www.infor.org/~llwang/
diff --git a/textproc/openvanilla-modules/pkg-plist b/textproc/openvanilla-modules/pkg-plist
index 0d21968b5b34..8d59bf4e57a0 100644
--- a/textproc/openvanilla-modules/pkg-plist
+++ b/textproc/openvanilla-modules/pkg-plist
@@ -1,17 +1,33 @@
+%%OVIMArray%%lib/openvanilla/OVIMArray.a
+%%OVIMArray%%lib/openvanilla/OVIMArray.la
 %%OVIMArray%%lib/openvanilla/OVIMArray.so
 %%OVIMArray%%lib/openvanilla/OVIMArray/ArrayShortCode.cin
 %%OVIMArray%%lib/openvanilla/OVIMArray/ArraySpecial.cin
 %%OVIMArray%%lib/openvanilla/OVIMArray/array30.cin
+%%OVIMBig5%%lib/openvanilla/OVIMBig5.a
+%%OVIMBig5%%lib/openvanilla/OVIMBig5.la
 %%OVIMBig5%%lib/openvanilla/OVIMBig5.so
+%%OVIMGeneric%%lib/openvanilla/OVIMGeneric.a
+%%OVIMGeneric%%lib/openvanilla/OVIMGeneric.la
 %%OVIMGeneric%%lib/openvanilla/OVIMGeneric.so
 %%OVIMGeneric%%lib/openvanilla/OVIMGeneric/cj.cin
 %%OVIMGeneric%%lib/openvanilla/OVIMGeneric/ehq.cin
 %%OVIMGeneric%%lib/openvanilla/OVIMGeneric/iroha.cin
+%%OVIMPOJ_Holo%%lib/openvanilla/OVIMPOJ-Holo.a
+%%OVIMPOJ_Holo%%lib/openvanilla/OVIMPOJ-Holo.la
 %%OVIMPOJ_Holo%%lib/openvanilla/OVIMPOJ-Holo.so
 %%OVIMPOJ_Holo%%lib/openvanilla/OVIMPOJ-Holo/poj-holo.cin
+%%OVIMPhonetic%%lib/openvanilla/OVIMPhonetic.a
+%%OVIMPhonetic%%lib/openvanilla/OVIMPhonetic.la
 %%OVIMPhonetic%%lib/openvanilla/OVIMPhonetic.so
+%%OVIMRoman%%lib/openvanilla/OVIMRoman.a
+%%OVIMRoman%%lib/openvanilla/OVIMRoman.la
 %%OVIMRoman%%lib/openvanilla/OVIMRoman.so
+%%OVIMTibetan%%lib/openvanilla/OVIMTibetan.a
+%%OVIMTibetan%%lib/openvanilla/OVIMTibetan.la
 %%OVIMTibetan%%lib/openvanilla/OVIMTibetan.so
+%%OVIMUnicode%%lib/openvanilla/OVIMUnicode.a
+%%OVIMUnicode%%lib/openvanilla/OVIMUnicode.la
 %%OVIMUnicode%%lib/openvanilla/OVIMUnicode.so
 %%OVIMUnicode%%@dirrmtry lib/openvanilla/OVIMUnicode
 %%OVIMTibetan%%@dirrmtry lib/openvanilla/OVIMTibetan
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 3079c2436e12..c26a3f27854d 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/textproc/py-libxml2/pkg-plist b/textproc/py-libxml2/pkg-plist
index ad919ebc2a8f..dac231b26e5e 100644
--- a/textproc/py-libxml2/pkg-plist
+++ b/textproc/py-libxml2/pkg-plist
@@ -4,6 +4,8 @@ lib/%%PYTHON_VERSION%%/site-packages/drv_libxml2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/libxml2.py
 lib/%%PYTHON_VERSION%%/site-packages/libxml2.pyc
 lib/%%PYTHON_VERSION%%/site-packages/libxml2.pyo
+lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.a
+lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.la
 lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.so
 %%DOCSDIR%%/TODO
 %%EXAMPLESDIR%%/attribs.py
diff --git a/textproc/py-libxslt/pkg-plist b/textproc/py-libxslt/pkg-plist
index 5cd5bd5d2b99..56204b64bb17 100644
--- a/textproc/py-libxslt/pkg-plist
+++ b/textproc/py-libxslt/pkg-plist
@@ -1,6 +1,8 @@
 lib/%%PYTHON_VERSION%%/site-packages/libxslt.py
 lib/%%PYTHON_VERSION%%/site-packages/libxslt.pyc
 lib/%%PYTHON_VERSION%%/site-packages/libxslt.pyo
+lib/%%PYTHON_VERSION%%/site-packages/libxsltmod.a
+lib/%%PYTHON_VERSION%%/site-packages/libxsltmod.la
 lib/%%PYTHON_VERSION%%/site-packages/libxsltmod.so
 %%DOCSDIR%%/TODO
 %%EXAMPLESDIR%%/basic.py
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 7f8e58dec7d3..4fbc4c77d074 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	raptor
 PORTVERSION=	1.4.8
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://librdf.org/dist/source/
@@ -20,7 +21,7 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gnomehack gnometarget libxml2
 USE_GETOPT_LONG=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-pkg-config=${LOCALBASE}/bin/pkg-config \
diff --git a/textproc/raptor/pkg-plist b/textproc/raptor/pkg-plist
index d90aac3589f6..10e484e9bf1d 100644
--- a/textproc/raptor/pkg-plist
+++ b/textproc/raptor/pkg-plist
@@ -2,6 +2,7 @@ bin/rapper
 bin/raptor-config
 include/raptor.h
 lib/libraptor.a
+lib/libraptor.la
 lib/libraptor.so
 lib/libraptor.so.2
 libdata/pkgconfig/raptor.pc
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 7f8e58dec7d3..4fbc4c77d074 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	raptor
 PORTVERSION=	1.4.8
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://librdf.org/dist/source/
@@ -20,7 +21,7 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gnomehack gnometarget libxml2
 USE_GETOPT_LONG=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-pkg-config=${LOCALBASE}/bin/pkg-config \
diff --git a/textproc/raptor2/pkg-plist b/textproc/raptor2/pkg-plist
index d90aac3589f6..10e484e9bf1d 100644
--- a/textproc/raptor2/pkg-plist
+++ b/textproc/raptor2/pkg-plist
@@ -2,6 +2,7 @@ bin/rapper
 bin/raptor-config
 include/raptor.h
 lib/libraptor.a
+lib/libraptor.la
 lib/libraptor.so
 lib/libraptor.so.2
 libdata/pkgconfig/raptor.pc
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 64ea6b1ca6a3..b9673f1c8dba 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -37,11 +37,9 @@ LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
 
 USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_OPENSSL=	yes
-USE_GETOPT_LONG=	yes
+USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15:inc
-LIBTOOLFLAGS=	--enable-ltlibs
-LIBTOOLFILES=	configure rasqal/configure
+GNU_CONFIGURE=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include/db${WITH_BDB_VER} -I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 64ea6b1ca6a3..b9673f1c8dba 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -37,11 +37,9 @@ LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
 
 USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_OPENSSL=	yes
-USE_GETOPT_LONG=	yes
+USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15:inc
-LIBTOOLFLAGS=	--enable-ltlibs
-LIBTOOLFILES=	configure rasqal/configure
+GNU_CONFIGURE=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include/db${WITH_BDB_VER} -I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 2a3611d286ab..1d1454c5c4d2 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Sablot
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://download-1.gingerall.cz/download/sablot/
 
@@ -31,7 +32,7 @@ CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes
 
 MAN1=	sabcmd.1
diff --git a/textproc/sablotron/pkg-plist b/textproc/sablotron/pkg-plist
index 693743748223..2ba2169b38c2 100644
--- a/textproc/sablotron/pkg-plist
+++ b/textproc/sablotron/pkg-plist
@@ -7,6 +7,7 @@ include/sdom.h
 include/shandler.h
 include/sxpath.h
 lib/libsablot.a
+lib/libsablot.la
 lib/libsablot.so
 lib/libsablot.so.%%SHLIB_MAJOR%%
 %%PORTDOCS%%%%DOCSDIR%%/DEBUGGER
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 95428d02c0e0..fff0c642e2cb 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -17,7 +17,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index e4d94b8c905a..769e3571e707 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sary
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://sary.sourceforge.net/
 
@@ -15,7 +16,7 @@ COMMENT=	A suffix array library and tools, which provide fast full-text search
 
 USE_GNOME=	glib20 gnomehack gnometarget
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN1=		sary.1	mksary.1
diff --git a/textproc/sary/pkg-plist b/textproc/sary/pkg-plist
index 648ec8584bca..a2fe9a818fe3 100644
--- a/textproc/sary/pkg-plist
+++ b/textproc/sary/pkg-plist
@@ -18,6 +18,7 @@ include/sary/str.h
 include/sary/text.h
 include/sary/writer.h
 lib/libsary.a
+lib/libsary.la
 lib/libsary.so
 lib/libsary.so.10
 libdata/pkgconfig/sary.pc
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index c3cdd99c1193..2555c0388231 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-input-pad
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -21,7 +22,7 @@ USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intlhack
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 
diff --git a/textproc/scim-input-pad/pkg-plist b/textproc/scim-input-pad/pkg-plist
index e7ccb60d9d61..8c9a1b35fefe 100644
--- a/textproc/scim-input-pad/pkg-plist
+++ b/textproc/scim-input-pad/pkg-plist
@@ -1,6 +1,9 @@
 bin/scim-input-pad
+lib/scim-1.0/Helper/input-pad.a
+lib/scim-1.0/Helper/input-pad.la
 lib/scim-1.0/Helper/input-pad.so
 lib/libscim-input-pad.a
+lib/libscim-input-pad.la
 lib/libscim-input-pad.so
 lib/libscim-input-pad.so.0
 share/locale/de/LC_MESSAGES/scim-input-pad.mo
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 39c3642213eb..26d7b303f1f3 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-table-imengine
 PORTVERSION=	0.5.6
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -21,7 +22,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	intlhack
 
 MAN1=		scim-make-table.1
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index 3032fa3be5a4..af08215854a2 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -1,5 +1,9 @@
 bin/scim-make-table
+lib/scim-1.0/IMEngine/table.a
+lib/scim-1.0/IMEngine/table.la
 lib/scim-1.0/IMEngine/table.so
+lib/scim-1.0/SetupUI/table-imengine-setup.a
+lib/scim-1.0/SetupUI/table-imengine-setup.la
 lib/scim-1.0/SetupUI/table-imengine-setup.so
 share/scim/icons/table.png
 share/locale/zh_CN/LC_MESSAGES/scim-tables.mo
@@ -11,6 +15,7 @@ share/locale/fr/LC_MESSAGES/scim-tables.mo
 share/locale/it/LC_MESSAGES/scim-tables.mo
 share/locale/pa/LC_MESSAGES/scim-tables.mo
 %%SKIM%%@cwd %%LOCALBASE%%
+%%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.a
 %%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.la
 %%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.so
 %%SKIM%%share/services/skimconfiguredialog/skimplugin_scim_table_config.desktop
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 9fb1c22139f4..18ddbfad11b6 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -21,7 +22,7 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index c843bf6eeecc..dd22c48a4531 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -47,26 +47,53 @@ include/scim-1.0/scim_transaction.h
 include/scim-1.0/scim_types.h
 include/scim-1.0/scim_utility.h
 include/scim-1.0/x11/scim_x11_utils.h
+lib/gtk-2.0/immodules/im-scim.a
+lib/gtk-2.0/immodules/im-scim.la
 lib/gtk-2.0/immodules/im-scim.so
 lib/libscim-1.0.a
+lib/libscim-1.0.la
 lib/libscim-1.0.so
 lib/libscim-1.0.so.9
 lib/libscim-gtkutils-1.0.a
+lib/libscim-gtkutils-1.0.la
 lib/libscim-gtkutils-1.0.so
 lib/libscim-gtkutils-1.0.so.9
 lib/libscim-x11utils-1.0.a
+lib/libscim-x11utils-1.0.la
 lib/libscim-x11utils-1.0.so
 lib/libscim-x11utils-1.0.so.9
+lib/scim-1.0/1.4.0/Config/simple.a
+lib/scim-1.0/1.4.0/Config/simple.la
 lib/scim-1.0/1.4.0/Config/simple.so
+lib/scim-1.0/1.4.0/Config/socket.a
+lib/scim-1.0/1.4.0/Config/socket.la
 lib/scim-1.0/1.4.0/Config/socket.so
+lib/scim-1.0/1.4.0/Filter/sctc.a
+lib/scim-1.0/1.4.0/Filter/sctc.la
 lib/scim-1.0/1.4.0/Filter/sctc.so
+lib/scim-1.0/1.4.0/FrontEnd/socket.a
+lib/scim-1.0/1.4.0/FrontEnd/socket.la
 lib/scim-1.0/1.4.0/FrontEnd/socket.so
+lib/scim-1.0/1.4.0/FrontEnd/x11.a
+lib/scim-1.0/1.4.0/FrontEnd/x11.la
 lib/scim-1.0/1.4.0/FrontEnd/x11.so
+lib/scim-1.0/1.4.0/Helper/setup.a
+lib/scim-1.0/1.4.0/Helper/setup.la
 lib/scim-1.0/1.4.0/Helper/setup.so
+lib/scim-1.0/1.4.0/IMEngine/rawcode.a
+lib/scim-1.0/1.4.0/IMEngine/rawcode.la
 lib/scim-1.0/1.4.0/IMEngine/rawcode.so
+lib/scim-1.0/1.4.0/IMEngine/socket.a
+lib/scim-1.0/1.4.0/IMEngine/socket.la
 lib/scim-1.0/1.4.0/IMEngine/socket.so
+lib/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.a
+lib/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.la
 lib/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.so
+lib/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.a
+lib/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.la
 lib/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.so
+lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.a
+lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.la
 lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.so
 lib/scim-1.0/scim-helper-launcher
 lib/scim-1.0/scim-helper-manager
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index eef73afe081c..6171121f2af4 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -35,7 +35,7 @@ DOCBOOK_VERSION=	4.1.2
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt intlhack
diff --git a/textproc/scrollkeeper/pkg-plist b/textproc/scrollkeeper/pkg-plist
index 2d4363da7dae..49289b7ded61 100644
--- a/textproc/scrollkeeper/pkg-plist
+++ b/textproc/scrollkeeper/pkg-plist
@@ -14,6 +14,7 @@ bin/scrollkeeper-uninstall
 bin/scrollkeeper-update
 etc/scrollkeeper.conf
 lib/libscrollkeeper.a
+lib/libscrollkeeper.la
 lib/libscrollkeeper.so
 lib/libscrollkeeper.so.0
 share/gnome/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index f44157528255..b1cf81e10e72 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	senna
 PORTVERSION=	0.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://dist.bsdlab.org/ \
 		http://dev.razil.jp/archive/senna/
diff --git a/textproc/senna/pkg-plist b/textproc/senna/pkg-plist
index 2b4c4669af67..dbecb2a6192a 100644
--- a/textproc/senna/pkg-plist
+++ b/textproc/senna/pkg-plist
@@ -1,6 +1,7 @@
 bin/senna-cfg
 include/senna/senna.h
 lib/libsenna.a
+lib/libsenna.la
 lib/libsenna.so
 lib/libsenna.so.0
 @dirrm include/senna
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index 0037c2e834da..92e68a09f7ab 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15:inc
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 788e2c4967bc..11d40a6f1629 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uim
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://uim.freedesktop.org/releases/
 
@@ -20,7 +21,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index 9a1025058df9..04ddf38895f2 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -24,19 +24,37 @@ include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
 %%GNOME%%libdata/bonobo/servers/GNOME_UimApplet.server
+%%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.a
+%%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.la
 %%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.so
 lib/libuim-custom.a
+lib/libuim-custom.la
 lib/libuim-custom.so
 lib/libuim-custom.so.1
 lib/libuim.a
+lib/libuim.la
 lib/libuim.so
 lib/libuim.so.1
+%%ANTHY%%lib/uim/plugin/libuim-anthy.a
+%%ANTHY%%lib/uim/plugin/libuim-anthy.la
 %%ANTHY%%lib/uim/plugin/libuim-anthy.so
+%%CANNA%%lib/uim/plugin/libuim-canna.a
+%%CANNA%%lib/uim/plugin/libuim-canna.la
 %%CANNA%%lib/uim/plugin/libuim-canna.so
+lib/uim/plugin/libuim-custom-enabler.a
+lib/uim/plugin/libuim-custom-enabler.la
 lib/uim/plugin/libuim-custom-enabler.so
+%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.a
+%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.la
 %%M17NLIB%%lib/uim/plugin/libuim-m17nlib.so
+%%PRIME%%lib/uim/plugin/libuim-prime.a
+%%PRIME%%lib/uim/plugin/libuim-prime.la
 %%PRIME%%lib/uim/plugin/libuim-prime.so
+%%SCIM%%lib/uim/plugin/libuim-scim.a
+%%SCIM%%lib/uim/plugin/libuim-scim.la
 %%SCIM%%lib/uim/plugin/libuim-scim.so
+lib/uim/plugin/libuim-skk.a
+lib/uim/plugin/libuim-skk.la
 lib/uim/plugin/libuim-skk.so
 libdata/pkgconfig/uim.pc
 %%GTK%%libexec/uim-candwin-gtk
diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile
index 02c3ef45edf3..263bd5fa15e8 100644
--- a/textproc/uni2ascii/Makefile
+++ b/textproc/uni2ascii/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert between UTF-8 Unicode and 7-bit ASCII equivalents
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 MAN1=		uni2ascii.1 ascii2uni.1
diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile
index fb686ceb0f8d..1a5cee597408 100644
--- a/textproc/wbxml2/Makefile
+++ b/textproc/wbxml2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wbxml2
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://czauner.onlineloop.com/pub/FreeBSD/distfiles/
diff --git a/textproc/wbxml2/pkg-plist b/textproc/wbxml2/pkg-plist
index 69a99763461a..329933c3616b 100644
--- a/textproc/wbxml2/pkg-plist
+++ b/textproc/wbxml2/pkg-plist
@@ -17,6 +17,7 @@ include/wbxml_tree.h
 include/wbxml_tree_clb_wbxml.h
 include/wbxml_tree_clb_xml.h
 lib/libwbxml2.a
+lib/libwbxml2.la
 lib/libwbxml2.so
 lib/libwbxml2.so.0
 share/doc/wbxml2-0.9.0/AUTHORS
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 5ca9b7927684..8d7d2868e920 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wv
 PORTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
@@ -25,7 +25,7 @@ RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx-ssl
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gnometarget pkgconfig glib20
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-exporter \
 		--with-glib=glib2 \
diff --git a/textproc/wv/pkg-plist b/textproc/wv/pkg-plist
index 5ef409032537..781ece2b66e7 100644
--- a/textproc/wv/pkg-plist
+++ b/textproc/wv/pkg-plist
@@ -18,10 +18,10 @@ include/wv/libole2/ms-ole-summary.h
 include/wv/libole2/ms-ole.h
 include/wv/wv.h
 include/wv/wvexporter.h
-lib/libwv.a
-lib/libwv.so
 lib/libwv-1.0.so
 lib/libwv-1.0.so.0
+lib/libwv.la
+lib/libwv.so
 libdata/pkgconfig/wv-1.0.pc
 share/wv/patterns/100.gif
 share/wv/patterns/101.gif
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index d0737313bf3b..649877ce49f1 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 CONFIGURE_ARGS=	--with-libiconv=${LOCALBASE} --disable-debug
 
 USE_GNOME=	gnometarget libgsf
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index 5997cb9b281d..ffd56e342b4c 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xls2xml
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://arturo.directmail.org/filters/archive/
@@ -18,7 +19,7 @@ COMMENT=	A utility for converting MS Excel files to XML
 LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/xls2xml/pkg-plist b/textproc/xls2xml/pkg-plist
index 2fff33147538..d9b1d0c5235e 100644
--- a/textproc/xls2xml/pkg-plist
+++ b/textproc/xls2xml/pkg-plist
@@ -5,6 +5,7 @@ include/xls2xml/param.h
 include/xls2xml/xls2xml.h
 include/xls2xml/xmldoc.h
 lib/libxls2xml.a
+lib/libxls2xml.la
 lib/libxls2xml.so
 lib/libxls2xml.so.1
 @dirrm include/xls2xml
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index 2411dc8c9e41..6ed1bbd60cb7 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Xml internationalization support for GNOME, and others
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 
 CONFLICTS=	intltool-*
 
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index ae0a18590748..524a917f995f 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xmlpp
 PORTVERSION=	0.7a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://0xff.at/download/gpl/
 
@@ -18,7 +18,7 @@ COMMENT=	XML Parser and Validator
 USE_REINPLACE=	yes
 FETCH_CMD=	/usr/bin/fetch
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/textproc/xmlpp/pkg-plist b/textproc/xmlpp/pkg-plist
index b7f7fc4edf74..1fc6b23d8919 100644
--- a/textproc/xmlpp/pkg-plist
+++ b/textproc/xmlpp/pkg-plist
@@ -5,6 +5,7 @@ include/xmlparser.h
 include/xmlpp.h
 include/xmltokenizer.h
 lib/libxmlpp.a
+lib/libxmlpp.la
 lib/libxmlpp.so
 lib/libxmlpp.so.0
 share/aclocal/libxmlpp.m4
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 112c5d082e0c..f87c811bb120 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmlroff
 PORTVERSION=	0.3.8
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget libgnomeprint libxslt
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist
index 95cd35d9367a..d29c1ab41e2d 100644
--- a/textproc/xmlroff/pkg-plist
+++ b/textproc/xmlroff/pkg-plist
@@ -31,6 +31,7 @@ include/libfo-0.3/util/fo-hash-table.h
 include/libfo-0.3/util/fo-image.h
 include/libfo-0.3/util/fo-pixbuf.h
 lib/libfo-0.3.a
+lib/libfo-0.3.la
 lib/libfo-0.3.so
 lib/libfo-0.3.so.306
 libdata/pkgconfig/libfo-0.3.pc
author	Ade Lovett <ade@FreeBSD.org>	2006-02-23 10:40:44 +0000
committer	Ade Lovett <ade@FreeBSD.org>	2006-02-23 10:40:44 +0000
commit	8503536d3896846d823f7f76be54e0a99da8d8b6 (patch)
tree	1a89e4038216ead71b008f2a5091474964e1c341 /textproc
parent	Unbreak: make it fetchable again (diff)