From tkato432@yahoo.com  Mon Dec 16 18:03:02 2013
Return-Path: <tkato432@yahoo.com>
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 A36A437E
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:02:02 +0000 (UTC)
Received: from omta01.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F1441857
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:02:02 +0000 (UTC)
Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106])
	by omta01.auone-net.jp (au one net mail) with ESMTP id 3A80F980174
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 17 Dec 2013 03:02:00 +0900 (JST)
Message-Id: <20131217024745.e2210ae6b8536c4235875036@yahoo.com>
Date: Tue, 17 Dec 2013 02:47:45 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: emulators/catapult: Support CXX properly

>Number:         184890
>Category:       ports
>Synopsis:       emulators/catapult: Support CXX properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:25 UTC 2013
>Closed-Date:    Fri Dec 20 23:32:29 UTC 2013
>Last-Modified:  Fri Dec 20 23:40:00 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Support CXX properly
- Install desktop entry file

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/emulators/catapult/Makefile emulators/catapult/Makefile
--- /usr/ports/emulators/catapult/Makefile	2013-12-16 22:29:41.000000000 +0900
+++ emulators/catapult/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -14,45 +14,26 @@
 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 @@
 .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 -urN /usr/ports/emulators/catapult/pkg-plist emulators/catapult/pkg-plist
--- /usr/ports/emulators/catapult/pkg-plist	2013-11-06 22:06:18.000000000 +0900
+++ emulators/catapult/pkg-plist	2013-12-17 00:00:00.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Fri Dec 20 21:53:34 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184890 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Fri Dec 20 23:32:29 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184890 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184890: commit references a PR
Date: Fri, 20 Dec 2013 23:32:23 +0000 (UTC)

 Author: pawel
 Date: Fri Dec 20 23:32:15 2013
 New Revision: 337102
 URL: http://svnweb.freebsd.org/changeset/ports/337102
 
 Log:
   - Respect CXX
   - Install desktop entry file
   - Support staging
   
   PR:		ports/184890
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
 
 Modified:
   head/emulators/catapult/Makefile
   head/emulators/catapult/pkg-plist   (contents, props changed)
 
 Modified: head/emulators/catapult/Makefile
 ==============================================================================
 --- head/emulators/catapult/Makefile	Fri Dec 20 23:21:05 2013	(r337101)
 +++ head/emulators/catapult/Makefile	Fri Dec 20 23:32:15 2013	(r337102)
 @@ -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>
 
 Modified: head/emulators/catapult/pkg-plist
 ==============================================================================
 --- head/emulators/catapult/pkg-plist	Fri Dec 20 23:21:05 2013	(r337101)
 +++ head/emulators/catapult/pkg-plist	Fri Dec 20 23:32:15 2013	(r337102)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
