From owner-svn-ports-head@FreeBSD.ORG  Sat Dec 28 05:15:58 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7D7716EE;
 Sat, 28 Dec 2013 05:15:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 505F911DA;
 Sat, 28 Dec 2013 05:15:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBS5FwK0055787;
 Sat, 28 Dec 2013 05:15:58 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBS5Fvrb055785;
 Sat, 28 Dec 2013 05:15:57 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201312280515.rBS5Fvrb055785@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Sat, 28 Dec 2013 05:15:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337834 - in head/emulators/catapult: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Dec 2013 05:15:58 -0000

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.