Attachment #128111 for bug #171997

View | Details | Raw Unified | Return to bug 171997
Collapse All | Expand All




# Created by: trasz <trasz@pin.if.uz.zgora.pl>
# Date created:		2006-12-14
# Whom:			trasz <trasz@pin.if.uz.zgora.pl>
#
# $FreeBSD: ports/emulators/tme/Makefile,v 1.15 2012/07/25 06:32:06 cs Exp $
#

PORTNAME=	tme
PORTVERSION=	0.8
PORTREVISION=	3
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=	BSD
LICENSE_FILE=	${WRKSRC}/COPYING

OPTIONS_DEFINE=	EXAMPLES

USE_GNOME=	gtk20
USE_PERL5=	yes
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtool libltdl
CONFIGURE_ENV=	ac_cv_have_isinff=no
CONFIGURE_ARGS=	--datadir=${WRKDIR}/tmproot --disable-warnings
MAKE_ENV=	LANG=C
MAKE_JOBS_UNSAFE=yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${WRKSRC}/ic/ieee754/.libs
LDFLAGS+=	-L${LOCALBASE}/lib 

.include <bsd.port.options.mk>

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}|' \
		${WRKSRC}/libtme/module.c

post-install:
.if ${PORT_OPTIONS:MEXAMPLES}
	@${MKDIR} ${EXAMPLESDIR}
	@(cd ${WRKDIR}/tmproot/examples/tme \
		&& ${COPYTREE_SHARE} . ${EXAMPLESDIR})
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)emulators/tme/distinfo (-2 / +2 lines)
1	SHA256 (tme-0.6.tar.gz) = 97293c113cbcca0da533c26ec576dbad4ed6f8c702875b3b7949c6538a063f19	1	SHA256 (tme-0.8.tar.gz) = 7aa07fd60a574b2a248bbd22bfa68bcb39e6dddd4a678791b1a085e11d1badfd
2	SIZE (tme-0.6.tar.gz) = 1700273	2	SIZE (tme-0.8.tar.gz) = 2100123




--- configure.orig	Sun May 15 03:26:11 2005
+++ configure	Fri Feb  2 16:39:50 2007
@@ -8890,7 +8890,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_have_isinff=yes
+  ac_cv_have_isinff=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -15113,7 +15113,7 @@
   ;;
 
 freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -25853,7 +25853,7 @@
   enable_warnings=yes
 fi;
 if test "x$enable_warnings" = "xyes" -a "x$GCC" = "xyes"; then
-  CFLAGS="${CFLAGS-} -Wundef -Wall -Werror"
+  CFLAGS="${CFLAGS-} -Wundef -Wall"
   CXXFLAGS="${CXXFLAGS-} -W"
 fi
 




--- host/bsd/bsd-if.c.orig	2003-10-16 02:48:23.000000000 +0000
+++ host/bsd/bsd-if.c	2012-07-07 12:24:22.000000000 +0000
@@ -71,14 +72,15 @@
 
 /* this macro helps us size a struct ifreq: */
 #ifdef HAVE_SOCKADDR_SA_LEN
-#define SIZEOF_IFREQ(ifr) (sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len)
+#define SIZEOF_IFREQ(ifr) \
+( sizeof(ifr->ifr_name) + (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru) ? ifr->ifr_addr.sa_len : sizeof(ifr->ifr_ifru)) )
 #else  /* !HAVE_SOCKADDR_SA_LEN */
 #define SIZEOF_IFREQ(ifr) (sizeof(ifr->ifr_name) + sizeof(struct sockaddr))
 #endif /* !HAVE_SOCKADDR_SA_LEN */
 
 /* this finds a network interface: */
 int
 tme_bsd_if_find(const char *ifr_name_user, struct ifreq **_ifreq, tme_uint8_t **_if_addr, unsigned int *_if_addr_size)
 {
   int saved_errno;
   int dummy_fd;
@@ -175,7 +192,7 @@
     if (ifr_user == NULL
 	&& (ifr_name_user != NULL
 	    ? !strncmp(ifr->ifr_name, ifr_name_user, sizeof(ifr->ifr_name))
-	    : !(ifr->ifr_flags & IFF_LOOPBACK))) {
+	    : !(saved_flags & IFF_LOOPBACK))) {
       ifr_user = ifr;
     }
   }

Line 0 Link Here

(-)emulators/tme/files/patch-ic__ieee754__iee754-misc-auto.sh (+11 lines)
	1	--- ic/ieee754/ieee754-misc-auto.sh.orig 2007-08-24 01:05:43.000000000 +0000
	2	+++ ic/ieee754/ieee754-misc-auto.sh
	3	@@ -106,7 +106,7 @@ typedef float tme_ieee754_${precision}_b
	4	#elif (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_DOUBLE)
	5	typedef double tme_ieee754_${precision}_builtin_t;
	6	#define tme_float_value_ieee754_${precision}_builtin tme_float_value_double
	7	-#elif (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_LONG_DOUBLE)
	8	+#elif (defined(_TME_HAVE_LONG_DOUBLE) && (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_LONG_DOUBLE))
	9	typedef long double tme_ieee754_${precision}_builtin_t;
	10	#define tme_float_value_ieee754_${precision}_builtin tme_float_value_long_double
	11	#endif

Line 0 Link Here

(-)emulators/tme/files/patch-ic__sparc__sparc-execute.c (+11 lines)
	1	--- ic/sparc/sparc-execute.c 2010-02-21 06:58:15.000000000 +0900
	2	+++ ic/sparc/sparc-execute.c 2010-04-14 22:55:50.000000000 +0900
	3	@@ -612,7 +612,7 @@
	4	!= pc_previous)) {
	5	if (__tme_predict_true(((tme_sparc_ireg_t) (pc + sizeof(tme_uint32_t)))
	6	== ic->tme_sparc_ireg(TME_SPARC_IREG_PC_NEXT))) {
	7	- tme_recode_thunk_off_t insns_thunk;
	8	+ tme_recode_thunk_off_t insns_thunk = 0; /* XXX gcc -Wuninitialized */
	9
	10	/* if the current instruction TLB entry is not the invalid TLB
	11	entry, and there is an instructions thunk for this PC: */




--- libtme/module.c.orig	2010-06-06 04:04:42.000000000 +0900
+++ libtme/module.c	2011-03-20 06:00:02.000000000 +0900
@@ -62,11 +62,13 @@
 #endif /* !lt_ptr_t */
 #endif /* !lt_ptr */
 
+#if 0
 /* similarly, the installed libltdl may be so recent that its ltdl.h
    renames lt_preloaded_symbols with a macro, to a name different from
    what our libtool script makes.  it's possible that the renaming
    macro is meant to be undefined to handle this problem: */
 #undef lt_preloaded_symbols
+#endif
 
 /* types: */
 struct tme_module {
@@ -113,13 +115,14 @@
   FILE *modules_index;
 
   /* pass over the search path environment variables: */




--- machine/sun/sun-bwtwo.c.orig	2009-11-08 12:03:58.000000000 -0500
+++ machine/sun/sun-bwtwo.c	2011-10-06 20:52:30.000000000 -0400
@@ -339,6 +339,7 @@
 {
   struct tme_sunbw2 *sunbw2;
   int rc;
+  tme_uint16_t v;
 
   /* start the sunbw2 structure: */
   sunbw2 = tme_new0(struct tme_sunbw2, 1);
@@ -365,12 +366,10 @@
   case TME_SUNBW2_TYPE_OLD_ONBOARD:
 
     /* set our initial CSR: */
-    sunbw2->tme_sunbw2_csr
-      = tme_htobe_u16(TME_SUNBW2_CSR_ENABLE_VIDEO
-		      | (sunbw2->tme_sunbw2_sunfb.tme_sunfb_size == TME_SUNFB_SIZE_1024_1024
-			 ? TME_SUNBW2_CSR_JUMPER_HIRES
-			 : 0));
-
+    v = TME_SUNBW2_CSR_ENABLE_VIDEO | (sunbw2->tme_sunbw2_sunfb.tme_sunfb_size
+				       == TME_SUNFB_SIZE_1024_1024
+				       ? TME_SUNBW2_CSR_JUMPER_HIRES : 0);
+    sunbw2->tme_sunbw2_csr = tme_htobe_u16(v);
     break;
   }
 




bin/tme-sun-idprom
bin/tme-sun-eeprom
bin/tme-sun-idprom
bin/tmesh
include/tme/bus/upa.h
include/tme/common.h
include/tme/completion.h
include/tme/connection.h
include/tme/element.h
include/tme/generic/bus-device.h
include/tme/generic/bus.h
include/tme/generic/disk.h
include/tme/generic/serial.h
include/tme/generic/ethernet.h
include/tme/generic/fb.h
include/tme/generic/scsi.h
include/tme/generic/disk.h
include/tme/generic/tape.h
include/tme/generic/mouse.h
include/tme/generic/float.h
include/tme/generic/ic.h
include/tme/generic/keyboard.h
include/tme/generic/mouse.h
include/tme/generic/scsi.h
include/tme/generic/serial.h
include/tme/generic/tape.h
include/tme/hash.h
include/tme/host/recode-mmap.h
include/tme/host/recode-x86.h
include/tme/ic/am9513.h
include/tme/ic/z8530.h
include/tme/ic/mm58167.h
include/tme/ic/isil7170.h
include/tme/ic/i825x6.h
include/tme/ic/sparc.h
include/tme/ic/mk48txx.h
include/tme/ic/nec765.h
include/tme/ic/bt458.h
include/tme/ic/i825x6.h
include/tme/ic/ieee754-auto.h
include/tme/ic/ieee754-ops-auto.h
include/tme/ic/ieee754.h
include/tme/ic/isil7170.h
include/tme/ic/m68k.h
include/tme/ic/mk48txx.h
include/tme/ic/mm58167.h
include/tme/ic/nec765.h
include/tme/ic/sparc.h
include/tme/ic/z8530.h
include/tme/log.h
include/tme/machine/sun.h
include/tme/memory-auto.h
include/tme/memory.h
include/tme/misc.h
include/tme/module.h
include/tme/recode.h
include/tme/runlength.h
include/tme/scsi/scsi-cdb.h
include/tme/scsi/scsi-cdrom.h
include/tme/scsi/scsi-device.h
include/tme/scsi/scsi-disk.h
include/tme/scsi/scsi-msg.h
include/tme/scsi/scsi-tape.h
include/tme/connection.h
include/tme/element.h
include/tme/threads.h
include/tme/module.h
include/tme/log.h
include/tme/tme.h
include/tme/misc.h
include/tme/hash.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-ieee754.so
lib/libtme-ieee754.so.0
lib/libtme.a
lib/libtme.la
lib/libtme.so
lib/libtme.so.0
lib/libtmesh.a
lib/libtmesh.la
lib/libtmesh.so
lib/libtmesh.so.0
lib/tme/libtme-machine-sun.a
lib/tme/libtme-machine-sun.la
lib/tme/libtme-machine-sun.so
lib/tme/libtme-machine-sun.so.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_sbus.so
lib/tme/tme_bus_sbus.so.0
lib/tme/tme_generic.a
lib/tme/tme_generic.la
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_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_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_posix.so
lib/tme/tme_host_posix.so.0
lib/tme/tme_ic_ad184x.a
lib/tme/tme_ic_ad184x.la
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_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_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_am9513.so
lib/tme/tme_ic_am9513.so.0
lib/tme/tme_ic_z8530.a
lib/tme/tme_ic_i825x6.la
lib/tme/tme_ic_i825x6.a
lib/tme/tme_ic_i825x6.la
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_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_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_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_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_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_ncr5380.so
lib/tme/tme_ic_ncr5380.so.0
lib/tme/tme_ic_am7990.a
lib/tme/tme_ic_ncr53c9x.la
lib/tme/tme_ic_ncr53c9x.a
lib/tme/tme_ic_ncr53c9x.la
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_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_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_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_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_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_z8530.so
lib/tme/tme_ic_z8530.so.0
lib/tme/tme_machine_sun2.a
lib/tme/tme_machine_sun2.la
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_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_sun4.so
lib/tme/tme_machine_sun4.so.0
lib/tme/tme_host_bsd.a
lib/tme/tme_host_gtk.la
lib/tme/tme_host_gtk.a
lib/tme/tme_bus_multibus.la
lib/tme/tme_bus_multibus.a
lib/tme/tme_bus_sbus.la
lib/tme/tme_bus_sbus.a
lib/tme/tme_serial_kb.la
lib/tme/tme_serial_kb.a
lib/tme/tme_scsi.la
lib/tme/tme_scsi.a
lib/tme/tme_scsi.la
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_serial_kb.so
lib/tme/tme_serial_kb.so.0
lib/tme/tmeconfig.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN-ULTRA-1
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN2-MULTIBUS
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN3-CARRERA
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN4-75
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/my-sun-macros.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sun-keyboards.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sun3-carrera-eeprom.txt
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
@dirrm lib/tme
@dirrm include/tme/scsi
@dirrm include/tme/machine
@dirrm include/tme/ic
@dirrm include/tme/host
@dirrm include/tme/generic
@dirrm include/tme/bus
@dirrm include/tme
lib/libtme-ieee754.a
lib/libtmesh.la
lib/libtmesh.a
share/examples/tme/sun-keyboards.txt
share/examples/tme/my-sun-macros.txt
share/examples/tme/SUN2-MULTIBUS
share/examples/tme/SUN3-CARRERA
share/examples/tme/sun3-carrera-eeprom.txt
share/examples/tme/SUN4-75
@dirrm share/examples/tme

Return to bug 171997

Lines 1-28 Link Here

(-)emulators/tme/Makefile (-13 / +36 lines)
1	# New ports collection makefile for: tme	1	# Created by: trasz <trasz@pin.if.uz.zgora.pl>
2	# Date created: 2006-12-14
3	# Whom: trasz <trasz@pin.if.uz.zgora.pl>
4	#
5	# $FreeBSD: ports/emulators/tme/Makefile,v 1.15 2012/07/25 06:32:06 cs Exp $	2	# $FreeBSD: ports/emulators/tme/Makefile,v 1.15 2012/07/25 06:32:06 cs Exp $
6	#
7		3
8	PORTNAME= tme	4	PORTNAME= tme
9	PORTVERSION= 0.6	5	PORTVERSION= 0.8
10	PORTREVISION= 3
11	CATEGORIES= emulators	6	CATEGORIES= emulators
12	MASTER_SITES= http://people.csail.mit.edu/fredette/tme/	7	MASTER_SITES= http://people.csail.mit.edu/fredette/tme/
13		8
14	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Emulator for Sun 2/120, 3/150, and SPARCstation 2 machines	10	COMMENT= Emulator for Sun 2/120, 3/150, and SPARCstation 2 machines
16		11
17	GNU_CONFIGURE= yes	12	LICENSE= BSD
		13	LICENSE_FILE= ${WRKSRC}/COPYING
		14
		15	OPTIONS_DEFINE= EXAMPLES
		16
		17	USE_GNOME= gtk20
		18	USE_PERL5= yes
18	USE_GMAKE= yes	19	USE_GMAKE= yes
19	USE_XORG= x11	20	USE_AUTOTOOLS= libtool libltdl
20	USE_GNOME= gtk12	21	CONFIGURE_ENV= ac_cv_have_isinff=no
21	CONFIGURE_ARGS+= --disable-shared	22	CONFIGURE_ARGS= --datadir=${WRKDIR}/tmproot --disable-warnings
22	MAKE_ENV= LANG=C	23	MAKE_ENV= LANG=C
23	MAKE_JOBS_UNSAFE= yes	24	MAKE_JOBS_UNSAFE=yes
		25
		26	CPPFLAGS+= -I${LOCALBASE}/include
		27	LDFLAGS+= -L${WRKSRC}/ic/ieee754/.libs
		28	LDFLAGS+= -L${LOCALBASE}/lib
		29
		30	.include <bsd.port.options.mk>
24		31
25	post-patch:	32	post-patch:
26	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/libtme/module.c	33	@${REINPLACE_CMD} -e '/misc_hosts/s\|= no\|= xno\|' \
		34	${WRKSRC}/configure
		35	@${REINPLACE_CMD} -e 's\|\.\./ieee754\|$$(top_builddir)/ic/ieee754\|g' \
		36	${WRKSRC}/ic/m68k/Makefile.in
		37	@${REINPLACE_CMD} -e 's\|\.\./ieee754\|$$(top_builddir)/ic/ieee754\|g' \
		38	${WRKSRC}/ic/sparc/Makefile.in
		39	@${REINPLACE_CMD} -e '/^#ifdef/s\|\*/\|\|' \
		40	${WRKSRC}/libtme/misc.c
		41	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' \
		42	${WRKSRC}/libtme/module.c
		43
		44	post-install:
		45	.if ${PORT_OPTIONS:MEXAMPLES}
		46	@${MKDIR} ${EXAMPLESDIR}
		47	@(cd ${WRKDIR}/tmproot/examples/tme \
		48	&& ${COPYTREE_SHARE} . ${EXAMPLESDIR})
		49	.endif
27		50
28	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)emulators/tme/files/patch-configure (-29 lines)
1	--- configure.orig Sun May 15 03:26:11 2005
2	+++ configure Fri Feb 2 16:39:50 2007
3	@@ -8890,7 +8890,7 @@
4	ac_status=$?
5	echo "$as_me:$LINENO: \$? = $ac_status" >&5
6	(exit $ac_status); }; }; then
7	- ac_cv_have_isinff=yes
8	+ ac_cv_have_isinff=no
9	else
10	echo "$as_me: failed program was:" >&5
11	sed 's/^/\| /' conftest.$ac_ext >&5
12	@@ -15113,7 +15113,7 @@
13	;;
14
15	freebsd*)
16	- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat \|\| echo aout`
17	+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat \|\| echo elf`
18	version_type=freebsd-$objformat
19	case $version_type in
20	freebsd-elf*)
21	@@ -25853,7 +25853,7 @@
22	enable_warnings=yes
23	fi;
24	if test "x$enable_warnings" = "xyes" -a "x$GCC" = "xyes"; then
25	- CFLAGS="${CFLAGS-} -Wundef -Wall -Werror"
26	+ CFLAGS="${CFLAGS-} -Wundef -Wall"
27	CXXFLAGS="${CXXFLAGS-} -W"
28	fi
29

Line 0 Link Here

(-)emulators/tme/files/patch-host__bsd__bsd-bpf.c (+28 lines)
	1	--- host/bsd/bsd-if.c.orig 2003-10-16 02:48:23.000000000 +0000
	2	+++ host/bsd/bsd-if.c 2012-07-07 12:24:22.000000000 +0000
	3	@@ -71,14 +72,15 @@
	4
	5	/* this macro helps us size a struct ifreq: */
	6	#ifdef HAVE_SOCKADDR_SA_LEN
	7	-#define SIZEOF_IFREQ(ifr) (sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len)
	8	+#define SIZEOF_IFREQ(ifr) \
	9	+( sizeof(ifr->ifr_name) + (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru) ? ifr->ifr_addr.sa_len : sizeof(ifr->ifr_ifru)) )
	10	#else /* !HAVE_SOCKADDR_SA_LEN */
	11	#define SIZEOF_IFREQ(ifr) (sizeof(ifr->ifr_name) + sizeof(struct sockaddr))
	12	#endif /* !HAVE_SOCKADDR_SA_LEN */
	13
	14	/* this finds a network interface: */
	15	int
	16	tme_bsd_if_find(const char ifr_name_user, struct ifreq _ifreq, tme_uint8_t _if_addr, unsigned int _if_addr_size)
	17	{
	18	int saved_errno;
	19	int dummy_fd;
	20	@@ -175,7 +192,7 @@
	21	if (ifr_user == NULL
	22	&& (ifr_name_user != NULL
	23	? !strncmp(ifr->ifr_name, ifr_name_user, sizeof(ifr->ifr_name))
	24	- : !(ifr->ifr_flags & IFF_LOOPBACK))) {
	25	+ : !(saved_flags & IFF_LOOPBACK))) {
	26	ifr_user = ifr;
	27	}
	28	}

Lines 1-6 Link Here

(-)emulators/tme/files/patch-libtme-module.c (-3 / +17 lines)
1	--- libtme/module.c.orig Wed Jan 26 13:59:24 2005	1	--- libtme/module.c.orig 2010-06-06 04:04:42.000000000 +0900
2	+++ libtme/module.c Sun Dec 17 19:11:37 2006	2	+++ libtme/module.c 2011-03-20 06:00:02.000000000 +0900
3	@@ -107,13 +107,14 @@	3	@@ -62,11 +62,13 @@
		4	#endif /* !lt_ptr_t */
		5	#endif /* !lt_ptr */
		6
		7	+#if 0
		8	/* similarly, the installed libltdl may be so recent that its ltdl.h
		9	renames lt_preloaded_symbols with a macro, to a name different from
		10	what our libtool script makes. it's possible that the renaming
		11	macro is meant to be undefined to handle this problem: */
		12	#undef lt_preloaded_symbols
		13	+#endif
		14
		15	/* types: */
		16	struct tme_module {
		17	@@ -113,13 +115,14 @@
4	FILE *modules_index;	18	FILE *modules_index;
5		19
6	/* pass over the search path environment variables: */	20	/* pass over the search path environment variables: */

Line 0 Link Here

(-)emulators/tme/files/patch-machine__sun__sun-bwtwo.c (+27 lines)
	1	--- machine/sun/sun-bwtwo.c.orig 2009-11-08 12:03:58.000000000 -0500
	2	+++ machine/sun/sun-bwtwo.c 2011-10-06 20:52:30.000000000 -0400
	3	@@ -339,6 +339,7 @@
	4	{
	5	struct tme_sunbw2 *sunbw2;
	6	int rc;
	7	+ tme_uint16_t v;
	8
	9	/* start the sunbw2 structure: */
	10	sunbw2 = tme_new0(struct tme_sunbw2, 1);
	11	@@ -365,12 +366,10 @@
	12	case TME_SUNBW2_TYPE_OLD_ONBOARD:
	13
	14	/* set our initial CSR: */
	15	- sunbw2->tme_sunbw2_csr
	16	- = tme_htobe_u16(TME_SUNBW2_CSR_ENABLE_VIDEO
	17	- \| (sunbw2->tme_sunbw2_sunfb.tme_sunfb_size == TME_SUNFB_SIZE_1024_1024
	18	- ? TME_SUNBW2_CSR_JUMPER_HIRES
	19	- : 0));
	20	-
	21	+ v = TME_SUNBW2_CSR_ENABLE_VIDEO \| (sunbw2->tme_sunbw2_sunfb.tme_sunfb_size
	22	+ == TME_SUNFB_SIZE_1024_1024
	23	+ ? TME_SUNBW2_CSR_JUMPER_HIRES : 0);
	24	+ sunbw2->tme_sunbw2_csr = tme_htobe_u16(v);
	25	break;
	26	}
	27

Lines 1-125 Link Here

(-)emulators/tme/pkg-plist (-93 / +176 lines)
1	bin/tme-sun-idprom
2	bin/tme-sun-eeprom	1	bin/tme-sun-eeprom
		2	bin/tme-sun-idprom
3	bin/tmesh	3	bin/tmesh
		4	include/tme/bus/upa.h
		5	include/tme/common.h
		6	include/tme/completion.h
		7	include/tme/connection.h
		8	include/tme/element.h
4	include/tme/generic/bus-device.h	9	include/tme/generic/bus-device.h
5	include/tme/generic/bus.h	10	include/tme/generic/bus.h
6	include/tme/generic/ic.h	11	include/tme/generic/disk.h
7	include/tme/generic/serial.h
8	include/tme/generic/ethernet.h	12	include/tme/generic/ethernet.h
9	include/tme/generic/fb.h	13	include/tme/generic/fb.h
10	include/tme/generic/scsi.h
11	include/tme/generic/disk.h
12	include/tme/generic/tape.h
13	include/tme/generic/mouse.h
14	include/tme/generic/float.h	14	include/tme/generic/float.h
		15	include/tme/generic/ic.h
15	include/tme/generic/keyboard.h	16	include/tme/generic/keyboard.h
16	@dirrm include/tme/generic	17	include/tme/generic/mouse.h
17	include/tme/ic/m68k.h	18	include/tme/generic/scsi.h
		19	include/tme/generic/serial.h
		20	include/tme/generic/tape.h
		21	include/tme/hash.h
		22	include/tme/host/recode-mmap.h
		23	include/tme/host/recode-x86.h
18	include/tme/ic/am9513.h	24	include/tme/ic/am9513.h
19	include/tme/ic/z8530.h
20	include/tme/ic/mm58167.h
21	include/tme/ic/isil7170.h
22	include/tme/ic/i825x6.h
23	include/tme/ic/sparc.h
24	include/tme/ic/mk48txx.h
25	include/tme/ic/nec765.h
26	include/tme/ic/bt458.h	25	include/tme/ic/bt458.h
27	include/tme/ic/ieee754.h	26	include/tme/ic/i825x6.h
28	include/tme/ic/ieee754-auto.h	27	include/tme/ic/ieee754-auto.h
29	include/tme/ic/ieee754-ops-auto.h	28	include/tme/ic/ieee754-ops-auto.h
30	@dirrm include/tme/ic	29	include/tme/ic/ieee754.h
		30	include/tme/ic/isil7170.h
		31	include/tme/ic/m68k.h
		32	include/tme/ic/mk48txx.h
		33	include/tme/ic/mm58167.h
		34	include/tme/ic/nec765.h
		35	include/tme/ic/sparc.h
		36	include/tme/ic/z8530.h
		37	include/tme/log.h
31	include/tme/machine/sun.h	38	include/tme/machine/sun.h
32	@dirrm include/tme/machine	39	include/tme/memory-auto.h
33	include/tme/scsi/scsi-disk.h	40	include/tme/memory.h
34	include/tme/scsi/scsi-tape.h	41	include/tme/misc.h
35	include/tme/scsi/scsi-cdrom.h	42	include/tme/module.h
36	include/tme/scsi/scsi-msg.h	43	include/tme/recode.h
		44	include/tme/runlength.h
37	include/tme/scsi/scsi-cdb.h	45	include/tme/scsi/scsi-cdb.h
		46	include/tme/scsi/scsi-cdrom.h
38	include/tme/scsi/scsi-device.h	47	include/tme/scsi/scsi-device.h
39	@dirrm include/tme/scsi	48	include/tme/scsi/scsi-disk.h
40	include/tme/memory.h	49	include/tme/scsi/scsi-msg.h
41	include/tme/common.h	50	include/tme/scsi/scsi-tape.h
42	include/tme/connection.h
43	include/tme/element.h
44	include/tme/threads.h	51	include/tme/threads.h
45	include/tme/module.h
46	include/tme/log.h
47	include/tme/tme.h	52	include/tme/tme.h
48	include/tme/misc.h
49	include/tme/hash.h
50	include/tme/tmesh.h	53	include/tme/tmesh.h
51	include/tme/memory-auto.h	54	include/tme/token.h
52	@dirrm include/tme	55	lib/libtme-generic.a
53	include/ltdl.h	56	lib/libtme-generic.la
		57	lib/libtme-generic.so
		58	lib/libtme-generic.so.0
		59	lib/libtme-ieee754.a
		60	lib/libtme-ieee754.la
		61	lib/libtme-ieee754.so
		62	lib/libtme-ieee754.so.0
		63	lib/libtme.a
		64	lib/libtme.la
		65	lib/libtme.so
		66	lib/libtme.so.0
		67	lib/libtmesh.a
		68	lib/libtmesh.la
		69	lib/libtmesh.so
		70	lib/libtmesh.so.0
		71	lib/tme/libtme-machine-sun.a
		72	lib/tme/libtme-machine-sun.la
		73	lib/tme/libtme-machine-sun.so
		74	lib/tme/libtme-machine-sun.so.0
54	lib/tme/tme-plugins.txt	75	lib/tme/tme-plugins.txt
55	lib/tme/tme_generic.la	76	lib/tme/tme_bus_multibus.a
		77	lib/tme/tme_bus_multibus.la
		78	lib/tme/tme_bus_multibus.so
		79	lib/tme/tme_bus_multibus.so.0
		80	lib/tme/tme_bus_sbus.a
		81	lib/tme/tme_bus_sbus.la
		82	lib/tme/tme_bus_sbus.so
		83	lib/tme/tme_bus_sbus.so.0
56	lib/tme/tme_generic.a	84	lib/tme/tme_generic.a
57	lib/tme/tme_ic_m68k.la	85	lib/tme/tme_generic.la
58	lib/tme/tme_ic_m68k.a	86	lib/tme/tme_generic.so
59	lib/tme/tme_ic_sparc.la	87	lib/tme/tme_generic.so.0
60	lib/tme/tme_ic_sparc.a	88	lib/tme/tme_host_bsd.a
61	lib/tme/tme_ic_am9513.la	89	lib/tme/tme_host_bsd.la
		90	lib/tme/tme_host_bsd.so
		91	lib/tme/tme_host_bsd.so.0
		92	lib/tme/tme_host_gtk.a
		93	lib/tme/tme_host_gtk.la
		94	lib/tme/tme_host_gtk.so
		95	lib/tme/tme_host_gtk.so.0
		96	lib/tme/tme_host_posix.a
		97	lib/tme/tme_host_posix.la
		98	lib/tme/tme_host_posix.so
		99	lib/tme/tme_host_posix.so.0
		100	lib/tme/tme_ic_ad184x.a
		101	lib/tme/tme_ic_ad184x.la
		102	lib/tme/tme_ic_ad184x.so
		103	lib/tme/tme_ic_ad184x.so.0
		104	lib/tme/tme_ic_am7930.a
		105	lib/tme/tme_ic_am7930.la
		106	lib/tme/tme_ic_am7930.so
		107	lib/tme/tme_ic_am7930.so.0
		108	lib/tme/tme_ic_am7990.a
		109	lib/tme/tme_ic_am7990.la
		110	lib/tme/tme_ic_am7990.so
		111	lib/tme/tme_ic_am7990.so.0
62	lib/tme/tme_ic_am9513.a	112	lib/tme/tme_ic_am9513.a
63	lib/tme/tme_ic_mm58167.la	113	lib/tme/tme_ic_am9513.la
64	lib/tme/tme_ic_mm58167.a	114	lib/tme/tme_ic_am9513.so
65	lib/tme/tme_ic_z8530.la	115	lib/tme/tme_ic_am9513.so.0
66	lib/tme/tme_ic_z8530.a
67	lib/tme/tme_ic_i825x6.la
68	lib/tme/tme_ic_i825x6.a	116	lib/tme/tme_ic_i825x6.a
69	lib/tme/tme_ic_isil7170.la	117	lib/tme/tme_ic_i825x6.la
		118	lib/tme/tme_ic_i825x6.so
		119	lib/tme/tme_ic_i825x6.so.0
70	lib/tme/tme_ic_isil7170.a	120	lib/tme/tme_ic_isil7170.a
71	lib/tme/tme_ic_ncr5380.la	121	lib/tme/tme_ic_isil7170.la
		122	lib/tme/tme_ic_isil7170.so
		123	lib/tme/tme_ic_isil7170.so.0
		124	lib/tme/tme_ic_lsi64854.a
		125	lib/tme/tme_ic_lsi64854.la
		126	lib/tme/tme_ic_lsi64854.so
		127	lib/tme/tme_ic_lsi64854.so.0
		128	lib/tme/tme_ic_m68k.a
		129	lib/tme/tme_ic_m68k.la
		130	lib/tme/tme_ic_m68k.so
		131	lib/tme/tme_ic_m68k.so.0
		132	lib/tme/tme_ic_mk48txx.a
		133	lib/tme/tme_ic_mk48txx.la
		134	lib/tme/tme_ic_mk48txx.so
		135	lib/tme/tme_ic_mk48txx.so.0
		136	lib/tme/tme_ic_mm58167.a
		137	lib/tme/tme_ic_mm58167.la
		138	lib/tme/tme_ic_mm58167.so
		139	lib/tme/tme_ic_mm58167.so.0
72	lib/tme/tme_ic_ncr5380.a	140	lib/tme/tme_ic_ncr5380.a
73	lib/tme/tme_ic_am7930.la	141	lib/tme/tme_ic_ncr5380.la
74	lib/tme/tme_ic_am7930.a	142	lib/tme/tme_ic_ncr5380.so
75	lib/tme/tme_ic_am7990.la	143	lib/tme/tme_ic_ncr5380.so.0
76	lib/tme/tme_ic_am7990.a
77	lib/tme/tme_ic_ncr53c9x.la
78	lib/tme/tme_ic_ncr53c9x.a	144	lib/tme/tme_ic_ncr53c9x.a
79	lib/tme/tme_ic_mk48txx.la	145	lib/tme/tme_ic_ncr53c9x.la
80	lib/tme/tme_ic_mk48txx.a	146	lib/tme/tme_ic_ncr53c9x.so
81	lib/tme/tme_ic_lsi64854.la	147	lib/tme/tme_ic_ncr53c9x.so.0
82	lib/tme/tme_ic_lsi64854.a	148	lib/tme/tme_ic_ncr89c105.a
83	lib/tme/tme_ic_nec765.la	149	lib/tme/tme_ic_ncr89c105.la
		150	lib/tme/tme_ic_ncr89c105.so
		151	lib/tme/tme_ic_ncr89c105.so.0
84	lib/tme/tme_ic_nec765.a	152	lib/tme/tme_ic_nec765.a
85	lib/tme/libtme-machine-sun.la	153	lib/tme/tme_ic_nec765.la
86	lib/tme/libtme-machine-sun.a	154	lib/tme/tme_ic_nec765.so
87	lib/tme/tme_machine_sun2.la	155	lib/tme/tme_ic_nec765.so.0
		156	lib/tme/tme_ic_sparc.a
		157	lib/tme/tme_ic_sparc.la
		158	lib/tme/tme_ic_sparc.so
		159	lib/tme/tme_ic_sparc.so.0
		160	lib/tme/tme_ic_stp2024.a
		161	lib/tme/tme_ic_stp2024.la
		162	lib/tme/tme_ic_stp2024.so
		163	lib/tme/tme_ic_stp2024.so.0
		164	lib/tme/tme_ic_stp22xx.a
		165	lib/tme/tme_ic_stp22xx.la
		166	lib/tme/tme_ic_stp22xx.so
		167	lib/tme/tme_ic_stp22xx.so.0
		168	lib/tme/tme_ic_z8530.a
		169	lib/tme/tme_ic_z8530.la
		170	lib/tme/tme_ic_z8530.so
		171	lib/tme/tme_ic_z8530.so.0
88	lib/tme/tme_machine_sun2.a	172	lib/tme/tme_machine_sun2.a
89	lib/tme/tme_machine_sun3.la	173	lib/tme/tme_machine_sun2.la
		174	lib/tme/tme_machine_sun2.so
		175	lib/tme/tme_machine_sun2.so.0
90	lib/tme/tme_machine_sun3.a	176	lib/tme/tme_machine_sun3.a
91	lib/tme/tme_machine_sun4.la	177	lib/tme/tme_machine_sun3.la
		178	lib/tme/tme_machine_sun3.so
		179	lib/tme/tme_machine_sun3.so.0
92	lib/tme/tme_machine_sun4.a	180	lib/tme/tme_machine_sun4.a
93	lib/tme/tme_host_posix.la	181	lib/tme/tme_machine_sun4.la
94	lib/tme/tme_host_posix.a	182	lib/tme/tme_machine_sun4.so
95	lib/tme/tme_host_bsd.la	183	lib/tme/tme_machine_sun4.so.0
96	lib/tme/tme_host_bsd.a
97	lib/tme/tme_host_gtk.la
98	lib/tme/tme_host_gtk.a
99	lib/tme/tme_bus_multibus.la
100	lib/tme/tme_bus_multibus.a
101	lib/tme/tme_bus_sbus.la
102	lib/tme/tme_bus_sbus.a
103	lib/tme/tme_serial_kb.la
104	lib/tme/tme_serial_kb.a
105	lib/tme/tme_scsi.la
106	lib/tme/tme_scsi.a	184	lib/tme/tme_scsi.a
		185	lib/tme/tme_scsi.la
		186	lib/tme/tme_scsi.so
		187	lib/tme/tme_scsi.so.0
		188	lib/tme/tme_serial_kb.a
		189	lib/tme/tme_serial_kb.la
		190	lib/tme/tme_serial_kb.so
		191	lib/tme/tme_serial_kb.so.0
107	lib/tme/tmeconfig.h	192	lib/tme/tmeconfig.h
		193	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN-ULTRA-1
		194	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN2-MULTIBUS
		195	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN3-CARRERA
		196	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SUN4-75
		197	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/my-sun-macros.txt
		198	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sun-keyboards.txt
		199	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sun3-carrera-eeprom.txt
		200	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
108	@dirrm lib/tme	201	@dirrm lib/tme
109	lib/libltdl.la	202	@dirrm include/tme/scsi
110	lib/libltdl.a	203	@dirrm include/tme/machine
111	lib/libtme.la	204	@dirrm include/tme/ic
112	lib/libtme.a	205	@dirrm include/tme/host
113	lib/libtme-generic.la	206	@dirrm include/tme/generic
114	lib/libtme-generic.a	207	@dirrm include/tme/bus
115	lib/libtme-ieee754.la	208	@dirrm include/tme
116	lib/libtme-ieee754.a
117	lib/libtmesh.la
118	lib/libtmesh.a
119	share/examples/tme/sun-keyboards.txt
120	share/examples/tme/my-sun-macros.txt
121	share/examples/tme/SUN2-MULTIBUS
122	share/examples/tme/SUN3-CARRERA
123	share/examples/tme/sun3-carrera-eeprom.txt
124	share/examples/tme/SUN4-75
125	@dirrm share/examples/tme