From a13ddd03b739f613a6ba2fd21811c0bbfce34651 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 2 Jul 2014 22:18:20 +0000
Subject: [PATCH] - Use new LIB_DEPENDS syntax - Switch to USES=libtool, drop
 .la files - Convert USE_BZIP2 to USES

---
 lang/elk/Makefile  | 10 +++++-----
 lang/elk/pkg-plist | 19 +++----------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 7335d7c36767..fb4c96aeadd9 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -3,18 +3,18 @@
 
 PORTNAME=	elk
 PORTVERSION=	3.99.8
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://sam.zoy.org/elk/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embeddable Scheme interpreter
 
-LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm \
-		elf.0:${PORTSDIR}/devel/libelf
+LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libelf.so:${PORTSDIR}/devel/libelf
 
-USES=		motif
-USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool
+USES=		libtool motif tar:bzip2
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/lang/elk/pkg-plist b/lang/elk/pkg-plist
index 3a07ec953463..7af440b72fd7 100644
--- a/lang/elk/pkg-plist
+++ b/lang/elk/pkg-plist
@@ -19,56 +19,43 @@ 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-xlib.so.0.0.0
 lib/libelk-xt.a
-lib/libelk-xt.la
 lib/libelk-xt.so
 lib/libelk-xt.so.0
+lib/libelk-xt.so.0.0.0
 lib/libelk.a
-lib/libelk.la
 lib/libelk.so
 lib/libelk.so.0
+lib/libelk.so.0.0.0
 %%DATADIR%%/apropos.scm
 %%DATADIR%%/bitstring.scm
 %%DATADIR%%/cscheme.scm