a) Unbreak the port for 4.8-STABLE

b) Populate ONLY_FOR_ARCHS with the supported platforms

PR:		52390
Submitted by:	"Pedro F. Giffuni" <giffunip@yahoo.com>

5 files changed, 76 insertions, 8 deletions

diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 9c00d58a1255..d5106d148aa1 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -15,16 +15,31 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Willows Toolkit for migrating and developing Windows applications
 
+ONLY_FOR_ARCHS= i386 alpha powerpc
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XLIB=	yes
-USE_GMAKE=	yes
+USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--disable-debugger
+.if ${MACHINE_ARCH} != "i386"
+  CONFIGURE_ARGS+= --disable-intp
+.endif
+USE_GMAKE=	yes
+
 ALL_TARGET=	depend world
+
 PLIST_SUB=	LIBVER="${LIBVER}"
 INSTALLS_SHLIB=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Dumps core at making RscData.res.c"
+.endif
+
 FMT?=	/usr/bin/fmt
 
 LIBRARIES=	libadvapi32.so libcomctl32.so libcomm.so \
@@ -37,6 +52,9 @@ LIBRARIES=	libadvapi32.so libcomctl32.so libcomm.so \
 	libwinspool.so
 LIBVER=	0
 
+post-configure:
+	@${REINPLACE_CMD} 's|bison -y|yacc|' ${WRKSRC}/Make.rules # dirty
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -48,4 +66,4 @@ post-install:
 .endfor
 	@${FMT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/twin/files/patch-ae b/emulators/twin/files/patch-ae
deleted file mode 100644
index fa473e8b95ab..000000000000
--- a/emulators/twin/files/patch-ae
+++ /dev/null
@@ -1,5 +0,0 @@
---- configure.orig	Sun Nov 14 05:23:12 1999
-+++ configure	Sat Feb 12 18:13:09 2000
-@@ -2684 +2684 @@
--   i*86-unknown-freebsd* )
-+   *-*-freebsd* )
diff --git a/emulators/twin/files/patch-configure.in b/emulators/twin/files/patch-configure.in
new file mode 100644
index 000000000000..4bb4b472948a
--- /dev/null
+++ b/emulators/twin/files/patch-configure.in
@@ -0,0 +1,33 @@
+--- configure.in.orig	Fri Aug  1 23:23:48 2003
++++ configure.in	Fri Aug  1 23:27:42 2003
+@@ -131,6 +131,10 @@
+ 	TARGET=sunos
+ 	;;
+ 
++   alpha-*-freebsd* )
++	TARGET=freebsd
++	;;
++
+    alpha-*-linux* )
+ 	TARGET=linux
+ 	;;
+@@ -143,7 +147,7 @@
+ 	TARGET=sco
+ 	;;
+ 
+-   i*86-unknown-freebsd* )
++   i*86-*-freebsd* )
+ 	TARGET=freebsd
+ 	;;
+ 
+@@ -153,6 +157,10 @@
+ 
+    i*86-*-cygwin* )
+ 	TARGET=cygwin
++	;;
++
++   powerpc-*-freebsd* )
++	TARGET=freebsd
+ 	;;
+ 
+    powerpc-*-linux* )
diff --git a/emulators/twin/files/patch-msdos+mfs_fileio.c b/emulators/twin/files/patch-msdos+mfs_fileio.c
new file mode 100644
index 000000000000..bc35af4b769e
--- /dev/null
+++ b/emulators/twin/files/patch-msdos+mfs_fileio.c
@@ -0,0 +1,22 @@
+--- msdos/mfs_fileio.c.orig	Sat Aug  2 16:02:08 2003
++++ msdos/mfs_fileio.c	Sat Aug  2 16:03:20 2003
+@@ -213,8 +213,7 @@
+            (strcmp(filename, xdos.fileio[slot].filename) == 0) ) {
+           /* Get the handle */
+           if ((handle = gethandle()) < 0) {
+-              ERRSTR((LF_ERROR,"mfs_delete cannot get handle for file %s %d
+- %d\n", filename, errno, slot));
++              ERRSTR((LF_ERROR,"mfs_delete cannot get handle for file %s %d %d\n", filename, errno, slot));
+               return MAKELONG(NO_HANDLES & 0xffff,0xffff);
+           }
+           xdos.fileptr[handle] = &xdos.fileio[slot];
+@@ -232,8 +231,7 @@
+      	       return unlink(filename);
+               }
+           }
+-          else ERRSTR((LF_ERROR,"mfs_delete : invalid handle %d for file
+-%s\n",handle, filename));
++          else ERRSTR((LF_ERROR,"mfs_delete : invalid handle %d for file %s\n",handle, filename));
+          }
+      }
+      /* At this point, either the file was fclosed by us, or it was
diff --git a/emulators/twin/pkg-message b/emulators/twin/pkg-message
index b8e47d326a69..2e6a94c599c6 100644
--- a/emulators/twin/pkg-message
+++ b/emulators/twin/pkg-message
@@ -1,2 +1,2 @@
 In order to use twin you need to build and install a new kernel
-with options USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG.
+with options SYSVSHM, SYSVSEM, and SYSVMSG.