4 files changed, 78 insertions, 82 deletions

diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 05724369a3be..5e8c36e20364 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	catapult
-PORTVERSION=	0.6.3R1
-PORTREVISION=	4
+PORTVERSION=	0.7.2
 CATEGORIES=	emulators
-MASTER_SITES=	SF/openmsx/openmsx/0.6.3
-DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION:S/R1/-R1/}
+MASTER_SITES=	SF/openmsx/openmsx/${PORTVERSION}
+DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI for openMSX
@@ -19,25 +18,45 @@ COMMENT=	GUI for openMSX
 BUILD_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 
+USE_GNOME=	libxml2
+USE_WX=		2.6+
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
-MAKE_ARGS+=	INSTALL_BASE=${PREFIX} \
-		INSTALL_SHARE_DIR=${DATADIR} \
-		INSTALL_DOC_DIR=${DOCSDIR} \
-		CATAPULT_OPENMSX_BINARY=${LOCALBASE}/bin/openmsx \
-		CATAPULT_OPENMSX_SHARE=${LOCALBASE}/share/openmsx
-USE_WX=		2.6
-USE_GNOME=	libxml2
+MAKE_ARGS=	INSTALL_BASE="${PREFIX}" \
+		INSTALL_SHARE_DIR="${DATADIR}" \
+		CATAPULT_FLAVOUR="portbld" \
+		CATAPULT_OPENMSX_BINARY="${LOCALBASE}/bin/openmsx" \
+		CATAPULT_OPENMSX_SHARE="${LOCALBASE}/share/openmsx" \
+		SYMLINK_FOR_BINARY="false"
 
-post-patch:
-	@${REINPLACE_CMD} 's|freebsd5\*|freebsd*|; s|x86_64)|amd64)|;' \
-	    ${WRKSRC}/build/detectsys.sh
-	@${REINPLACE_CMD} 's|@$$(CXX)|$$(CXX)|' ${WRKSRC}/build/main.mk
-	@${REINPLACE_CMD} 's|INSTALL_BASE|INSTALL_SHARE_DIR|' ${WRKSRC}/build/info2code.mk
-	@${REINPLACE_CMD} 's|wx-config|${WX_CONFIG}|g' \
-		${WRKSRC}/build/main.mk ${WRKSRC}/build/probe.mk
 .if defined(NOPORTDOCS)
-	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/build-main.mk
+# 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)
+CFLAGS+=	-DDEBUG
+CATAPULT_STRIP=	false
+.else
+CFLAGS+=	-DNDEBUG
+CATAPULT_STRIP=	true
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} 's|freebsd5\*|freebsd*| ; \
+		 s|x86_64)|amd64)|' ${WRKSRC}/build/detectsys.sh
+	@${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
+	@${ECHO_CMD} > ${WRKSRC}/build/flavour-portbld.mk
+	@${ECHO_CMD} 'CXXFLAGS+=${CXXFLAGS}' \
+		>> ${WRKSRC}/build/flavour-portbld.mk
+	@${ECHO_CMD} 'CATAPULT_STRIP:=${CATAPULT_STRIP}' \
+		>> ${WRKSRC}/build/flavour-portbld.mk
+
 .include <bsd.port.mk>
diff --git a/emulators/catapult/distinfo b/emulators/catapult/distinfo
index 2a3ea63d501b..d196cc1ddb83 100644
--- a/emulators/catapult/distinfo
+++ b/emulators/catapult/distinfo
@@ -1,3 +1,3 @@
-MD5 (openmsx-catapult-0.6.3-R1.tar.gz) = 1cb05e95d4fc57ce7377d0b2d7eb4ff1
-SHA256 (openmsx-catapult-0.6.3-R1.tar.gz) = ac44871982c4e69f9ebdceecccffab58748ecb13b7898116d58be475d7b38849
-SIZE (openmsx-catapult-0.6.3-R1.tar.gz) = 244141
+MD5 (openmsx-catapult-0.7.2.tar.gz) = 1ec687958965031e7b1c8464a2ef90ec
+SHA256 (openmsx-catapult-0.7.2.tar.gz) = 06294b9a718ac603583a625dba7f801ded81997cff2c8ec04829a934bef0e033
+SIZE (openmsx-catapult-0.7.2.tar.gz) = 243980
diff --git a/emulators/catapult/files/build-main.mk b/emulators/catapult/files/build-main.mk
deleted file mode 100644
index 801baaadd55e..000000000000
--- a/emulators/catapult/files/build-main.mk
+++ /dev/null
@@ -1,23 +0,0 @@
---- build/main.mk.orig	2008-07-21 14:43:22.000000000 +0200
-+++ build/main.mk	2008-07-21 14:43:48.000000000 +0200
-@@ -371,13 +371,13 @@
- 	@echo "  Data files..."
- 	@mkdir -p $(INSTALL_SHARE_DIR)
- 	@cp -rf $(RESOURCES_PATH) $(INSTALL_SHARE_DIR)/
--	@echo "  Documentation..."
--	@mkdir -p $(INSTALL_DOC_DIR)
--	@cp -f README GPL AUTHORS $(INSTALL_DOC_DIR)
--	@cp -f $(addprefix doc/,$(INSTALL_DOCS)) $(INSTALL_DOC_DIR)
--	@mkdir -p $(INSTALL_DOC_DIR)/manual
--	@cp -f $(addprefix doc/manual/,*.html *.css *.png) \
--		$(INSTALL_DOC_DIR)/manual
-+	@echo "  Skipping Documentation..."
-+#	@mkdir -p $(INSTALL_DOC_DIR)
-+#	@cp -f README GPL AUTHORS $(INSTALL_DOC_DIR)
-+#	@cp -f $(addprefix doc/,$(INSTALL_DOCS)) $(INSTALL_DOC_DIR)
-+#	@mkdir -p $(INSTALL_DOC_DIR)/manual
-+#	@cp -f $(addprefix doc/manual/,*.html *.css *.png) \
-+#		$(INSTALL_DOC_DIR)/manual
- ifeq ($(CATAPULT_PREBUILT),false)
- ifneq ($(CATAPULT_NO_DESKTOP_HOOKS),true)
- 	@echo "  Desktop hooks..."
diff --git a/emulators/catapult/pkg-plist b/emulators/catapult/pkg-plist
index 7e18f5d4242e..39fc486698a3 100644
--- a/emulators/catapult/pkg-plist
+++ b/emulators/catapult/pkg-plist
@@ -1,49 +1,49 @@
 bin/catapult
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/GPL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/release-history.txt
-%%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/compile.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/status.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/session.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/misc.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/mainscreen.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/input.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/audio.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual-purple.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual-minty.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/user.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/video.png
-%%DATADIR%%/resources/dialogs/checkconfigs.xrc
-%%DATADIR%%/resources/dialogs/config.xrc
-%%DATADIR%%/resources/dialogs/session.xrc
-%%DATADIR%%/resources/dialogs/misccontrols.xrc
-%%DATADIR%%/resources/dialogs/videocontrols.xrc
-%%DATADIR%%/resources/dialogs/audiocontrols.xrc
-%%DATADIR%%/resources/dialogs/status.xrc
-%%DATADIR%%/resources/dialogs/input.xrc
-%%DATADIR%%/resources/dialogs/fullscreen.xrc
-%%DATADIR%%/resources/dialogs/screenshot.xrc
-%%DATADIR%%/resources/dialogs/romtype.xrc
-%%DATADIR%%/resources/dialogs/ipsselect.xrc
-%%DATADIR%%/resources/dialogs/about.xrc
-%%DATADIR%%/resources/dialogs/catapult.xrc
-%%DATADIR%%/resources/bitmaps/tapeimage.png
+%%DATADIR%%/resources/bitmaps/about.png
 %%DATADIR%%/resources/bitmaps/diskimage.png
 %%DATADIR%%/resources/bitmaps/eject.png
 %%DATADIR%%/resources/bitmaps/file.png
 %%DATADIR%%/resources/bitmaps/ledoff.png
 %%DATADIR%%/resources/bitmaps/ledon.png
 %%DATADIR%%/resources/bitmaps/romimage.png
-%%DATADIR%%/resources/bitmaps/about.png
+%%DATADIR%%/resources/bitmaps/tapeimage.png
+%%DATADIR%%/resources/dialogs/about.xrc
+%%DATADIR%%/resources/dialogs/audiocontrols.xrc
+%%DATADIR%%/resources/dialogs/catapult.xrc
+%%DATADIR%%/resources/dialogs/checkconfigs.xrc
+%%DATADIR%%/resources/dialogs/config.xrc
+%%DATADIR%%/resources/dialogs/fullscreen.xrc
+%%DATADIR%%/resources/dialogs/input.xrc
+%%DATADIR%%/resources/dialogs/ipsselect.xrc
+%%DATADIR%%/resources/dialogs/misccontrols.xrc
+%%DATADIR%%/resources/dialogs/romtype.xrc
+%%DATADIR%%/resources/dialogs/screenshot.xrc
+%%DATADIR%%/resources/dialogs/session.xrc
+%%DATADIR%%/resources/dialogs/status.xrc
+%%DATADIR%%/resources/dialogs/videocontrols.xrc
 %%DATADIR%%/resources/icons/catapult.xpm
+%%PORTDOCS%%%%DOCSDIR%%/GPL.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/authors.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual/audio.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/compile.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/input.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/mainscreen.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/manual-minty.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/manual-purple.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/manual.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/misc.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/session.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/status.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/user.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/video.png
+%%PORTDOCS%%%%DOCSDIR%%/release-history.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/resources/icons
-@dirrm %%DATADIR%%/resources/bitmaps
 @dirrm %%DATADIR%%/resources/dialogs
+@dirrm %%DATADIR%%/resources/bitmaps
 @dirrm %%DATADIR%%/resources
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%