Update to 3.99.7

PR:		99045
Submitted by:	Ports fury

4 files changed, 11 insertions, 40 deletions

diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index ea74d7ef9f75..1a10f6d798ed 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	elk
-PORTVERSION=	3.99.6
-PORTREVISION=	3
+PORTVERSION=	3.99.7
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://sam.zoy.org/elk/
 
@@ -19,15 +18,16 @@ LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 
 USE_BZIP2=	yes
 USE_MOTIF=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
 MAN1=		elk.1
 
-CPPFLAGS=	-I${LOCALBASE}/include/libelf -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include/libelf -I${LOCALBASE}/include \
+		-I${X11BASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
 .include <bsd.port.pre.mk>
 
@@ -35,6 +35,9 @@ LDFLAGS=	-L${LOCALBASE}/lib
 CFLAGS=		-O0
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc examples||g' ${WRKSRC}/Makefile.in
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/elk.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
diff --git a/lang/elk/distinfo b/lang/elk/distinfo
index 4aad5f5b23ff..a5feae844918 100644
--- a/lang/elk/distinfo
+++ b/lang/elk/distinfo
@@ -1,3 +1,3 @@
-MD5 (elk-3.99.6.tar.bz2) = d5ba4f56796a3c3798164131ae7b0e10
-SHA256 (elk-3.99.6.tar.bz2) = 3aad8e5e6c0ec2207cdc3060557752c1820467f590825d2c20954d2658e2d96d
-SIZE (elk-3.99.6.tar.bz2) = 643615
+MD5 (elk-3.99.7.tar.bz2) = 6711247691266f36742bd3db9311dc4a
+SHA256 (elk-3.99.7.tar.bz2) = a72b66b219313af23f5923a476c8b332e0124c953fd172bb62d5f9554d3cbc4c
+SIZE (elk-3.99.7.tar.bz2) = 646698
diff --git a/lang/elk/files/patch-Makefile.in b/lang/elk/files/patch-Makefile.in
deleted file mode 100644
index 66d388f947a6..000000000000
--- a/lang/elk/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Sep 13 15:34:23 2003
-+++ Makefile.in	Sun Sep 14 05:02:54 2003
-@@ -167,7 +167,7 @@
- target_vendor = @target_vendor@
- NULL = 
- 
--SUBDIRS = include src lib scm doc examples
-+SUBDIRS = include src lib scm
- DIST_SUBDIRS = $(SUBDIRS) autotools debian
- 
- EXTRA_DIST = \
diff --git a/lang/elk/files/patch-configure b/lang/elk/files/patch-configure
deleted file mode 100644
index b17af32f72ba..000000000000
--- a/lang/elk/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Fri Dec  5 21:51:16 2003
-+++ configure	Sat Dec  6 12:56:19 2003
-@@ -19318,6 +19318,7 @@
- 
- # 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'
-@@ -25330,8 +25331,8 @@
- # The directory where all files are installed by running "make install". We
- # cannot use AC_DEFINE_UNQUOTED here because ${prefix} is not set until the
- # end of the configure script. Thanks to Phillip Rulon for spotting that.
--CPPFLAGS="${CPPFLAGS} -DSCM_DIR=\\\"\$(prefix)/share/elk\\\""
--CPPFLAGS="${CPPFLAGS} -DLIB_DIR=\\\"\$(prefix)/lib/elk\\\""
-+CPPFLAGS="${CPPFLAGS} -DSCM_DIR=\"\\\"\$(prefix)/share/elk\\\"\""
-+CPPFLAGS="${CPPFLAGS} -DLIB_DIR=\"\\\"\$(prefix)/lib/elk\\\"\""
- 
- #define FIND_AOUT defined(USE_LD) || defined(CAN_DUMP) || defined(INIT_OBJECTS)
-