Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 31 insertions, 3 deletions

diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 98bf309a115b..ea74d7ef9f75 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elk
 PORTVERSION=	3.99.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://sam.zoy.org/elk/
 
@@ -19,8 +19,7 @@ LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 
 USE_BZIP2=	yes
 USE_MOTIF=	yes
-USE_AUTOTOOLS=	libtool:15
-LIBTOOLFLAGS=	# none
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/lang/elk/pkg-plist b/lang/elk/pkg-plist
index 46a8899e998c..103f201c595a 100644
--- a/lang/elk/pkg-plist
+++ b/lang/elk/pkg-plist
@@ -18,26 +18,55 @@ include/elk/scheme.h
 include/elk/site.h
 include/elk/stkmem.h
 include/elk/type.h
+lib/elk/bitstring.a
+lib/elk/bitstring.la
 lib/elk/bitstring.so
+lib/elk/debug.a
+lib/elk/debug.la
 lib/elk/debug.so
+lib/elk/elk-eval.a
+lib/elk/elk-eval.la
 lib/elk/elk-eval.so
+lib/elk/gdbm.a
+lib/elk/gdbm.la
 lib/elk/gdbm.so
+lib/elk/hack.a
+lib/elk/hack.la
 lib/elk/hack.so
+lib/elk/motif.a
+lib/elk/motif.la
 lib/elk/motif.so
+lib/elk/newhandler.a
+lib/elk/newhandler.la
 lib/elk/newhandler.so
+lib/elk/record.a
+lib/elk/record.la
 lib/elk/record.so
+lib/elk/regexp.a
+lib/elk/regexp.la
 lib/elk/regexp.so
+lib/elk/struct.a
+lib/elk/struct.la
 lib/elk/struct.so
+lib/elk/unix.a
+lib/elk/unix.la
 lib/elk/unix.so
+lib/elk/xaw.a
+lib/elk/xaw.la
 lib/elk/xaw.so
+lib/elk/xlib.a
+lib/elk/xlib.la
 lib/elk/xlib.so
 lib/libelk-xlib.a
+lib/libelk-xlib.la
 lib/libelk-xlib.so
 lib/libelk-xlib.so.0
 lib/libelk-xt.a
+lib/libelk-xt.la
 lib/libelk-xt.so
 lib/libelk-xt.so.0
 lib/libelk.a
+lib/libelk.la
 lib/libelk.so
 lib/libelk.so.0
 share/elk/apropos.scm