From 4c0e79281050d833cecde93c668dcb28277a1829 Mon Sep 17 00:00:00 2001 From: form Date: Mon, 6 May 2002 13:41:32 +0000 Subject: [PATCH] Basilisk II 0.9.1 -- Basilisk II is an Open Source 68k Macintosh emulator. That is, it enables you to run 68k MacOS software on you computer, even if you are using a different operating system. However, you still need a copy of MacOS and a Macintosh ROM image to use Basilisk II. --- emulators/BasiliskII/Makefile | 40 +++++++++++++++++++ emulators/BasiliskII/distinfo | 3 ++ .../patches/patch-src_Unix_configure_in | 33 +++++++++++++++ .../patches/patch-src_Unix_main_unix_cpp | 13 ++++++ .../patches/patch-src_Unix_serial_unix_cpp | 13 ++++++ .../patches/patch-src_uae_cpu_fpu_fpu_x86_cpp | 21 ++++++++++ emulators/BasiliskII/pkg/DESCR | 6 +++ emulators/BasiliskII/pkg/PLIST | 8 ++++ 8 files changed, 137 insertions(+) create mode 100644 emulators/BasiliskII/Makefile create mode 100644 emulators/BasiliskII/distinfo create mode 100644 emulators/BasiliskII/patches/patch-src_Unix_configure_in create mode 100644 emulators/BasiliskII/patches/patch-src_Unix_main_unix_cpp create mode 100644 emulators/BasiliskII/patches/patch-src_Unix_serial_unix_cpp create mode 100644 emulators/BasiliskII/patches/patch-src_uae_cpu_fpu_fpu_x86_cpp create mode 100644 emulators/BasiliskII/pkg/DESCR create mode 100644 emulators/BasiliskII/pkg/PLIST diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile new file mode 100644 index 00000000000..ed079056fed --- /dev/null +++ b/emulators/BasiliskII/Makefile @@ -0,0 +1,40 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2002/05/06 13:41:32 form Exp $ +# $RuOBSD: Makefile,v 1.4 2002/04/29 11:07:18 grange Exp $ +# $NetBSD: Makefile,v 1.1.1.1 2001/12/29 00:22:02 abs Exp $ + +COMMENT= "open source 68k Macintosh emulator" + +DISTNAME= BasiliskII_src_31052001 +PKGNAME= BasiliskII-0.9.1 +CATEGORIES= emulators +NEED_VERSION= 1.525 + +HOMEPAGE= http://www.uni-mainz.de/~bauec002/B2Main.html + +MAINTAINER= Alexander Yurchenko , \ + Oleg Safiullin + +# GPL +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= http://iphcip1.physik.uni-mainz.de/~cbauer/ + +LIB_DEPENDS= gtk.1.2,gdk::x11/gtk+ \ + esd.2::audio/esound + +USE_X11= Yes +USE_GMAKE= Yes + +CONFIGURE_STYLE= autoconf + +WRKDIST= ${WRKDIR}/BasiliskII-0.9 +WRKSRC= ${WRKDIR}/BasiliskII-0.9/src/Unix + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII + ${INSTALL_DATA} ${WRKDIST}/README ${PREFIX}/share/doc/BasiliskII + +.include diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo new file mode 100644 index 00000000000..1a4c5a2e346 --- /dev/null +++ b/emulators/BasiliskII/distinfo @@ -0,0 +1,3 @@ +MD5 (BasiliskII_src_31052001.tar.gz) = 5017e21226c27a4a029da0486dcf04e1 +RMD160 (BasiliskII_src_31052001.tar.gz) = df24e7aa199f8c6a25a63aa773e38c37a34fc304 +SHA1 (BasiliskII_src_31052001.tar.gz) = 0f7ddeafeb68485a7895a3d3613d07b2f3cc074d diff --git a/emulators/BasiliskII/patches/patch-src_Unix_configure_in b/emulators/BasiliskII/patches/patch-src_Unix_configure_in new file mode 100644 index 00000000000..969450a64cd --- /dev/null +++ b/emulators/BasiliskII/patches/patch-src_Unix_configure_in @@ -0,0 +1,33 @@ +$OpenBSD: patch-src_Unix_configure_in,v 1.1.1.1 2002/05/06 13:41:32 form Exp $ +--- src/Unix/configure.in.orig Fri Mar 15 17:41:29 2002 ++++ src/Unix/configure.in Fri Mar 15 18:00:30 2002 +@@ -111,14 +111,23 @@ CXXFLAGS="$CXXFLAGS $X_CFLAGS" + LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS" + + dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL. ++dnl For OpenBSD we should use -pthread + HAVE_PTHREADS=yes +-AC_CHECK_LIB(pthread, pthread_create, , [ +- AC_CHECK_LIB(c_r, pthread_create, , [ +- AC_CHECK_LIB(PTL, pthread_create, , [ +- HAVE_PTHREADS=no ++case `uname` in ++ OpenBSD*) ++ LIBS="$LIBS -pthread" ++ ;; ++ *) ++ AC_CHECK_LIB(pthread, pthread_create, , [ ++ AC_CHECK_LIB(c_r, pthread_create, , [ ++ AC_CHECK_LIB(PTL, pthread_create, , [ ++ HAVE_PTHREADS=no ++ ]) ++ ]) + ]) +- ]) +-]) ++ ;; ++esac ++ + if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then + AC_DEFINE(HAVE_PTHREADS) + fi diff --git a/emulators/BasiliskII/patches/patch-src_Unix_main_unix_cpp b/emulators/BasiliskII/patches/patch-src_Unix_main_unix_cpp new file mode 100644 index 00000000000..ea0ae42f835 --- /dev/null +++ b/emulators/BasiliskII/patches/patch-src_Unix_main_unix_cpp @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_Unix_main_unix_cpp,v 1.1.1.1 2002/05/06 13:41:32 form Exp $ +--- src/Unix/main_unix.cpp.orig Sun Mar 17 19:22:58 2002 ++++ src/Unix/main_unix.cpp Sun Mar 17 19:24:20 2002 +@@ -524,6 +524,9 @@ int main(int argc, char **argv) + + // POSIX threads available, start 60Hz thread + pthread_attr_init(&tick_thread_attr); ++#ifdef __OpenBSD__ ++#undef _POSIX_THREAD_PRIORITY_SCHEDULING ++#endif + #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) + if (geteuid() == 0) { + pthread_attr_setinheritsched(&tick_thread_attr, PTHREAD_EXPLICIT_SCHED); diff --git a/emulators/BasiliskII/patches/patch-src_Unix_serial_unix_cpp b/emulators/BasiliskII/patches/patch-src_Unix_serial_unix_cpp new file mode 100644 index 00000000000..0b15c4f2dd2 --- /dev/null +++ b/emulators/BasiliskII/patches/patch-src_Unix_serial_unix_cpp @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_Unix_serial_unix_cpp,v 1.1.1.1 2002/05/06 13:41:32 form Exp $ +--- src/Unix/serial_unix.cpp.orig Sun Mar 17 19:22:52 2002 ++++ src/Unix/serial_unix.cpp Sun Mar 17 19:23:45 2002 +@@ -68,6 +68,9 @@ public: + input_thread_active = output_thread_active = false; + + pthread_attr_init(&thread_attr); ++#ifdef __OpenBSD__ ++#undef _POSIX_THREAD_PRIORITY_SCHEDULING ++#endif + #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) + if (geteuid() == 0) { + pthread_attr_setinheritsched(&thread_attr, PTHREAD_EXPLICIT_SCHED); diff --git a/emulators/BasiliskII/patches/patch-src_uae_cpu_fpu_fpu_x86_cpp b/emulators/BasiliskII/patches/patch-src_uae_cpu_fpu_fpu_x86_cpp new file mode 100644 index 00000000000..175957caffe --- /dev/null +++ b/emulators/BasiliskII/patches/patch-src_uae_cpu_fpu_fpu_x86_cpp @@ -0,0 +1,21 @@ +$OpenBSD: patch-src_uae_cpu_fpu_fpu_x86_cpp,v 1.1.1.1 2002/05/06 13:41:32 form Exp $ +--- src/uae_cpu/fpu/fpu_x86.cpp.orig Fri Mar 15 17:20:30 2002 ++++ src/uae_cpu/fpu/fpu_x86.cpp Fri Mar 15 17:21:28 2002 +@@ -649,7 +649,7 @@ static uae_s16 extended_to_signed_16( fl + } */ + + _ASM( "fldt %2\n" +- "fistp %0\n" ++ "fistpl %0\n" + "fnstsw %1\n" + : "=m" (tmp), "=m" (sw_temp) + : "m" (*f) +@@ -689,7 +689,7 @@ static uae_s8 extended_to_signed_8( floa + } */ + + _ASM( "fldt %2\n" +- "fistp %0\n" ++ "fistpl %0\n" + "fnstsw %1\n" + : "=m" (tmp), "=m" (sw_temp) + : "m" (*f) diff --git a/emulators/BasiliskII/pkg/DESCR b/emulators/BasiliskII/pkg/DESCR new file mode 100644 index 00000000000..b353fd6fc30 --- /dev/null +++ b/emulators/BasiliskII/pkg/DESCR @@ -0,0 +1,6 @@ +Basilisk II is an Open Source 68k Macintosh emulator. That is, it +enables you to run 68k MacOS software on you computer, even if you +are using a different operating system. However, you still need a +copy of MacOS and a Macintosh ROM image to use Basilisk II. + +WWW: ${HOMEPAGE} diff --git a/emulators/BasiliskII/pkg/PLIST b/emulators/BasiliskII/pkg/PLIST new file mode 100644 index 00000000000..99b451e36c2 --- /dev/null +++ b/emulators/BasiliskII/pkg/PLIST @@ -0,0 +1,8 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2002/05/06 13:41:32 form Exp $ +bin/BasiliskII +man/man1/BasiliskII.1 +share/BasiliskII/keycodes +share/BasiliskII/fbdevices +share/doc/BasiliskII/README +@dirrm share/doc/BasiliskII +@dirrm share/BasiliskII