Date: Fri, 2 Nov 2012 10:42:09 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306839 - head/emulators/catapult Message-ID: <201211021042.qA2Ag9RH003114@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Nov 2 10:42:08 2012 New Revision: 306839 URL: http://svn.freebsd.org/changeset/ports/306839 Log: - Update to version 0.9.1 - Convert to OptionsNG - Mark MAKE_JOBS_SAFE PR: ports/171993 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Feature safe: yes Modified: head/emulators/catapult/Makefile head/emulators/catapult/distinfo Modified: head/emulators/catapult/Makefile ============================================================================== --- head/emulators/catapult/Makefile Fri Nov 2 10:28:57 2012 (r306838) +++ head/emulators/catapult/Makefile Fri Nov 2 10:42:08 2012 (r306839) @@ -1,14 +1,8 @@ -# New ports collection makefile for: emulators/catapult -# Date created: 14 November 2007 -# Whom: Martin Tournoij <carpetsmoker@xs4all.nl> -# -# $Carpetsmoker: ports/emulators/catapult/Makefile,v 1.2 2008/07/21 12:54:29 carpetsmoker Exp $ +# Created by: Martin Tournoij <carpetsmoker@xs4all.nl> # $FreeBSD$ -# PORTNAME= catapult -PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTVERSION= 0.9.1 CATEGORIES= emulators MASTER_SITES= SF/openmsx/openmsx/${PORTVERSION} DISTNAME= openmsx-${PORTNAME}-${PORTVERSION} @@ -19,12 +13,30 @@ 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 \ + xcb:${PORTSDIR}/x11/libxcb RUN_DEPENDS= openmsx:${PORTSDIR}/emulators/openmsx -USE_GNOME= libxml2 +OPTIONS_DEFINE= DEBUG DOCS + +USE_GNOME= gdkpixbuf2 glib20 gtk20 libxml2 USE_WX= 2.6+ USE_PYTHON_BUILD=yes USE_GMAKE= yes +USE_GETTEXT= yes +USE_ICONV= yes +USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp \ + xext xfixes xi xinerama xrandr xrender xxf86vm MAKEFILE= GNUmakefile MAKE_ARGS= INSTALL_BASE="${PREFIX}" \ INSTALL_SHARE_DIR="${DATADIR}" \ @@ -32,15 +44,18 @@ MAKE_ARGS= INSTALL_BASE="${PREFIX}" \ 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 +66,11 @@ CATAPULT_STRIP= true 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 Modified: head/emulators/catapult/distinfo ============================================================================== --- head/emulators/catapult/distinfo Fri Nov 2 10:28:57 2012 (r306838) +++ head/emulators/catapult/distinfo Fri Nov 2 10:42:08 2012 (r306839) @@ -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.1.tar.gz) = 856e46c6246e941f397d963b43bae44a942772c6b9a98a90f28f6286812ad9f5 +SIZE (openmsx-catapult-0.9.1.tar.gz) = 1284353
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211021042.qA2Ag9RH003114>