Index: head/emulators/tme/Makefile
===================================================================
--- head/emulators/tme/Makefile	(revision 369937)
+++ head/emulators/tme/Makefile	(revision 369938)
@@ -1,45 +1,46 @@
 # Created by: trasz <trasz@pin.if.uz.zgora.pl>
 # $FreeBSD$
 
 PORTNAME=	tme
 PORTVERSION=	0.8
 PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	http://people.csail.mit.edu/fredette/tme/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emulator for Sun 2/120, 3/150, and SPARCstation 2 machines
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		compiler gettext gmake iconv libtool perl5 pkgconfig
-USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
-AUTOMAKE_ARGS=	-a -c -f
+USES=		autoreconf compiler gettext gmake iconv libtool perl5 pkgconfig
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --disable-warnings
 MAKE_ENV=	LANG=C
 MAKE_JOBS_UNSAFE=yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
 CFLAGS+=	-fbracket-depth=1024
 .endif
 
 post-patch:
+	@${RM} -r ${WRKSRC}/libltdl
+	@${REINPLACE_CMD} 's/LTDL_SHLIBPATH_VAR/LT_MODULE_PATH_VAR/' \
+		${WRKSRC}/libtme/Makefile.am ${WRKSRC}/libtme/module.c
 	@${REINPLACE_CMD} -e '/^#ifdef/s|\*/||' \
 		${WRKSRC}/libtme/misc.c
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/libtme/module.c
 
 .include <bsd.port.post.mk>
Index: head/emulators/tme/files/patch-configure.in
===================================================================
--- head/emulators/tme/files/patch-configure.in	(revision 369937)
+++ head/emulators/tme/files/patch-configure.in	(revision 369938)
@@ -1,25 +1,39 @@
 --- configure.in.orig
 +++ configure.in
-@@ -599,7 +599,7 @@
+@@ -599,18 +599,16 @@
  esac
  changequote([, ])dnl
  AC_MSG_RESULT([${misc_hosts}])
 -if test "x${misc_hosts}" = no; then
 +if test "x${misc_hosts}" = xno; then
      misc_hosts=
  fi
  
-@@ -683,11 +683,8 @@
+ dnl Configure for libtool.
+-AC_LIBLTDL_INSTALLABLE
++LT_CONFIG_LTDL_DIR([libltdl])
++LT_INIT([dlopen])
++LTDL_INIT([installable])
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+-AC_LIBTOOL_DLOPEN
+-AM_PROG_LIBTOOL
+-AC_SUBST(LTLIBOBJS)
+-AC_CONFIG_SUBDIRS(libltdl)
+ TME_PREOPEN=
+ if test $enable_shared = no; then
+   TME_PREOPEN='`sort -u $(top_builddir)/tme-preopen.txt`'
+@@ -683,11 +681,8 @@
  #define _TMECONFIG_H
  
  TMEEOF
 -  (for word in HAVE_ TIME_ PROTO_ ALIGNOF_ SIZEOF_ WORDS_BIGENDIAN; do \
 -    grep $word config.h | sed 's/#define[ 	]\{1,\}/&_TME_/' ; \
 -  done) | sort | uniq >> ${outfile}-tmp
 -  grep FLOAT_FORMAT config.h | \
 -    sed 's/#define[ 	]\{1,\}\([A-Za-z0-9_]\{1,\}\)[ 	]\{1,\}\([A-Za-z0-9_]\{1,\}\)/#define TME_\1 TME_FLOAT_FORMAT_\2/' >> ${outfile}-tmp
 +  sed -e '/FLOAT_FORMAT/ s/#[[:space:]]*define[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\)[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\)/#define TME_\1 TME_FLOAT_FORMAT_\2/' \
 +      -e '/FLOAT_FORMAT/!s/#[[:space:]]*define[[:space:]]\{1,\}/&_TME_/' config.h >> ${outfile}-tmp
    echo '#define TME_BUSMAX_LOG2 TME_BUS'${bus_size_max}'_LOG2' >> ${outfile}-tmp
    echo '#define TME_HAVE_RECODE (' \
      `if test "x${recode_hosts}" = x; then echo 0; else echo 1; fi` ')' >> ${outfile}-tmp