summaryrefslogtreecommitdiff
path: root/emulators/BasiliskII
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-06-12 12:51:07 +0000
committerjoerg <joerg@pkgsrc.org>2007-06-12 12:51:07 +0000
commit544bf6acc82d764ef950f0184d77c071f9780c38 (patch)
tree1ce03d18d038ba223a473dd12e83368383129cf4 /emulators/BasiliskII
parent4eca8bab25a8f8100fca087990a9846d1de66b54 (diff)
downloadpkgsrc-544bf6acc82d764ef950f0184d77c071f9780c38.tar.gz
Fix infinite loop in configure on DragonFly and FreeBSD 4.
Fix dependencies for modular Xorg by adding Xxf86vm and Xxf86dga. Bump revision.
Diffstat (limited to 'emulators/BasiliskII')
-rw-r--r--emulators/BasiliskII/Makefile5
-rw-r--r--emulators/BasiliskII/distinfo4
-rw-r--r--emulators/BasiliskII/options.mk4
-rw-r--r--emulators/BasiliskII/patches/patch-ag13
4 files changed, 19 insertions, 7 deletions
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index 5dffcda2dc6..7dfa9831578 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2007/05/20 17:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/06/12 12:51:07 joerg Exp $
DISTNAME= BasiliskII_src_01052006
PKGNAME= BasiliskII-1.0.20060501
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://gwenole.beauchesne.info/projects/basilisk2/files/
EXTRACT_SUFX= .tar.bz2
@@ -22,6 +23,8 @@ BUILD_DIRS= ${CONFIGURE_DIRS}
.include "options.mk"
+CXXFLAGS+=-g -O0
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/BasiliskII/
diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo
index 069a0cee376..a19d9fe623a 100644
--- a/emulators/BasiliskII/distinfo
+++ b/emulators/BasiliskII/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/05/13 20:52:35 adam Exp $
+$NetBSD: distinfo,v 1.15 2007/06/12 12:51:07 joerg Exp $
SHA1 (BasiliskII_src_01052006.tar.bz2) = 6373b33adf6caec53c5d1ed46a00adcac89ad3bb
RMD160 (BasiliskII_src_01052006.tar.bz2) = bb1a061c504bd7d28b869e0eec2806cf8a79cf8d
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = ac4d313a8c60a807a5ea563dcca995e092be9c15
SHA1 (patch-ad) = 6a215532e891848fe449ef5fe4307793c34bb9d6
SHA1 (patch-ae) = dcac9287614535fa72fe9c8b0e3c516575e40887
SHA1 (patch-af) = 2087a41aeda1fcab49408428decf1e5082fc8896
-SHA1 (patch-ag) = 079a62bc2e193fe4a8de1862c1e5334ee657ecf4
+SHA1 (patch-ag) = 081471cf25f0b11a9ef449e48fd7ce8ea3367f0d
SHA1 (patch-ah) = 0f67eed6f59e6c381c1a6fbeb98261cad4697760
SHA1 (patch-ai) = fc527be478576f157bffbd6a91eb1bdc85903fb1
SHA1 (patch-aj) = c331aa7080b330cf58f58c72456b91b0e5a2156f
diff --git a/emulators/BasiliskII/options.mk b/emulators/BasiliskII/options.mk
index ff57a1032c2..d5f4e31a1d5 100644
--- a/emulators/BasiliskII/options.mk
+++ b/emulators/BasiliskII/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/02/06 18:16:02 joerg Exp $
+# $NetBSD: options.mk,v 1.5 2007/06/12 12:51:07 joerg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.BasiliskII
PKG_SUPPORTED_OPTIONS= esound gtk sdl
@@ -31,5 +31,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXxf86dga/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
.endif
diff --git a/emulators/BasiliskII/patches/patch-ag b/emulators/BasiliskII/patches/patch-ag
index 36c2992430d..cdc1294214b 100644
--- a/emulators/BasiliskII/patches/patch-ag
+++ b/emulators/BasiliskII/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.3 2006/05/13 20:52:35 adam Exp $
+$NetBSD: patch-ag,v 1.4 2007/06/12 12:51:08 joerg Exp $
---- src/Unix/sigsegv.cpp.orig 2006-03-31 00:45:49.000000000 +0200
+--- src/Unix/sigsegv.cpp.orig 2006-03-30 22:45:49.000000000 +0000
+++ src/Unix/sigsegv.cpp
@@ -226,7 +226,7 @@ static void powerpc_decode_instruction(i
@@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.3 2006/05/13 20:52:35 adam Exp $
#if (defined(i386) || defined(__i386__))
#define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGBUS)
#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp, char *addr
-@@ -721,7 +721,7 @@ enum {
+@@ -721,10 +721,14 @@ enum {
#endif
};
#endif
@@ -37,4 +37,11 @@ $NetBSD: patch-ag,v 1.3 2006/05/13 20:52:35 adam Exp $
+#if defined(__FreeBSD__) || defined(__DragonFly__)
enum {
#if (defined(i386) || defined(__i386__))
++# if (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
X86_REG_EIP = 10,
++#else
++ X86_REG_EIP = 11,
++#endif
+ X86_REG_EAX = 7,
+ X86_REG_ECX = 6,
+ X86_REG_EDX = 5,