diff options
| author | tijl <tijl@FreeBSD.org> | 2018-06-14 20:47:58 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2018-06-14 20:47:58 +0800 |
| commit | 118df57fa4a8439a5b0ddd13a6c2d843bdb5f853 (patch) | |
| tree | 887d2ee07449ef7ef155da1e40fc852d2d19c539 /emulators | |
| parent | 37fc2f23670f59cd2f0e4c67e6d99449e0a5a9f2 (diff) | |
| download | freebsd-ports-gnome-118df57fa4a8439a5b0ddd13a6c2d843bdb5f853.tar.gz freebsd-ports-gnome-118df57fa4a8439a5b0ddd13a6c2d843bdb5f853.tar.zst freebsd-ports-gnome-118df57fa4a8439a5b0ddd13a6c2d843bdb5f853.zip | |
Update automake to 1.16.1. Also remove automake-wrapper. We haven't had
multiple versions of automake in years and probably won't in the future.
PR: 228809
Exp-run by: antoine
Approved by: portmgr (antoine)
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/tme/Makefile | 1 | ||||
| -rw-r--r-- | emulators/tme/files/patch-configure.in | 24 |
2 files changed, 17 insertions, 8 deletions
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index 8d06a8e1a64b..d1c5d3d46432 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -20,6 +20,7 @@ USE_GNOME= gdkpixbuf2 gtk20 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static --disable-warnings +CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL} MAKE_JOBS_UNSAFE=yes INSTALL_TARGET= install-strip diff --git a/emulators/tme/files/patch-configure.in b/emulators/tme/files/patch-configure.in index c30979246962..de5ba13bc7a0 100644 --- a/emulators/tme/files/patch-configure.in +++ b/emulators/tme/files/patch-configure.in @@ -1,6 +1,14 @@ ---- configure.in.orig +--- configure.in.orig 2010-06-05 19:56:37 UTC +++ configure.in -@@ -599,18 +599,16 @@ +@@ -33,6 +33,7 @@ dnl POSSIBILITY OF SUCH DAMAGE. + + dnl Checks that we are given a good source directory. + AC_INIT(ic/m68k/m68k-impl.h) ++AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_SYSTEM + AM_INIT_AUTOMAKE(tme, 0.8) + +@@ -599,18 +600,14 @@ i[3456789]86-* | x86_64-*) misc_hosts="x86" ;; esac changequote([, ])dnl AC_MSG_RESULT([${misc_hosts}]) @@ -11,19 +19,19 @@ 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_SUBST(INCLTDL) +-AC_SUBST(LIBLTDL) -AC_LIBTOOL_DLOPEN -AM_PROG_LIBTOOL -AC_SUBST(LTLIBOBJS) -AC_CONFIG_SUBDIRS(libltdl) ++LT_CONFIG_LTDL_DIR([libltdl]) ++LT_INIT([dlopen]) ++LTDL_INIT TME_PREOPEN= if test $enable_shared = no; then TME_PREOPEN='`sort -u $(top_builddir)/tme-preopen.txt`' -@@ -683,11 +681,8 @@ +@@ -683,11 +680,8 @@ if test "x$gen_tmeconfig_h" = xyes; then #define _TMECONFIG_H TMEEOF |