diff options
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/twin/Makefile | 44 | ||||
-rw-r--r-- | emulators/twin/distinfo | 2 | ||||
-rw-r--r-- | emulators/twin/files/patch-ad | 11 | ||||
-rw-r--r-- | emulators/twin/files/patch-af | 11 | ||||
-rw-r--r-- | emulators/twin/files/patch-ag | 10 | ||||
-rw-r--r-- | emulators/twin/files/patch-ah | 10 | ||||
-rw-r--r-- | emulators/twin/pkg-descr | 11 | ||||
-rw-r--r-- | emulators/twin/pkg-message | 2 | ||||
-rw-r--r-- | emulators/twin/pkg-plist | 65 |
9 files changed, 100 insertions, 66 deletions
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile index 3ff3558e69d7..c94440b6c0f3 100644 --- a/emulators/twin/Makefile +++ b/emulators/twin/Makefile @@ -6,35 +6,45 @@ # PORTNAME= twin -PORTVERSION= 1999.12.30 +PORTVERSION= 3.1.14 +PORTEPOCH= 1 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= +PLIST_SUB= LIBVER="${LIBVER}" +INSTALLS_SHLIB= yes -# 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 +FMT?= /usr/bin/fmt -pre-configure: - ${ECHO} "configure_args = ${CONFIGURE_ARGS}" - ${ECHO} "configure_env = ${CONFIGURE_ENV}" +LIBRARIES= libadvapi32.so libcomctl32.so libcomm.so \ + libcommdlg.so libddeml.so libkeyboard.so \ + liblzexpand.so libmmsystem.so libmsvcrt.so \ + libolecli.so libolesvr.so libpe32.so \ + libshell.so libsound.so libsystem.so \ + libtoolhelp.so libtwin32.so libversion.so \ + libw32sys.so libwin87em.so libwinsock.so \ + libwinspool.so +LIBVER= 0 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 +# version these libraries to make ldconfig happy +.for lib in ${LIBRARIES} + @${LN} -sf ${lib} ${PREFIX}/lib/${lib}.${LIBVER} +.endfor + @${FMT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/emulators/twin/distinfo b/emulators/twin/distinfo index ba2e7a0f866b..1d93567e03ca 100644 --- a/emulators/twin/distinfo +++ b/emulators/twin/distinfo @@ -1 +1 @@ -MD5 (twin-19991230.tar.gz) = 17410b399b7d6cfa0e531d439b22f7f8 +MD5 (twin-src-3.1.14.tar.gz) = 5153dbc22050dea8c28bbabfea5487fc diff --git a/emulators/twin/files/patch-ad b/emulators/twin/files/patch-ad deleted file mode 100644 index 2d6671cd347f..000000000000 --- a/emulators/twin/files/patch-ad +++ /dev/null @@ -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 --git a/emulators/twin/files/patch-af b/emulators/twin/files/patch-af deleted file mode 100644 index a26773f202c9..000000000000 --- a/emulators/twin/files/patch-af +++ /dev/null @@ -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 --git a/emulators/twin/files/patch-ag b/emulators/twin/files/patch-ag new file mode 100644 index 000000000000..897408c1db89 --- /dev/null +++ b/emulators/twin/files/patch-ag @@ -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 --git a/emulators/twin/files/patch-ah b/emulators/twin/files/patch-ah new file mode 100644 index 000000000000..e268f951e078 --- /dev/null +++ b/emulators/twin/files/patch-ah @@ -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 --git a/emulators/twin/pkg-descr b/emulators/twin/pkg-descr index 3eef8a8a5a83..87d51d1a3a64 100644 --- a/emulators/twin/pkg-descr +++ b/emulators/twin/pkg-descr @@ -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 --git a/emulators/twin/pkg-message b/emulators/twin/pkg-message new file mode 100644 index 000000000000..b8e47d326a69 --- /dev/null +++ b/emulators/twin/pkg-message @@ -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 --git a/emulators/twin/pkg-plist b/emulators/twin/pkg-plist index c841a16ba881..2d992a3b8c9d 100644 --- a/emulators/twin/pkg-plist +++ b/emulators/twin/pkg-plist @@ -1,44 +1,65 @@ bin/xwin32 lib/libadvapi32.so +lib/libadvapi32.so.%%LIBVER%% lib/libcomctl32.so +lib/libcomctl32.so.%%LIBVER%% lib/libcomm.so +lib/libcomm.so.%%LIBVER%% lib/libcommdlg.so +lib/libcommdlg.so.%%LIBVER%% lib/libddeml.so -lib/libdebug.so +lib/libddeml.so.%%LIBVER%% lib/libdll.a lib/libkeyboard.so -lib/liblz32.so +lib/libkeyboard.so.%%LIBVER%% +lib/liblzexpand.so +lib/liblzexpand.so.%%LIBVER%% lib/libmmsystem.so +lib/libmmsystem.so.%%LIBVER%% lib/libmsvcrt.so +lib/libmsvcrt.so.%%LIBVER%% lib/libolecli.so +lib/libolecli.so.%%LIBVER%% lib/libolesvr.so +lib/libolesvr.so.%%LIBVER%% lib/libpe32.so -lib/libreadline.a +lib/libpe32.so.%%LIBVER%% lib/libshell.so +lib/libshell.so.%%LIBVER%% lib/libsound.so +lib/libsound.so.%%LIBVER%% lib/libsystem.so +lib/libsystem.so.%%LIBVER%% lib/libtoolhelp.so +lib/libtoolhelp.so.%%LIBVER%% lib/libtwin32.so +lib/libtwin32.so.%%LIBVER%% lib/libversion.so +lib/libversion.so.%%LIBVER%% +lib/libw32sys.so +lib/libw32sys.so.%%LIBVER%% lib/libwin87em.so +lib/libwin87em.so.%%LIBVER%% lib/libwinsock.so +lib/libwinsock.so.%%LIBVER%% 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 +lib/libwinspool.so.%%LIBVER%% +%%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 |