Update to 0.9.

3 files changed, 12 insertions, 48 deletions

diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile
index 65aa10e3f7d6..5af883856f82 100644
--- a/emulators/basiliskII/Makefile
+++ b/emulators/basiliskII/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	basiliskII
-PORTVERSION=	0.8.1
+PORTVERSION=	0.9
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	basilisk
-DISTNAME=	BasiliskII_src_30012000
+DISTNAME=	BasiliskII_src_31052001
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	lthread.2:${PORTSDIR}/devel/linuxthreads
 
-WRKSRC=		${WRKDIR}/BasiliskII-0.8/src/Unix
+WRKSRC=		${WRKDIR}/BasiliskII-${PORTVERSION}/src/Unix
 
 USE_X_PREFIX=	yes
 USE_GTK=	yes
diff --git a/emulators/basiliskII/distinfo b/emulators/basiliskII/distinfo
index 02ca8084ea3c..bfe82154385a 100644
--- a/emulators/basiliskII/distinfo
+++ b/emulators/basiliskII/distinfo
@@ -1 +1 @@
-MD5 (BasiliskII_src_30012000.tar.gz) = 98a89ffc1c9d6a15dcea6d12e0e33c32
+MD5 (BasiliskII_src_31052001.tar.gz) = 5017e21226c27a4a029da0486dcf04e1
diff --git a/emulators/basiliskII/files/patch-aa b/emulators/basiliskII/files/patch-aa
index abdb2699a9d9..3437ef67fea4 100644
--- a/emulators/basiliskII/files/patch-aa
+++ b/emulators/basiliskII/files/patch-aa
@@ -1,15 +1,18 @@
---- configure.orig	Wed Nov  3 23:04:14 1999
-+++ configure	Tue Apr 18 10:35:11 2000
-@@ -2199,7 +2199,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Fri Jun  1 00:47:29 2001
++++ configure	Fri Jun  1 21:13:38 2001
+@@ -2418,7 +2418,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lc_r  $LIBS"
 +LIBS="-llthread -llgcc_r $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2205 "configure"
+ #line 2424 "configure"
  #include "confdefs.h"
-@@ -2233,7 +2233,7 @@
+@@ -2452,7 +2452,7 @@
  #define $ac_tr_lib 1
  EOF
  
@@ -18,42 +21,3 @@
  
  else
    echo "$ac_t""no" 1>&6
-@@ -3819,7 +3819,7 @@
-   Linux*)
-     SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
-     ;;
--  FreeBSD*3.*)
-+  FreeBSD*[345].*)
-         echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
- echo "configure:3825: checking for cam_open_btl in -lcam" >&5
- ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
-@@ -3864,16 +3864,16 @@
-     if [ "x$HAVE_LIBCAM" = "xno" ]; then
-       { echo "configure: error: Cannot find libcam for SCSI management." 1>&2; exit 1; }
-     else
--            ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
--echo "configure:3870: checking for /sys/cam/cam.h" >&5
-+            ac_safe=`echo "camlib.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for camlib.h""... $ac_c" 1>&6
-+echo "configure:3870: checking for camlib.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 3875 "configure"
- #include "confdefs.h"
--#include </sys/cam/cam.h>
-+#include <camlib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:3880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -4093,7 +4093,7 @@
- WANT_SPARC_V8_ASSEMBLY=no
- WANT_SPARC_V9_ASSEMBLY=no
- CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
--if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
-+if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xno" ]; then
-     DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
-   if [ "x$HAVE_GAS" = "xyes" ]; then
-     WANT_X86_ASSEMBLY=yes