From ed5c9ae59e0acde4b6e0b2759ea9ee87286b1b3b Mon Sep 17 00:00:00 2001
From: Johan van Selst <johans@FreeBSD.org>
Date: Fri, 10 Jan 2014 12:14:56 +0000
Subject: - Update to 0.10.0   This version requires WX 2.8+ and a modern C++0x
 compiler - Adopt port

---
 emulators/catapult/Makefile | 25 +++++++++++++++----------
 emulators/catapult/distinfo |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'emulators/catapult')

diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 38f451d080cf..a36b750de667 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	catapult
-PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTVERSION=	0.10.0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/openmsx/openmsx/${PORTVERSION}
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GUI for openMSX
 
 LICENSE=	GPLv2
@@ -19,8 +18,10 @@ RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 OPTIONS_DEFINE=	DEBUG DOCS
 
 USES=		gmake pkgconfig
+USE_GCC=	4.6+
+USE_CXXSTD=	gnu++0x
 USE_GNOME=	gtk20 libxml2
-USE_WX=		2.6+
+USE_WX=		2.8+
 USE_PYTHON_BUILD=yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	INSTALL_BASE="${STAGEDIR}${PREFIX}" \
@@ -47,10 +48,12 @@ post-extract:
 	${CP} ${WRKSRC}/build/platform-freebsd.mk \
 		${WRKSRC}/build/platform-dragonfly.mk
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL_BASE)|${DATADIR}|' \
 		${WRKSRC}/build/info2code.mk
-	@${REINPLACE_CMD} '/--no-strict-aliasing/s|^CXXFLAGS|#CXXFLAGS| ; \
+	@${REINPLACE_CMD} '/-Wno-literal/s|^CXXFLAGS|#CXXFLAGS| ; \
 		 /--cxx/s|^CXX|#CXX| ; \
 		 /COMPILE=/s|g++|$$(CXX)| ; \
 		 s|@$$(CXX)|$$(CXX)|' ${WRKSRC}/build/main.mk
@@ -63,14 +66,16 @@ post-patch:
 	@${ECHO_CMD} > ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'CXXFLAGS+=${CXXFLAGS}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
+	@${ECHO_CMD} 'LINK_FLAGS+=${LDFLAGS}' \
+		>> ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'CATAPULT_STRIP:=${CATAPULT_STRIP}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}/resources/icons
-	${INSTALL_DATA} ${WRKSRC}/src/catapult.xpm \
+	@${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})
+	@cd ${WRKSRC}/desktop && ${INSTALL_DATA} openMSX-Catapult.desktop \
+		${STAGEDIR}${DESKTOPDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/catapult/distinfo b/emulators/catapult/distinfo
index d5f6d416fb8b..a15084e4f83b 100644
--- a/emulators/catapult/distinfo
+++ b/emulators/catapult/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openmsx-catapult-0.9.1.tar.gz) = 856e46c6246e941f397d963b43bae44a942772c6b9a98a90f28f6286812ad9f5
-SIZE (openmsx-catapult-0.9.1.tar.gz) = 1284353
+SHA256 (openmsx-catapult-0.10.0.tar.gz) = a8f4ca60ea46f39102146221c506b1f2ad1a0a4bae792bbcdb9f7cfacb6975d5
+SIZE (openmsx-catapult-0.10.0.tar.gz) = 1275962
-- 
cgit v1.2.3