9 files changed, 38 insertions, 10 deletions

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 335b1d6691cc..a705025263ce 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	brlcad
 PORTVERSION=	7.6.6
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	brlcad
@@ -23,7 +24,7 @@ USE_GL=		yes
 USE_GMAKE=	yes
 
 PREFIX?=	${LOCALBASE}/${PORTNAME}
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 NO_MTREE=	yes
 INSTALLS_SHLIB=	yes	# Not really useful, but pet portlint
diff --git a/cad/brlcad/pkg-plist b/cad/brlcad/pkg-plist
index 4aa6ca9e8ccf..6d957a1f2ec4 100644
--- a/cad/brlcad/pkg-plist
+++ b/cad/brlcad/pkg-plist
@@ -562,84 +562,111 @@ lib/iwidgets4.0.1/scripts/toolbar.itk
 lib/iwidgets4.0.1/scripts/unknownimage.gif
 lib/iwidgets4.0.1/scripts/watch.itk
 lib/libbn.a
+lib/libbn.la
 lib/libbn.so
 lib/libbn.so.19
 lib/libbu.a
+lib/libbu.la
 lib/libbu.so
 lib/libbu.so.19
 lib/libcursor.a
+lib/libcursor.la
 lib/libcursor.so
 lib/libcursor.so.19
 lib/libdm.a
+lib/libdm.la
 lib/libdm.so
 lib/libdm.so.19
 lib/libfb.a
+lib/libfb.la
 lib/libfb.so
 lib/libfb.so.19
 lib/libfft.a
+lib/libfft.la
 lib/libfft.so
 lib/libfft.so.19
 lib/libitcl.a
+lib/libitcl.la
 lib/libitcl.so
 lib/libitcl.so.0
 lib/libitcl3.3.a
+lib/libitcl3.3.la
 lib/libitcl3.3.so
 lib/libitcl3.3.so.0
 lib/libitclstub.a
+lib/libitclstub.la
 lib/libitclstub.so
 lib/libitclstub.so.0
 lib/libitclstub3.3.a
+lib/libitclstub3.3.la
 lib/libitclstub3.3.so
 lib/libitclstub3.3.so.0
 lib/libitk.a
+lib/libitk.la
 lib/libitk.so
 lib/libitk.so.0
 lib/libitk3.3.a
+lib/libitk3.3.la
 lib/libitk3.3.so
 lib/libitk3.3.so.0
 lib/libitkstub.a
+lib/libitkstub.la
 lib/libitkstub.so
 lib/libitkstub.so.0
 lib/libitkstub3.3.a
+lib/libitkstub3.3.la
 lib/libitkstub3.3.so
 lib/libitkstub3.3.so.0
 lib/libmultispectral.a
+lib/libmultispectral.la
 lib/libmultispectral.so
 lib/libmultispectral.so.19
 lib/liboptical.a
+lib/liboptical.la
 lib/liboptical.so
 lib/liboptical.so.19
 lib/liborle.a
+lib/liborle.la
 lib/liborle.so
 lib/liborle.so.19
 lib/libpkg.a
+lib/libpkg.la
 lib/libpkg.so
 lib/libpkg.so.19
 lib/librt.a
+lib/librt.la
 lib/librt.so
 lib/librt.so.19
 lib/libsysv.a
+lib/libsysv.la
 lib/libsysv.so
 lib/libsysv.so.19
 lib/libtclcad.a
+lib/libtclcad.la
 lib/libtclcad.so
 lib/libtclcad.so.19
 lib/libtermio.a
+lib/libtermio.la
 lib/libtermio.so
 lib/libtermio.so.19
 lib/libtk.a
+lib/libtk.la
 lib/libtk.so
 lib/libtk.so.19
 lib/libtk8.4.a
+lib/libtk8.4.la
 lib/libtk8.4.so
 lib/libtk8.4.so.19
 lib/libtkstub.a
+lib/libtkstub.la
 lib/libtkstub.so
 lib/libtkstub.so.0
 lib/libtkstub8.4.a
+lib/libtkstub8.4.la
 lib/libtkstub8.4.so
 lib/libtkstub8.4.so.0
 lib/libwdb.a
+lib/libwdb.la
 lib/libwdb.so
 lib/libwdb.so.19
 lib/tk8.4/bgerror.tcl
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index a77fe3c77655..786eaf9ebe28 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtkwave
 PORTVERSION=	2.0.0.p5
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
@@ -20,7 +21,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${PREFIX}/lib/gtkwave
diff --git a/cad/gtkwave/pkg-plist b/cad/gtkwave/pkg-plist
index 01dea0615195..696b620e7ffa 100644
--- a/cad/gtkwave/pkg-plist
+++ b/cad/gtkwave/pkg-plist
@@ -23,8 +23,8 @@ lib/gtkwave/reader_vcd.a
 lib/gtkwave/reader_vcd.la
 lib/gtkwave/reader_vcd.so
 lib/gtkwave/reader_vcd.so.0
-lib/gtkwave/libformat.la
 lib/gtkwave/libformat.a
+lib/gtkwave/libformat.la
 @dirrm lib/gtkwave
 %%PORTDOCS%%%%DOCSDIR%%/data_format.png
 %%PORTDOCS%%%%DOCSDIR%%/edit_menu.png
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 2c8e56415d42..1a3a2b50d41e 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgeda
 PORTVERSION=	20050313
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -19,7 +19,7 @@ COMMENT=	gEDA tools base utility library
 LIB_DEPENDS=	gdgeda.6:${PORTSDIR}/graphics/libgdgeda \
 		guile.15:${PORTSDIR}/lang/guile
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehack
 INSTALLS_SHLIB=	yes
diff --git a/cad/libgeda/pkg-plist b/cad/libgeda/pkg-plist
index 7041d0626ffe..46d67d88d331 100644
--- a/cad/libgeda/pkg-plist
+++ b/cad/libgeda/pkg-plist
@@ -8,8 +8,9 @@ include/libgeda/struct.h
 include/libgeda/libgeda.h
 include/libgeda/i_vars.h
 include/libgeda/papersizes.h
-lib/libgeda.so.23
-lib/libgeda.so
 lib/libgeda.a
+lib/libgeda.la
+lib/libgeda.so
+lib/libgeda.so.23
 libdata/pkgconfig/libgeda.pc
 @dirrm include/libgeda
diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index 7887f50341b3..84f6f9b47e74 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	amakawa@jp.FreeBSD.org
 COMMENT=	A circuit simulator derived from spice3f5
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS+=	--disable-debug
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 9c39a56ac77d..f08f09368d82 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gtksourceview intlhack libglade2 \
 		libgnomeprintui libgnomeui
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
diff --git a/cad/qmls/Makefile b/cad/qmls/Makefile
index 9fc1d9ca015a..aa37152858a3 100644
--- a/cad/qmls/Makefile
+++ b/cad/qmls/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quine-McCluskey Logic Simplifier
 
 PLIST_FILES=	bin/qmls
-USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>