- Respect CXX

- Install desktop entry file
- Support staging

PR:		ports/184890
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

2 files changed, 19 insertions, 28 deletions

diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index e15da0060d19..2e19b805efae 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	catapult
 PORTVERSION=	0.9.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	SF/openmsx/openmsx/${PORTVERSION}
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
@@ -14,45 +14,26 @@ COMMENT=	GUI for openMSX
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
-LIB_DEPENDS=	mspack:${PORTSDIR}/archivers/libmspack \
-		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		pcre:${PORTSDIR}/devel/pcre \
-		cairo:${PORTSDIR}/graphics/cairo \
-		jbig:${PORTSDIR}/graphics/jbigkit \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		tiff:${PORTSDIR}/graphics/tiff \
-		freetype:${PORTSDIR}/print/freetype2 \
-		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
-USE_GNOME=	gdkpixbuf2 glib20 gtk20 libxml2
+USES=		gmake pkgconfig
+USE_GNOME=	gtk20 libxml2
 USE_WX=		2.6+
 USE_PYTHON_BUILD=yes
-USES=		gettext gmake iconv
-USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
-		xext xfixes xi xinerama xrandr xrender xxf86vm
 MAKEFILE=	GNUmakefile
-MAKE_ARGS=	INSTALL_BASE="${PREFIX}" \
-		INSTALL_SHARE_DIR="${DATADIR}" \
+MAKE_ARGS=	INSTALL_BASE="${STAGEDIR}${PREFIX}" \
+		INSTALL_SHARE_DIR="${STAGEDIR}${DATADIR}" \
+		INSTALL_DOC_DIR="${STAGEDIR}${DOCSDIR}" \
 		CATAPULT_FLAVOUR="portbld" \
 		CATAPULT_OPENMSX_BINARY="${LOCALBASE}/bin/openmsx" \
 		CATAPULT_OPENMSX_SHARE="${LOCALBASE}/share/openmsx" \
-		SYMLINK_FOR_BINARY="false"
+		SYMLINK_FOR_BINARY="false" \
+		PYTHON="${PYTHON_CMD}"
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.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"
-.endif
-
 .if ${PORT_OPTIONS:MDEBUG}
 CFLAGS+=	-DDEBUG
 CATAPULT_STRIP=	false
@@ -62,17 +43,26 @@ CATAPULT_STRIP=	true
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's|INSTALL_BASE|INSTALL_SHARE_DIR|' \
+	@${REINPLACE_CMD} 's|$$(INSTALL_BASE)|${DATADIR}|' \
 		${WRKSRC}/build/info2code.mk
 	@${REINPLACE_CMD} '/--no-strict-aliasing/s|^CXXFLAGS|#CXXFLAGS| ; \
 		 /--cxx/s|^CXX|#CXX| ; \
+		 /COMPILE=/s|g++|$$(CXX)| ; \
 		 s|@$$(CXX)|$$(CXX)|' ${WRKSRC}/build/main.mk
 	@${REINPLACE_CMD} 's|wx-config --|${WX_CONFIG:T} --|g' \
 		${WRKSRC}/build/probe.mk
+	@${REINPLACE_CMD} '/^Exec/s|%INSTALL_BASE%|${PREFIX}| ; \
+		 /^Icon/s|%INSTALL_BASE%|${DATADIR}| ; \
+		 /^DocPath/s|%INSTALL_BASE%/doc|${DOCSDIR}|' \
+		${WRKSRC}/desktop/openMSX-Catapult.desktop
 	@${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
 
+post-install:
+	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} openMSX-Catapult.desktop \
+		${STAGEDIR}${DESKTOPDIR})
+
 .include <bsd.port.mk>
diff --git a/emulators/catapult/pkg-plist b/emulators/catapult/pkg-plist
index 39fc486698a3..0341acab9f08 100644
--- a/emulators/catapult/pkg-plist
+++ b/emulators/catapult/pkg-plist
@@ -1,4 +1,5 @@
 bin/catapult
+share/applications/openMSX-Catapult.desktop
 %%DATADIR%%/resources/bitmaps/about.png
 %%DATADIR%%/resources/bitmaps/diskimage.png
 %%DATADIR%%/resources/bitmaps/eject.png