ports/171993: emulators/catapult: Update to version 0.9.0

[KATO Tsuguru]

>Number:         171993
>Category:       ports
>Synopsis:       emulators/catapult: Update to version 0.9.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 18:10:21 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 0.9.0

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/emulators/catapult/Makefile emulators/catapult/Makefile
--- /usr/ports/emulators/catapult/Makefile	2012-06-01 14:18:12.000000000 +0900
+++ emulators/catapult/Makefile	2012-09-25 03:21:21.000000000 +0900
@@ -1,14 +1,8 @@
-# New ports collection makefile for:	emulators/catapult
-# Date created:				14 November 2007
-# Whom:					Martin Tournoij <carpetsmoker at xs4all.nl>
-#
-# $Carpetsmoker: ports/emulators/catapult/Makefile,v 1.2 2008/07/21 12:54:29 carpetsmoker Exp $
+# Created by: Martin Tournoij <carpetsmoker at xs4all.nl>
 # $FreeBSD: ports/emulators/catapult/Makefile,v 1.14 2012/06/01 05:18:12 dinoex Exp $
-#
 
 PORTNAME=	catapult
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.9.0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/openmsx/openmsx/${PORTVERSION}
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
@@ -21,6 +15,8 @@
 BUILD_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 
+OPTIONS_DEFINE=	DEBUG DOCS
+
 USE_GNOME=	libxml2
 USE_WX=		2.6+
 USE_PYTHON_BUILD=yes
@@ -32,15 +28,18 @@
 		CATAPULT_OPENMSX_BINARY="${LOCALBASE}/bin/openmsx" \
 		CATAPULT_OPENMSX_SHARE="${LOCALBASE}/share/openmsx" \
 		SYMLINK_FOR_BINARY="false"
+MAKE_JOBS_SAFE=	yes
+
+.include <bsd.port.options.mk>
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+MAKE_ARGS+=	INSTALL_DOC_DIR="${DOCSDIR}"
+.else
 # Use dummy target rather than rewriting makefile
 MAKE_ARGS+=	INSTALL_DOC_DIR="${WRKSRC}/dummy"
-.else
-MAKE_ARGS+=	INSTALL_DOC_DIR="${DOCSDIR}"
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CFLAGS+=	-DDEBUG
 CATAPULT_STRIP=	false
 .else
@@ -51,10 +50,11 @@
 post-patch:
 	@${REINPLACE_CMD} 's|INSTALL_BASE|INSTALL_SHARE_DIR|' \
 		${WRKSRC}/build/info2code.mk
-.for FILE in build/main.mk build/probe.mk
-	@${REINPLACE_CMD} 's|@$$(CXX)|$$(CXX)| ; \
-		 s|wx-config|${WX_CONFIG}|g' ${WRKSRC}/${FILE}
-.endfor
+	@${REINPLACE_CMD} '/--no-strict-aliasing/s|^CXXFLAGS|#CXXFLAGS| ; \
+		 /--cxx/s|^CXX|#CXX| ; \
+		 s|@$$(CXX)|$$(CXX)|' ${WRKSRC}/build/main.mk
+	@${REINPLACE_CMD} 's|wx-config --|${WX_CONFIG:T} --|g' \
+		${WRKSRC}/build/probe.mk
 	@${ECHO_CMD} > ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'CXXFLAGS+=${CXXFLAGS}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
diff -urN /usr/ports/emulators/catapult/distinfo emulators/catapult/distinfo
--- /usr/ports/emulators/catapult/distinfo	2012-02-20 08:24:55.000000000 +0900
+++ emulators/catapult/distinfo	2012-08-13 15:38:45.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (openmsx-catapult-0.8.2.tar.gz) = 9168b0c88d4d2a3b76691fd4b995f464de8365ec882f0ea3948a833ea783dddd
-SIZE (openmsx-catapult-0.8.2.tar.gz) = 1284311
+SHA256 (openmsx-catapult-0.9.0.tar.gz) = f189ae9b9934467944ec03cb21d1ace55d4ae1f45265bde1508d5293c6cd7f26
+SIZE (openmsx-catapult-0.9.0.tar.gz) = 1284318
>Release-Note:
>Audit-Trail:
>Unformatted: