cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 1.0/01052006

Browse Source
This commit is contained in:
jasper 2010-03-25 08:10:56 +00:00
parent 078368da83
commit b4fec8d64e
10 changed files with 88 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
emulators/BasiliskII/Makefile
View File

@ -1,37 +1,44 @@
# $OpenBSD: Makefile,v 1.16 2009/08/10 06:31:09 kili Exp $
# $OpenBSD: Makefile,v 1.17 2010/03/25 08:10:56 jasper 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.1p3
DISTNAME= BasiliskII_src_01052006
PKGNAME= BasiliskII-1.0
CATEGORIES= emulators
HOMEPAGE= http://basilisk.cebix.net/
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xi Xxf86dga Xxf86vm audiofile c \
glib gmodule iconv intl m pthread pthread-stubs \
stdc++ sndio xcb
MASTER_SITES= http://basilisk.cebix.net/downloads/
MODULES= devel/gettext
LIB_DEPENDS= gtk.>=1.2,gdk::x11/gtk+ \
esd.>=2::audio/esound
MASTER_SITES= http://www.phil.uu.nl/~lievisse/distfiles/
EXTRACT_SUFX= .tar.bz2
WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xxf86dga Xxf86vm
WANTLIB += atk-1.0 audiofile c cairo expat fontconfig freetype
WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread pthread-stubs
WANTLIB += sndio stdc++ xcb z
LIB_DEPENDS= esd.>=2::audio/esound \
gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
USE_X11= Yes
USE_GMAKE= Yes
AUTOCONF_VERSION= 2.13
AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= autoconf
WRKDIST= ${WRKDIR}/BasiliskII-0.9
WRKSRC= ${WRKDIR}/BasiliskII-0.9/src/Unix
WRKDIST= ${WRKDIR}/BasiliskII-1.0
WRKSRC= ${WRKDIR}/BasiliskII-1.0/src/Unix
NO_REGRESS= Yes

10
emulators/BasiliskII/distinfo
View File

@ -1,5 +1,5 @@
MD5 (BasiliskII_src_31052001.tar.gz) = UBfiEibCekoCnaBIbc8E4Q==
RMD160 (BasiliskII_src_31052001.tar.gz) = 3yTnqhmfjGolpjqnc+OMN6NPwwQ=
SHA1 (BasiliskII_src_31052001.tar.gz) = D33er+toSFp4laPTYT0HsvPMB00=
SHA256 (BasiliskII_src_31052001.tar.gz) = YnuUs6ryPDdNcsMITGxkhSGlC6RZ5T6xwFMu1OApJdU=
SIZE (BasiliskII_src_31052001.tar.gz) = 465882
MD5 (BasiliskII_src_01052006.tar.bz2) = 3+ngiGSRM0hbriinE5eUgQ==
RMD160 (BasiliskII_src_01052006.tar.bz2) = uxoGHFBL19KLhp4O7CgGz4p5z40=
SHA1 (BasiliskII_src_01052006.tar.bz2) = Y3OzOt9srsU8XR7UagCtysia07s=
SHA256 (BasiliskII_src_01052006.tar.bz2) = Z4Ly7TWH13kFV6CZT1t0cteife0PFZi5OA76veFr08w=
SIZE (BasiliskII_src_01052006.tar.bz2) = 1310908

12
emulators/BasiliskII/patches/patch-src_Unix_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Unix_Makefile_in,v 1.1 2004/01/25 20:38:22 pvalchev Exp $
--- src/Unix/Makefile.in.orig 2004-01-25 13:25:23.000000000 -0700
+++ src/Unix/Makefile.in 2004-01-25 13:25:39.000000000 -0700
@@ -107,7 +107,7 @@ $(OBJ_DIR)/cpuopti: $(OBJ_DIR)/cpuopti.o
$(OBJ_DIR)/build68k: $(OBJ_DIR)/build68k.o
$(CC) $(LDFLAGS) -o $(OBJ_DIR)/build68k $(OBJ_DIR)/build68k.o
$(OBJ_DIR)/gencpu: $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
- $(CC) $(LDFLAGS) -o $(OBJ_DIR)/gencpu $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
+ $(CXX) $(LDFLAGS) -o $(OBJ_DIR)/gencpu $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
cpudefs.cpp: $(OBJ_DIR)/build68k ../uae_cpu/table68k
$(OBJ_DIR)/build68k <../uae_cpu/table68k >cpudefs.cpp
cpustbl.cpp: cpuemu.cpp

33
emulators/BasiliskII/patches/patch-src_Unix_configure_ac Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_Unix_configure_ac,v 1.1 2010/03/25 08:10:56 jasper Exp $
--- src/Unix/configure.ac.orig Thu Mar 25 08:53:10 2010
+++ src/Unix/configure.ac Thu Mar 25 08:54:55 2010
@@ -194,14 +194,23 @@ if [[ "x$WANT_SDL" = "xno" ]]; then
fi
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, 1, [Define if pthreads are available.])
fi

73
emulators/BasiliskII/patches/patch-src_Unix_configure_in
View File

@ -1,73 +0,0 @@
$OpenBSD: patch-src_Unix_configure_in,v 1.2 2002/09/19 17:37:43 pvalchev Exp $
--- src/Unix/configure.in.orig Thu May 24 09:06:13 2001
+++ src/Unix/configure.in Thu Sep 19 11:14:25 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
@@ -389,22 +398,23 @@ AC_CACHE_CHECK("whether sigaction handle
AC_TRANSLATE_DEFINE(SIGACTION_NEED_REINSTALL, "$ac_cv_sigaction_need_reinstall")
dnl Check if extended signals are supported.
-AC_CACHE_CHECK("whether your system supports extended signal handlers",
- ac_cv_have_extended_signals, [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_RUN([
- #define HAVE_SIGINFO_T 1
- #define CONFIGURE_TEST
- #include "sigsegv.cpp"
- ],
- [ac_cv_have_extended_signals=yes],
- [ac_cv_have_extended_signals=no]
- )
- AC_LANG_RESTORE
- ]
-)
-AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals")
+dnl AC_CACHE_CHECK("whether your system supports extended signal handlers",
+dnl ac_cv_have_extended_signals, [
+dnl AC_LANG_SAVE
+dnl AC_LANG_CPLUSPLUS
+dnl AC_TRY_RUN([
+dnl #define HAVE_SIGINFO_T 1
+dnl #define CONFIGURE_TEST
+dnl #include "sigsegv.cpp"
+dnl ],
+dnl [ac_cv_have_extended_signals=yes],
+dnl [ac_cv_have_extended_signals=no]
+dnl )
+dnl AC_LANG_RESTORE
+dnl ]
+dnl )
+dnl AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals")
+ac_cv_have_extended_signals=no
dnl Otherwise, check for subterfuges.
if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then

16
emulators/BasiliskII/patches/patch-src_Unix_main_unix_cpp
View File

@ -1,13 +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);
$OpenBSD: patch-src_Unix_main_unix_cpp,v 1.2 2010/03/25 08:10:56 jasper Exp $
--- src/Unix/main_unix.cpp.orig Thu Mar 25 08:55:21 2010
+++ src/Unix/main_unix.cpp Thu Mar 25 08:56:01 2010
@@ -981,6 +981,9 @@ static void sigint_handler(...)
void Set_pthread_attr(pthread_attr_t *attr, int priority)
{
pthread_attr_init(attr);
+#ifdef __OpenBSD__
+#undef _POSIX_THREAD_PRIORITY_SCHEDULING
+#endif
#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
// Some of these only work for superuser
if (geteuid() == 0) {
pthread_attr_setinheritsched(&tick_thread_attr, PTHREAD_EXPLICIT_SCHED);

13
emulators/BasiliskII/patches/patch-src_Unix_serial_unix_cpp
View File

@ -1,13 +0,0 @@
$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);

16
emulators/BasiliskII/patches/patch-src_Unix_sys_unix_cpp
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_Unix_sys_unix_cpp,v 1.1 2002/05/07 03:05:47 form Exp $
--- src/Unix/sys_unix.cpp.orig Tue May 7 01:01:24 2002
+++ src/Unix/sys_unix.cpp Tue May 7 01:01:47 2002
@@ -122,7 +122,7 @@ void SysAddFloppyPrefs(void)
#if defined(__linux__)
PrefsAddString("floppy", "/dev/fd0H1440");
PrefsAddString("floppy", "/dev/fd1H1440");
$OpenBSD: patch-src_Unix_sys_unix_cpp,v 1.2 2010/03/25 08:10:56 jasper Exp $
--- src/Unix/sys_unix.cpp.orig Thu Mar 25 08:56:59 2010
+++ src/Unix/sys_unix.cpp Thu Mar 25 08:57:30 2010
@@ -128,7 +128,7 @@ void SysAddFloppyPrefs(void)
PrefsAddString("floppy", "/dev/fd0");
PrefsAddString("floppy", "/dev/fd1");
}
-#elif defined(__NetBSD__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
PrefsAddString("floppy", "/dev/fd0a");
PrefsAddString("floppy", "/dev/fd1a");
#else
#elif defined(__APPLE__) && defined(__MACH__)

22
emulators/BasiliskII/patches/patch-src_uae_cpu_fpu_fpu_x86_cpp
View File

@ -1,21 +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
} */
$OpenBSD: patch-src_uae_cpu_fpu_fpu_x86_cpp,v 1.2 2010/03/25 08:10:56 jasper Exp $
--- src/uae_cpu/fpu/fpu_x86.cpp.orig Thu Mar 25 08:58:23 2010
+++ src/uae_cpu/fpu/fpu_x86.cpp Thu Mar 25 08:58:59 2010
@@ -565,7 +565,7 @@ PRIVATE uae_s16 FFPU extended_to_signed_16 ( fpu_regis
_ASM( "fldt %2\n"
__asm__ __volatile__(
"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
} */
: "m" (f)
@@ -605,7 +605,7 @@ PRIVATE uae_s8 FFPU extended_to_signed_8 ( fpu_registe
_ASM( "fldt %2\n"
__asm__ __volatile__(
"fldt %2\n"
- "fistp %0\n"
+ "fistpl %0\n"
"fnstsw %1\n"
: "=m" (tmp), "=m" (sw_temp)
: "m" (*f)
: "m" (f)

5
emulators/BasiliskII/pkg/PLIST
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:42:04 espie Exp $
bin/BasiliskII
@comment $OpenBSD: PLIST,v 1.3 2010/03/25 08:10:56 jasper Exp $
@bin bin/BasiliskII
@man man/man1/BasiliskII.1
share/BasiliskII/
share/BasiliskII/fbdevices
share/BasiliskII/keycodes
share/BasiliskII/tunconfig
share/doc/BasiliskII/
share/doc/BasiliskII/README