Add Wine 990328 as "wine-current", since this release makes Win32

nonfunctional on NetBSD 1.4 and earlier.  (It is, however, more stable for
Win16 applications.)

10 files changed, 215 insertions, 0 deletions

diff --git a/emulators/wine-current/Makefile b/emulators/wine-current/Makefile
new file mode 100644
index 00000000000..1c0247089f2
--- /dev/null
+++ b/emulators/wine-current/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.1.1 1999/04/15 20:50:46 tv Exp $
+
+DISTNAME=		Wine-990328
+PKGNAME=		wine-990328
+WRKSRC=			${WRKDIR}/${PKGNAME}
+CATEGORIES=		emulators
+MASTER_SITES=		${MASTER_SITE_SUNSITE:=/ALPHA/wine/development/}
+ONLY_FOR_ARCHS=		i386
+
+MAINTAINER=		tv@netbsd.org
+HOMEPAGE=		http://www.winehq.com/
+
+DEPENDS+=		xpm-3.4k:../../graphics/xpm \
+			ncurses-1.9.9g:../../devel/ncurses
+
+USE_X11=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--enable-dll
+CONFIGURE_ENV=		CC="${CC} -idirafter ${LOCALBASE}/include"
+MAKE_ENV=		LDOPTIONS="${LDFLAGS}"
+LDFLAGS=		-L${LOCALBASE}/lib
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.example
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine-current/files/md5 b/emulators/wine-current/files/md5
new file mode 100644
index 00000000000..88f8b084dd9
--- /dev/null
+++ b/emulators/wine-current/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 1999/04/15 20:50:47 tv Exp $
+
+MD5 (Wine-990328.tar.gz) = c753471f829138d43ab7dde6f20875fd
diff --git a/emulators/wine-current/patches/patch-aa b/emulators/wine-current/patches/patch-aa
new file mode 100644
index 00000000000..089d8da75cc
--- /dev/null
+++ b/emulators/wine-current/patches/patch-aa
@@ -0,0 +1,44 @@
+--- configure.in.orig	Mon Apr 12 22:40:51 1999
++++ configure.in	Mon Apr 12 22:40:54 1999
+@@ -304,29 +304,29 @@
+ LDSHARED=""
+ if test "$LIB_TARGET" = "libwine.so.1.0"
+ then
+-  AC_CACHE_CHECK("whether we can build a Linux dll",
+-                 ac_cv_c_dll_linux,
++  AC_CACHE_CHECK("whether we can build a NetBSD dll",
++                 ac_cv_c_dll_netbsd,
+   [saved_cflags=$CFLAGS
+-  CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0"
+-  AC_TRY_LINK(,[return 1],ac_cv_c_dll_linux="yes",ac_cv_c_dll_linux="no")
++  CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive"
++  AC_TRY_LINK(,[return 1],ac_cv_c_dll_netbsd="yes",ac_cv_c_dll_netbsd="no")
+   CFLAGS=$saved_cflags
+   ])
+-  if test "$ac_cv_c_dll_linux" = "yes"
++  if test "$ac_cv_c_dll_netbsd" = "yes"
+   then
+     DLLFLAGS="-fPIC"
+-    LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so"
++    LDSHARED="ld -Bshareable -Bforcearchive"
+   else
+-    AC_CACHE_CHECK("whether we can build a NetBSD dll",
+-                   ac_cv_c_dll_netbsd,
++    AC_CACHE_CHECK("whether we can build a Linux dll",
++                   ac_cv_c_dll_linux,
+     [saved_cflags=$CFLAGS
+-    CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive"
+-    AC_TRY_LINK(,[return 1],ac_cv_c_dll_netbsd="yes",ac_cv_c_dll_netbsd="no")
++    CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0"
++    AC_TRY_LINK(,[return 1],ac_cv_c_dll_linux="yes",ac_cv_c_dll_linux="no")
+     CFLAGS=$saved_cflags
+     ])
+-    if test "$ac_cv_c_dll_netbsd" = "yes"
++    if test "$ac_cv_c_dll_linux" = "yes"
+     then
+       DLLFLAGS="-fPIC"
+-      LDSHARED="ld -Bshareable -Bforcearchive"
++      LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so"
+     fi
+   fi
+   if test "$ac_cv_c_dll_linux" = "no" -a "$ac_cv_c_dll_netbsd" = "no"
diff --git a/emulators/wine-current/patches/patch-ab b/emulators/wine-current/patches/patch-ab
new file mode 100644
index 00000000000..a1fbb15c053
--- /dev/null
+++ b/emulators/wine-current/patches/patch-ab
@@ -0,0 +1,90 @@
+--- configure.orig	Mon Apr 12 22:40:50 1999
++++ configure	Mon Apr 12 22:41:23 1999
+@@ -3487,13 +3487,13 @@
+ LDSHARED=""
+ if test "$LIB_TARGET" = "libwine.so.1.0"
+ then
+-  echo $ac_n "checking "whether we can build a Linux dll"""... $ac_c" 1>&6
+-echo "configure:3492: checking "whether we can build a Linux dll"" >&5
+-if eval "test \"`echo '$''{'ac_cv_c_dll_linux'+set}'`\" = set"; then
++  echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6
++echo "configure:3492: checking "whether we can build a NetBSD dll"" >&5
++if eval "test \"`echo '$''{'ac_cv_c_dll_netbsd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   saved_cflags=$CFLAGS
+-  CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0"
++  CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive"
+   cat > conftest.$ac_ext <<EOF
+ #line 3499 "configure"
+ #include "confdefs.h"
+@@ -3504,31 +3504,31 @@
+ EOF
+ if { (eval echo configure:3506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+-  ac_cv_c_dll_linux="yes"
++  ac_cv_c_dll_netbsd="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+-  ac_cv_c_dll_linux="no"
++  ac_cv_c_dll_netbsd="no"
+ fi
+ rm -f conftest*
+   CFLAGS=$saved_cflags
+   
+ fi
+ 
+-echo "$ac_t""$ac_cv_c_dll_linux" 1>&6
+-  if test "$ac_cv_c_dll_linux" = "yes"
++echo "$ac_t""$ac_cv_c_dll_netbsd" 1>&6
++  if test "$ac_cv_c_dll_netbsd" = "yes"
+   then
+     DLLFLAGS="-fPIC"
+-    LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so"
++    LDSHARED="ld -Bshareable -Bforcearchive"
+   else
+-    echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6
+-echo "configure:3527: checking "whether we can build a NetBSD dll"" >&5
+-if eval "test \"`echo '$''{'ac_cv_c_dll_netbsd'+set}'`\" = set"; then
++    echo $ac_n "checking "whether we can build a Linux dll"""... $ac_c" 1>&6
++echo "configure:3527: checking "whether we can build a Linux dll"" >&5
++if eval "test \"`echo '$''{'ac_cv_c_dll_linux'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   saved_cflags=$CFLAGS
+-    CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive"
++    CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0"
+     cat > conftest.$ac_ext <<EOF
+ #line 3534 "configure"
+ #include "confdefs.h"
+@@ -3539,23 +3539,23 @@
+ EOF
+ if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+-  ac_cv_c_dll_netbsd="yes"
++  ac_cv_c_dll_linux="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+-  ac_cv_c_dll_netbsd="no"
++  ac_cv_c_dll_linux="no"
+ fi
+ rm -f conftest*
+     CFLAGS=$saved_cflags
+     
+ fi
+ 
+-echo "$ac_t""$ac_cv_c_dll_netbsd" 1>&6
+-    if test "$ac_cv_c_dll_netbsd" = "yes"
++echo "$ac_t""$ac_cv_c_dll_linux" 1>&6
++    if test "$ac_cv_c_dll_linux" = "yes"
+     then
+       DLLFLAGS="-fPIC"
+-      LDSHARED="ld -Bshareable -Bforcearchive"
++      LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so"
+     fi
+   fi
+   if test "$ac_cv_c_dll_linux" = "no" -a "$ac_cv_c_dll_netbsd" = "no"
diff --git a/emulators/wine-current/patches/patch-ac b/emulators/wine-current/patches/patch-ac
new file mode 100644
index 00000000000..fb6501b17fa
--- /dev/null
+++ b/emulators/wine-current/patches/patch-ac
@@ -0,0 +1,10 @@
+--- server/Makefile.in.orig	Tue Apr 13 17:46:37 1999
++++ server/Makefile.in	Tue Apr 13 17:46:46 1999
+@@ -34,6 +34,6 @@
+ @MAKE_RULES@
+ 
+ wineserver: $(OBJS) $(MAIN_OBJS)
+-	$(CC) -o $(PROGRAMS) $(OBJS) $(MAIN_OBJS) $(LIBS)
++	$(CC) -o $(PROGRAMS) $(OBJS) $(MAIN_OBJS) $(LDOPTIONS) $(LIBS)
+ 
+ ### Dependencies:
diff --git a/emulators/wine-current/patches/patch-ad b/emulators/wine-current/patches/patch-ad
new file mode 100644
index 00000000000..1394ce4f7a5
--- /dev/null
+++ b/emulators/wine-current/patches/patch-ad
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Apr 14 17:25:20 1999
++++ Makefile.in	Wed Apr 14 17:25:28 1999
+@@ -183,7 +183,7 @@
+ 	$(RANLIB) $@
+ 
+ libwine.so.1.0: $(LIBOBJS) $(X11OBJS)
+-	$(LDSHARED) -o$@ $(LIBOBJS) $(X11OBJS) $(LDOPTIONS)
++	$(LDSHARED) -o$@ $(LIBOBJS) $(X11OBJS)
+ 	ln -sf $@ libwine.so
+ 
+ install_emu: install_lib
diff --git a/emulators/wine-current/pkg/COMMENT b/emulators/wine-current/pkg/COMMENT
new file mode 100644
index 00000000000..bae837a9f06
--- /dev/null
+++ b/emulators/wine-current/pkg/COMMENT
@@ -0,0 +1 @@
+Beta Windows (3.1x, 95, NT) emulator
diff --git a/emulators/wine-current/pkg/DESCR b/emulators/wine-current/pkg/DESCR
new file mode 100644
index 00000000000..e379fe2c644
--- /dev/null
+++ b/emulators/wine-current/pkg/DESCR
@@ -0,0 +1,11 @@
+Wine is a program which allows running Microsoft Windows programs
+(including DOS, Windows 3.x and Win32 executables) on Unix.  It consists
+of a program loader which loads and executes an Microsoft Windows binary,
+and a library that implements Windows API calls using their Unix or X11
+equivalents. The library may also be used for porting Win32 code into
+native Unix executables.
+
+Wine is free software, and its license (contained in the file LICENSE) is
+BSD style.  Basically, you can do anything with it except claim that you
+wrote it.
+
diff --git a/emulators/wine-current/pkg/MESSAGE b/emulators/wine-current/pkg/MESSAGE
new file mode 100644
index 00000000000..cd3ea2918b1
--- /dev/null
+++ b/emulators/wine-current/pkg/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+
+Wine is capable of running most Win16 (Windows 3.11-compatible)
+applications under NetBSD 1.3 and 1.4.  It currently does not support
+Win32 applications, though it will do so under a later release of NetBSD.
+
+===========================================================================
diff --git a/emulators/wine-current/pkg/PLIST b/emulators/wine-current/pkg/PLIST
new file mode 100644
index 00000000000..0ee0425a376
--- /dev/null
+++ b/emulators/wine-current/pkg/PLIST
@@ -0,0 +1,12 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/15 20:50:47 tv Exp $
+bin/dosmod
+bin/wine
+etc/wine.conf.example
+include/wine/windef.h
+include/wine/windows.h
+include/wine/wingdi.h
+include/wine/winuser.h
+lib/libwine.so.1.0
+lib/wine.sym
+man/man1/wine.1
+@dirrm include/wine