From d632c5cf76e8337c4cb3bd5fce4ba39f36554367 Mon Sep 17 00:00:00 2001
From: marino <marino@FreeBSD.org>
Date: Sat, 28 Dec 2013 05:15:57 +0000
Subject: emulators/catapult: Fix installation in /root, add DragonFly support

After DragonFly support was added, it was discovered that this port was
writing in /root/.local, which is not permissible.  Settng
CATAPULT_NO_DESKTOP_HOOKS stops that, but requires that catapult.xpm
be manually installed, which was added to post-install target.
---
 emulators/catapult/Makefile                       |  8 ++++++++
 emulators/catapult/files/patch-build_detectsys.py | 11 +++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 emulators/catapult/files/patch-build_detectsys.py

(limited to 'emulators/catapult')

diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 2e19b805efae..38f451d080cf 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -29,6 +29,7 @@ MAKE_ARGS=	INSTALL_BASE="${STAGEDIR}${PREFIX}" \
 		CATAPULT_FLAVOUR="portbld" \
 		CATAPULT_OPENMSX_BINARY="${LOCALBASE}/bin/openmsx" \
 		CATAPULT_OPENMSX_SHARE="${LOCALBASE}/share/openmsx" \
+		CATAPULT_NO_DESKTOP_HOOKS="true" \
 		SYMLINK_FOR_BINARY="false" \
 		PYTHON="${PYTHON_CMD}"
 
@@ -42,6 +43,10 @@ CFLAGS+=	-DNDEBUG
 CATAPULT_STRIP=	true
 .endif
 
+post-extract:
+	${CP} ${WRKSRC}/build/platform-freebsd.mk \
+		${WRKSRC}/build/platform-dragonfly.mk
+
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL_BASE)|${DATADIR}|' \
 		${WRKSRC}/build/info2code.mk
@@ -62,6 +67,9 @@ post-patch:
 		>> ${WRKSRC}/build/flavour-portbld.mk
 
 post-install:
+	${MKDIR} ${STAGEDIR}${DATADIR}/resources/icons
+	${INSTALL_DATA} ${WRKSRC}/src/catapult.xpm \
+		${STAGEDIR}${DATADIR}/resources/icons
 	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} openMSX-Catapult.desktop \
 		${STAGEDIR}${DESKTOPDIR})
 
diff --git a/emulators/catapult/files/patch-build_detectsys.py b/emulators/catapult/files/patch-build_detectsys.py
new file mode 100644
index 000000000000..229e111e97e6
--- /dev/null
+++ b/emulators/catapult/files/patch-build_detectsys.py
@@ -0,0 +1,11 @@
+--- build/detectsys.py.orig	2009-12-05 18:55:51.000000000 +0000
++++ build/detectsys.py
+@@ -57,7 +57,7 @@ def detectOS():
+ 	Raises ValueError if no known OS is detected.
+ 	'''
+ 	os = system().lower()
+-	if os in ('linux', 'darwin', 'freebsd', 'netbsd', 'openbsd', 'gnu'):
++	if os in ('linux', 'darwin', 'dragonfly', 'freebsd', 'netbsd', 'openbsd', 'gnu'):
+ 		return os
+ 	elif os.startswith('gnu/'):
+ 		# GNU userland on non-Hurd kernel, for example Debian GNU/kFreeBSD.
-- 
cgit