Date: Wed, 27 Aug 2014 19:12:21 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366341 - in head/emulators/tme: . files Message-ID: <201408271912.s7RJCLKo032196@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Aug 27 19:12:21 2014 New Revision: 366341 URL: http://svnweb.freebsd.org/changeset/ports/366341 QAT: https://qat.redports.org/buildarchive/r366341/ Log: Convert to USES=libtool. Because the bundled libtool is too old to work with devel/libltdl libtoolize and other autotools are needed. Added: head/emulators/tme/files/patch-Makefile.am (contents, props changed) head/emulators/tme/files/patch-configure.in (contents, props changed) Modified: head/emulators/tme/Makefile head/emulators/tme/pkg-plist Modified: head/emulators/tme/Makefile ============================================================================== --- head/emulators/tme/Makefile Wed Aug 27 18:45:17 2014 (r366340) +++ head/emulators/tme/Makefile Wed Aug 27 19:12:21 2014 (r366341) @@ -3,7 +3,7 @@ PORTNAME= tme PORTVERSION= 0.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= http://people.csail.mit.edu/fredette/tme/ @@ -13,18 +13,18 @@ COMMENT= Emulator for Sun 2/120, 3/150, LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler gmake gettext iconv perl5 pkgconfig +USES= compiler gettext gmake iconv libtool perl5 pkgconfig +USE_AUTOTOOLS= libltdl libtoolize aclocal autoconf autoheader automake +AUTOMAKE_ARGS= -a -c -f USE_GNOME= gdkpixbuf2 gtk20 -USE_AUTOTOOLS= libtool libltdl -CONFIGURE_ENV= ac_cv_have_isinff=no -CONFIGURE_ARGS= --disable-warnings USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static --disable-warnings MAKE_ENV= LANG=C MAKE_JOBS_UNSAFE=yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${WRKSRC}/ic/ieee754/.libs -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= EXAMPLES @@ -35,12 +35,6 @@ CFLAGS+= -fbracket-depth=1024 .endif post-patch: - @${REINPLACE_CMD} -e '/misc_hosts/s|= no|= xno|' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|\.\./ieee754|$$(top_builddir)/ic/ieee754|g' \ - ${WRKSRC}/ic/m68k/Makefile.in - @${REINPLACE_CMD} -e 's|\.\./ieee754|$$(top_builddir)/ic/ieee754|g' \ - ${WRKSRC}/ic/sparc/Makefile.in @${REINPLACE_CMD} -e '/^#ifdef/s|\*/||' \ ${WRKSRC}/libtme/misc.c @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ Added: head/emulators/tme/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/tme/files/patch-Makefile.am Wed Aug 27 19:12:21 2014 (r366341) @@ -0,0 +1,12 @@ +--- Makefile.am.orig ++++ Makefile.am +@@ -4,7 +4,8 @@ + AUTOMAKE_OPTIONS = 1.4 gnu + SUBDIRS = tme libltdl libtme generic ic machine host bus serial scsi tmesh tools + EXTRA_DIST = modules dist +-pkglib_DATA = tmeconfig.h ++tmeconfigdir = $(pkglibdir) ++tmeconfig_DATA = tmeconfig.h + + # target to hook into the distribution: + # Added: head/emulators/tme/files/patch-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/tme/files/patch-configure.in Wed Aug 27 19:12:21 2014 (r366341) @@ -0,0 +1,25 @@ +--- configure.in.orig ++++ configure.in +@@ -599,7 +599,7 @@ + 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 @@ + #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 Modified: head/emulators/tme/pkg-plist ============================================================================== --- head/emulators/tme/pkg-plist Wed Aug 27 18:45:17 2014 (r366340) +++ head/emulators/tme/pkg-plist Wed Aug 27 19:12:21 2014 (r366341) @@ -52,143 +52,109 @@ include/tme/threads.h include/tme/tme.h include/tme/tmesh.h include/tme/token.h -lib/libtme-generic.a -lib/libtme-generic.la lib/libtme-generic.so lib/libtme-generic.so.0 -lib/libtme-ieee754.a -lib/libtme-ieee754.la +lib/libtme-generic.so.0.0.0 lib/libtme-ieee754.so lib/libtme-ieee754.so.0 -lib/libtme.a -lib/libtme.la +lib/libtme-ieee754.so.0.0.0 lib/libtme.so lib/libtme.so.0 -lib/libtmesh.a -lib/libtmesh.la +lib/libtme.so.0.0.0 lib/libtmesh.so lib/libtmesh.so.0 -lib/tme/libtme-machine-sun.a -lib/tme/libtme-machine-sun.la +lib/libtmesh.so.0.0.0 lib/tme/libtme-machine-sun.so lib/tme/libtme-machine-sun.so.0 +lib/tme/libtme-machine-sun.so.0.0.0 lib/tme/tme-plugins.txt -lib/tme/tme_bus_multibus.a -lib/tme/tme_bus_multibus.la lib/tme/tme_bus_multibus.so lib/tme/tme_bus_multibus.so.0 -lib/tme/tme_bus_sbus.a -lib/tme/tme_bus_sbus.la +lib/tme/tme_bus_multibus.so.0.0.0 lib/tme/tme_bus_sbus.so lib/tme/tme_bus_sbus.so.0 -lib/tme/tme_generic.a -lib/tme/tme_generic.la +lib/tme/tme_bus_sbus.so.0.0.0 lib/tme/tme_generic.so lib/tme/tme_generic.so.0 -lib/tme/tme_host_bsd.a -lib/tme/tme_host_bsd.la +lib/tme/tme_generic.so.0.0.0 lib/tme/tme_host_bsd.so lib/tme/tme_host_bsd.so.0 -lib/tme/tme_host_gtk.a -lib/tme/tme_host_gtk.la +lib/tme/tme_host_bsd.so.0.0.0 lib/tme/tme_host_gtk.so lib/tme/tme_host_gtk.so.0 -lib/tme/tme_host_posix.a -lib/tme/tme_host_posix.la +lib/tme/tme_host_gtk.so.0.0.0 lib/tme/tme_host_posix.so lib/tme/tme_host_posix.so.0 -lib/tme/tme_ic_ad184x.a -lib/tme/tme_ic_ad184x.la +lib/tme/tme_host_posix.so.0.0.0 lib/tme/tme_ic_ad184x.so lib/tme/tme_ic_ad184x.so.0 -lib/tme/tme_ic_am7930.a -lib/tme/tme_ic_am7930.la +lib/tme/tme_ic_ad184x.so.0.0.0 lib/tme/tme_ic_am7930.so lib/tme/tme_ic_am7930.so.0 -lib/tme/tme_ic_am7990.a -lib/tme/tme_ic_am7990.la +lib/tme/tme_ic_am7930.so.0.0.0 lib/tme/tme_ic_am7990.so lib/tme/tme_ic_am7990.so.0 -lib/tme/tme_ic_am9513.a -lib/tme/tme_ic_am9513.la +lib/tme/tme_ic_am7990.so.0.0.0 lib/tme/tme_ic_am9513.so lib/tme/tme_ic_am9513.so.0 -lib/tme/tme_ic_i825x6.a -lib/tme/tme_ic_i825x6.la +lib/tme/tme_ic_am9513.so.0.0.0 lib/tme/tme_ic_i825x6.so lib/tme/tme_ic_i825x6.so.0 -lib/tme/tme_ic_isil7170.a -lib/tme/tme_ic_isil7170.la +lib/tme/tme_ic_i825x6.so.0.0.0 lib/tme/tme_ic_isil7170.so lib/tme/tme_ic_isil7170.so.0 -lib/tme/tme_ic_lsi64854.a -lib/tme/tme_ic_lsi64854.la +lib/tme/tme_ic_isil7170.so.0.0.0 lib/tme/tme_ic_lsi64854.so lib/tme/tme_ic_lsi64854.so.0 -lib/tme/tme_ic_m68k.a -lib/tme/tme_ic_m68k.la +lib/tme/tme_ic_lsi64854.so.0.0.0 lib/tme/tme_ic_m68k.so lib/tme/tme_ic_m68k.so.0 -lib/tme/tme_ic_mk48txx.a -lib/tme/tme_ic_mk48txx.la +lib/tme/tme_ic_m68k.so.0.0.0 lib/tme/tme_ic_mk48txx.so lib/tme/tme_ic_mk48txx.so.0 -lib/tme/tme_ic_mm58167.a -lib/tme/tme_ic_mm58167.la +lib/tme/tme_ic_mk48txx.so.0.0.0 lib/tme/tme_ic_mm58167.so lib/tme/tme_ic_mm58167.so.0 -lib/tme/tme_ic_ncr5380.a -lib/tme/tme_ic_ncr5380.la +lib/tme/tme_ic_mm58167.so.0.0.0 lib/tme/tme_ic_ncr5380.so lib/tme/tme_ic_ncr5380.so.0 -lib/tme/tme_ic_ncr53c9x.a -lib/tme/tme_ic_ncr53c9x.la +lib/tme/tme_ic_ncr5380.so.0.0.0 lib/tme/tme_ic_ncr53c9x.so lib/tme/tme_ic_ncr53c9x.so.0 -lib/tme/tme_ic_ncr89c105.a -lib/tme/tme_ic_ncr89c105.la +lib/tme/tme_ic_ncr53c9x.so.0.0.0 lib/tme/tme_ic_ncr89c105.so lib/tme/tme_ic_ncr89c105.so.0 -lib/tme/tme_ic_nec765.a -lib/tme/tme_ic_nec765.la +lib/tme/tme_ic_ncr89c105.so.0.0.0 lib/tme/tme_ic_nec765.so lib/tme/tme_ic_nec765.so.0 -lib/tme/tme_ic_sparc.a -lib/tme/tme_ic_sparc.la +lib/tme/tme_ic_nec765.so.0.0.0 lib/tme/tme_ic_sparc.so lib/tme/tme_ic_sparc.so.0 -lib/tme/tme_ic_stp2024.a -lib/tme/tme_ic_stp2024.la +lib/tme/tme_ic_sparc.so.0.0.0 lib/tme/tme_ic_stp2024.so lib/tme/tme_ic_stp2024.so.0 -lib/tme/tme_ic_stp22xx.a -lib/tme/tme_ic_stp22xx.la +lib/tme/tme_ic_stp2024.so.0.0.0 lib/tme/tme_ic_stp22xx.so lib/tme/tme_ic_stp22xx.so.0 -lib/tme/tme_ic_z8530.a -lib/tme/tme_ic_z8530.la +lib/tme/tme_ic_stp22xx.so.0.0.0 lib/tme/tme_ic_z8530.so lib/tme/tme_ic_z8530.so.0 -lib/tme/tme_machine_sun2.a -lib/tme/tme_machine_sun2.la +lib/tme/tme_ic_z8530.so.0.0.0 lib/tme/tme_machine_sun2.so lib/tme/tme_machine_sun2.so.0 -lib/tme/tme_machine_sun3.a -lib/tme/tme_machine_sun3.la +lib/tme/tme_machine_sun2.so.0.0.0 lib/tme/tme_machine_sun3.so lib/tme/tme_machine_sun3.so.0 -lib/tme/tme_machine_sun4.a -lib/tme/tme_machine_sun4.la +lib/tme/tme_machine_sun3.so.0.0.0 lib/tme/tme_machine_sun4.so lib/tme/tme_machine_sun4.so.0 -lib/tme/tme_scsi.a -lib/tme/tme_scsi.la +lib/tme/tme_machine_sun4.so.0.0.0 lib/tme/tme_scsi.so lib/tme/tme_scsi.so.0 -lib/tme/tme_serial_kb.a -lib/tme/tme_serial_kb.la +lib/tme/tme_scsi.so.0.0.0 lib/tme/tme_serial_kb.so lib/tme/tme_serial_kb.so.0 +lib/tme/tme_serial_kb.so.0.0.0 lib/tme/tmeconfig.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN-ULTRA-1 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN2-MULTIBUS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408271912.s7RJCLKo032196>