Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Jul 2001 14:09:00 -0700 (PDT)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/29176: Update port: emulators/twin to 3.1.14
Message-ID:  <200107232109.f6NL90648321@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         29176
>Category:       ports
>Synopsis:       Update port: emulators/twin to 3.1.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 23 14:10:02 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 3.1.14

New file:
pkg-message
files/patch-ag  files/patch-ah

Remove file:
files/patch-ad  files/patch-af

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/emulators/twin/Makefile emulators/twin/Makefile
--- /usr/ports/emulators/twin/Makefile	Thu Mar 22 07:44:00 2001
+++ emulators/twin/Makefile	Fri Jul 20 09:21:24 2001
@@ -6,35 +6,27 @@
 #
 
 PORTNAME=	twin
-PORTVERSION=	1999.12.30
+PORTVERSION=	3.1.14
 CATEGORIES=	emulators devel
-MASTER_SITES=	ftp://ftp.willows.com/pub/development/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+MASTER_SITES=	ftp://ftp.willows.com/pub/twin/
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		$(WRKDIR)/twin
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 USE_XLIB=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-debugger
 ALL_TARGET=	depend world
-CONFIGURE_ARGS=
-
-# This hack is in order to avoid a build error with optimizations on,
-# a real bugfix will surely come soon.
-pre-patch:
-	${CP} $(WRKSRC)/windows/if32.s $(WRKSRC)/windows/if32.S
-
-pre-configure:
-	${ECHO} "configure_args = ${CONFIGURE_ARGS}"
-	${ECHO} "configure_env = ${CONFIGURE_ENV}"
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/twin
-	${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/twin
-	${GZIP_CMD} ${PREFIX}/share/doc/twin/*
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/documentation/* ${DOCSDIR}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/emulators/twin/distinfo emulators/twin/distinfo
--- /usr/ports/emulators/twin/distinfo	Thu Feb 24 22:46:46 2000
+++ emulators/twin/distinfo	Fri Jul 20 00:53:15 2001
@@ -1 +1 @@
-MD5 (twin-19991230.tar.gz) = 17410b399b7d6cfa0e531d439b22f7f8
+MD5 (twin-src-3.1.14.tar.gz) = 5153dbc22050dea8c28bbabfea5487fc
diff -urN /usr/ports/emulators/twin/files/patch-ad emulators/twin/files/patch-ad
--- /usr/ports/emulators/twin/files/patch-ad	Wed Dec 29 18:12:32 1999
+++ emulators/twin/files/patch-ad	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- windows/Makefile.in.orig	Sun Jun 13 06:20:02 1999
-+++ windows/Makefile.in	Tue Dec 28 18:13:18 1999
-@@ -69,7 +69,7 @@
- BIN32_C_SRCS_1  = Strings32.c Profile32.c vsprintf32.c lib32.c
- BIN32_C_SRCS    = $(BIN32_C_SRCS_$(TWIN_BIN32))
- BIN32_s_SRCS_0  =
--BIN32_s_SRCS_1  = if32.s
-+BIN32_s_SRCS_1  = if32.S
- BIN32_s_SRCS    = $(BIN32_s_SRCS_$(TWIN_BIN32))
- 
- #
diff -urN /usr/ports/emulators/twin/files/patch-af emulators/twin/files/patch-af
--- /usr/ports/emulators/twin/files/patch-af	Wed Dec 29 18:12:32 1999
+++ emulators/twin/files/patch-af	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- windows/Execfreebsd.c.orig	Tue Dec 28 19:25:11 1999
-+++ windows/Execfreebsd.c	Tue Dec 28 19:30:39 1999
-@@ -171,7 +171,7 @@
- 	int rc;
-     sact.sa_handler  = TWIN_GPFSigHandler;
-     sact.sa_flags    = SA_RESTART;
--    sact.sa_mask     = 0;
-+    sigemptyset(&sact.sa_mask);
-     rc =  sigaction(sig, &sact, NULL);
-     return rc;
- }
diff -urN /usr/ports/emulators/twin/files/patch-ag emulators/twin/files/patch-ag
--- /usr/ports/emulators/twin/files/patch-ag	Thu Jan  1 09:00:00 1970
+++ emulators/twin/files/patch-ag	Fri Jul 20 02:27:10 2001
@@ -0,0 +1,10 @@
+--- dlls/winsock/WinSock.c.orig	Fri Jan 12 18:38:47 2001
++++ dlls/winsock/WinSock.c	Fri Jul 20 02:23:17 2001
+@@ -28,6 +28,7 @@
+ 
+  */
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
diff -urN /usr/ports/emulators/twin/files/patch-ah emulators/twin/files/patch-ah
--- /usr/ports/emulators/twin/files/patch-ah	Thu Jan  1 09:00:00 1970
+++ emulators/twin/files/patch-ah	Fri Jul 20 02:27:01 2001
@@ -0,0 +1,10 @@
+--- dlls/winsock/WinSockIF.c.orig	Sat Jan 13 18:26:12 2001
++++ dlls/winsock/WinSockIF.c	Fri Jul 20 02:25:35 2001
+@@ -28,6 +28,7 @@
+ 
+  */
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
diff -urN /usr/ports/emulators/twin/pkg-descr emulators/twin/pkg-descr
--- /usr/ports/emulators/twin/pkg-descr	Thu Mar 22 08:03:35 2001
+++ emulators/twin/pkg-descr	Fri Jul 20 02:05:33 2001
@@ -1,6 +1,9 @@
-This is a development version of the Willows toolkit. While this code
-still needs more development to work fine, developers are encouraged to
-contribute to the Twine (Twin-Experimental) project instead since all new
-code will then be available under a benign license to the WINE people.
+The Willows TWIN libraries are both a set of native platform libraries
+and an emulator program to emulate the Microsoft Win32 API.  The
+emulator program allows executing Windows binary programs on supported
+Unix platforms, on native Intel x86 processors, and through the
+built-in intstruction set interpreter.  The native libraries allow
+programmers to natively build Win32 and MFC applications from source
+code.
 
 WWW: http://www.willows.com/
diff -urN /usr/ports/emulators/twin/pkg-message emulators/twin/pkg-message
--- /usr/ports/emulators/twin/pkg-message	Thu Jan  1 09:00:00 1970
+++ emulators/twin/pkg-message	Fri Jul 20 02:56:19 2001
@@ -0,0 +1,2 @@
+In order to use twin you need to build and install a new kernel with
+options USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG.
diff -urN /usr/ports/emulators/twin/pkg-plist emulators/twin/pkg-plist
--- /usr/ports/emulators/twin/pkg-plist	Thu Jul  6 05:03:06 2000
+++ emulators/twin/pkg-plist	Fri Jul 20 02:58:59 2001
@@ -4,41 +4,40 @@
 lib/libcomm.so
 lib/libcommdlg.so
 lib/libddeml.so
-lib/libdebug.so
 lib/libdll.a
 lib/libkeyboard.so
-lib/liblz32.so
+lib/liblzexpand.so
 lib/libmmsystem.so
 lib/libmsvcrt.so
 lib/libolecli.so
 lib/libolesvr.so
 lib/libpe32.so
-lib/libreadline.a
 lib/libshell.so
 lib/libsound.so
 lib/libsystem.so
 lib/libtoolhelp.so
 lib/libtwin32.so
 lib/libversion.so
+lib/libw32sys.so
 lib/libwin87em.so
 lib/libwinsock.so
 lib/libwinspool.so
-share/doc/twin/bin-convert.txt.gz
-share/doc/twin/config.doc.gz
-share/doc/twin/debugger.1.gz
-share/doc/twin/dll-binary.txt.gz
-share/doc/twin/dll-native.txt.gz
-share/doc/twin/lib-config.txt.gz
-share/doc/twin/lib-debug.txt.gz
-share/doc/twin/lib-porting.txt.gz
-share/doc/twin/lib-qna.txt.gz
-share/doc/twin/lib-thunk.c.gz
-share/doc/twin/lib-verify.txt.gz
-share/doc/twin/rc.1.gz
-share/doc/twin/readme.twinrc.gz
-share/doc/twin/sample.twinrc.gz
-share/doc/twin/src-issues.txt.gz
-share/doc/twin/twinrc.doc.gz
-share/doc/twin/win.ini.gz
-share/doc/twin/wrt-setup.txt.gz
-@dirrm share/doc/twin
+%%PORTDOCS%%share/doc/twin/bin-convert.txt
+%%PORTDOCS%%share/doc/twin/config.doc
+%%PORTDOCS%%share/doc/twin/debugger.1
+%%PORTDOCS%%share/doc/twin/dll-binary.txt
+%%PORTDOCS%%share/doc/twin/dll-native.txt
+%%PORTDOCS%%share/doc/twin/lib-config.txt
+%%PORTDOCS%%share/doc/twin/lib-debug.txt
+%%PORTDOCS%%share/doc/twin/lib-porting.txt
+%%PORTDOCS%%share/doc/twin/lib-qna.txt
+%%PORTDOCS%%share/doc/twin/lib-thunk.c
+%%PORTDOCS%%share/doc/twin/lib-verify.txt
+%%PORTDOCS%%share/doc/twin/rc.1
+%%PORTDOCS%%share/doc/twin/readme.twinrc
+%%PORTDOCS%%share/doc/twin/sample.twinrc
+%%PORTDOCS%%share/doc/twin/src-issues.txt
+%%PORTDOCS%%share/doc/twin/twinrc.doc
+%%PORTDOCS%%share/doc/twin/win.ini
+%%PORTDOCS%%share/doc/twin/wrt-setup.txt
+%%PORTDOCS%%@dirrm share/doc/twin

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107232109.f6NL90648321>