From a9525403c4a12f6c1e1c9355782c46b1f4b0bc8f Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Sat, 26 Oct 2019 21:54:22 -0400
Subject: [PATCH] macemu-git: ensure stability

---
 srcpkgs/macemu-git/files/90-sheepshaver.conf |  2 --
 srcpkgs/macemu-git/template                  | 25 ++++++--------------
 2 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/macemu-git/files/90-sheepshaver.conf

diff --git a/srcpkgs/macemu-git/files/90-sheepshaver.conf b/srcpkgs/macemu-git/files/90-sheepshaver.conf
deleted file mode 100644
index 3de9227..0000000
--- a/srcpkgs/macemu-git/files/90-sheepshaver.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Required kernel parameter for native addressing
-vm.mmap_min_addr=0
diff --git a/srcpkgs/macemu-git/template b/srcpkgs/macemu-git/template
index ae6c343..e21902f 100644
--- a/srcpkgs/macemu-git/template
+++ b/srcpkgs/macemu-git/template
@@ -21,28 +21,18 @@ nopie=yes
 do_configure() {
 	cd "${wrksrc}"/BasiliskII/src/Unix
 	./autogen.sh \
-		--prefix=/usr \
-		--enable-sdl-video \
-		--enable-sdl-audio \
-		--enable-jit-compiler \
-		--with-bincue \
-		--with-vdeplug
+		--prefix=/usr --enable-sdl-video --enable-sdl-audio --enable-tuntap \
+		--with-bincue --with-vdeplug
 
 	cd "${wrksrc}"/SheepShaver/src/Unix
 	./autogen.sh \
-		--prefix=/usr \
-		--enable-addressing=direct \
-		--enable-standalone-gui \
-		--enable-sdl-video \
-		--enable-sdl-audio \
-		--enable-tuntap \
-		--with-bincue \
-		--with-vdeplug
+		--prefix=/usr --enable-sdl-video --enable-sdl-audio --enable-tuntap \
+		--with-bincue --with-vdeplug
 }
 
 do_build() {
-	cd "${wrksrc}"/BasiliskII/src/Unix;  make DESTDIR="${DESTDIR}" -j1
-	cd "${wrksrc}"/SheepShaver/src/Unix; make DESTDIR="${DESTDIR}" -j1
+	cd "${wrksrc}"/BasiliskII/src/Unix;  make -j1
+	cd "${wrksrc}"/SheepShaver/src/Unix; make -j1
 
 	cp -rL Linux/NetDriver _netdriver
 }
@@ -62,8 +52,7 @@ do_install() {
 	vcopy doc/Linux           usr/share/doc/SheepShaver
 	vcopy src/Unix/_netdriver usr/src/"${_dkms_name}"
 
-	vinstall "${FILESDIR}"/90-sheepshaver.conf 644 usr/lib/sysctl.d/
-	vinstall "${FILESDIR}"/dkms.conf           644 usr/src/"${_dkms_name}"/
+	vinstall "${FILESDIR}"/dkms.conf 644 usr/src/"${_dkms_name}"/
 
 	vsed -i "${PKGDESTDIR}"/usr/src/${_dkms_name}/dkms.conf \
 	     -e "s/@VERSION@/${version}-${revision}/"