From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 18 18:10:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3EA521065693 for ; Wed, 18 Nov 2009 18:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1E4888FC16 for ; Wed, 18 Nov 2009 18:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nAIIA1XY035522 for ; Wed, 18 Nov 2009 18:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nAIIA1WR035521; Wed, 18 Nov 2009 18:10:01 GMT (envelope-from gnats) Resent-Date: Wed, 18 Nov 2009 18:10:01 GMT Resent-Message-Id: <200911181810.nAIIA1WR035521@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C7A41065698 for ; Wed, 18 Nov 2009 18:00:54 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169]) by mx1.freebsd.org (Postfix) with ESMTP id 2C6238FC17 for ; Wed, 18 Nov 2009 18:00:54 +0000 (UTC) Received: from localhost.localdomain (ZT030179.ppp.dion.ne.jp [59.128.30.179]) by msa106lp.auone-net.jp (au one net msa) with ESMTP id C1FE623C031 for ; Thu, 19 Nov 2009 03:00:46 +0900 (JST) Message-Id: <20091119030010.602821cf.tkato432@yahoo.com> Date: Thu, 19 Nov 2009 03:00:10 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/140669: Update port: emulators/catapult to 0.7.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 18:10:02 -0000 >Number: 140669 >Category: ports >Synopsis: Update port: emulators/catapult to 0.7.2 >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: Wed Nov 18 18:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.2-RELEASE-p4 i386 >Organization: >Environment: >Description: - Update to version 0.7.2 Remove file: files/build-main.mk >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/catapult/Makefile emulators/catapult/Makefile --- /usr/ports/emulators/catapult/Makefile 2009-08-22 16:18:38.000000000 +0900 +++ emulators/catapult/Makefile 2009-11-15 03:13:35.000000000 +0900 @@ -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 @@ 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 diff -urN /usr/ports/emulators/catapult/distinfo emulators/catapult/distinfo --- /usr/ports/emulators/catapult/distinfo 2008-02-15 17:49:44.000000000 +0900 +++ emulators/catapult/distinfo 2009-11-14 02:04:52.000000000 +0900 @@ -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 -urN /usr/ports/emulators/catapult/files/build-main.mk emulators/catapult/files/build-main.mk --- /usr/ports/emulators/catapult/files/build-main.mk 2008-08-27 21:30:52.000000000 +0900 +++ emulators/catapult/files/build-main.mk 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/emulators/catapult/pkg-plist emulators/catapult/pkg-plist --- /usr/ports/emulators/catapult/pkg-plist 2008-02-15 17:49:44.000000000 +0900 +++ emulators/catapult/pkg-plist 2009-11-15 03:00:39.000000000 +0900 @@ -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%% >Release-Note: >Audit-Trail: >Unformatted: