Date: Sat, 28 Dec 2013 05:15:57 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337834 - in head/emulators/catapult: . files Message-ID: <201312280515.rBS5Fvrb055785@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Dec 28 05:15:57 2013 New Revision: 337834 URL: http://svnweb.freebsd.org/changeset/ports/337834 Log: 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. Added: head/emulators/catapult/files/ head/emulators/catapult/files/patch-build_detectsys.py (contents, props changed) Modified: head/emulators/catapult/Makefile Modified: head/emulators/catapult/Makefile ============================================================================== --- head/emulators/catapult/Makefile Sat Dec 28 05:03:44 2013 (r337833) +++ head/emulators/catapult/Makefile Sat Dec 28 05:15:57 2013 (r337834) @@ -29,6 +29,7 @@ MAKE_ARGS= INSTALL_BASE="${STAGEDIR}${PR 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}) Added: head/emulators/catapult/files/patch-build_detectsys.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/catapult/files/patch-build_detectsys.py Sat Dec 28 05:15:57 2013 (r337834) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312280515.rBS5Fvrb055785>