From owner-svn-ports-all@FreeBSD.ORG Tue Jun 18 11:46:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BC12B347; Tue, 18 Jun 2013 11:46:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AC2231248; Tue, 18 Jun 2013 11:46:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IBkxW1031402; Tue, 18 Jun 2013 11:46:59 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5IBkqMl031356; Tue, 18 Jun 2013 11:46:52 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201306181146.r5IBkqMl031356@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 18 Jun 2013 11:46:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321181 - in head: audio/wavplay devel/gitg devel/love devel/love07 devel/love5 devel/p5-Tree-R devel/p5-WeakRef devel/sfml devel/tokamak editors/chexedit editors/hnb games/biloba games... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 11:46:59 -0000 Author: amdmi3 Date: Tue Jun 18 11:46:51 2013 New Revision: 321181 URL: http://svnweb.freebsd.org/changeset/ports/321181 Log: - Trim Makefile headers - Drop ABI versions from LIB_DEPENDS - OptionsNG - Pet portlint - Switch to dynamic plist where useful Added: head/games/critterding/files/ head/games/critterding/files/patch-src-scenes-evolution.cpp (contents, props changed) head/games/critterding/files/patch-src-utils-bullet-BulletSoftBody-btSoftBody.h (contents, props changed) Deleted: head/games/connectfive/pkg-plist head/games/dangen/pkg-plist head/games/egoboo/pkg-plist head/games/f1spirit-remake/pkg-plist head/games/kartofel/pkg-plist head/games/meritous/pkg-plist head/games/untahris/pkg-plist head/games/xorgramana/pkg-plist Modified: head/audio/wavplay/Makefile head/devel/gitg/Makefile head/devel/gitg/pkg-descr head/devel/love/Makefile head/devel/love07/Makefile head/devel/love5/Makefile head/devel/p5-Tree-R/Makefile head/devel/p5-Tree-R/pkg-descr head/devel/p5-WeakRef/Makefile head/devel/sfml/Makefile head/devel/tokamak/Makefile head/editors/chexedit/Makefile head/editors/chexedit/pkg-descr head/editors/hnb/Makefile head/games/biloba/Makefile head/games/biloba/pkg-descr head/games/connectfive/Makefile head/games/connectfive/files/patch-glfont2.h head/games/critterding/Makefile head/games/crrcsim/Makefile head/games/dangen/Makefile head/games/egoboo/Makefile head/games/egoboo/files/patch-game-lin-file.c head/games/f1spirit-remake/Makefile head/games/f1spirit-remake/files/patch-sources-CCar.h head/games/f1spirit-remake/files/patch-sources-CPlayer.cpp head/games/fishsupper/Makefile head/games/flyhard/Makefile head/games/freera/Makefile head/games/funnyboat/Makefile head/games/glsfcave/Makefile head/games/gnudoku/Makefile head/games/gnurobbo/Makefile head/games/gunfudeadlands/Makefile head/games/interlogic/Makefile head/games/jag/Makefile head/games/jigzo/Makefile head/games/kartofel/Makefile head/games/kiki/Makefile head/games/maxr/Makefile head/games/meandmyshadow/Makefile head/games/meandmyshadow/pkg-descr head/games/memonix/Makefile head/games/meritous/Makefile head/games/meritous/files/patch-src-boss.c head/games/meritous/files/patch-src-levelblit.c head/games/nimuh/Makefile head/games/npush/Makefile head/games/openmortal/Makefile head/games/openmortal/files/patch-src_gfx.cpp head/games/osgg/Makefile head/games/outerspace/Makefile head/games/pachi/Makefile head/games/passage/Makefile head/games/penguin-command/Makefile head/games/pengupop/Makefile head/games/pink-pony/Makefile head/games/pink-pony/files/patch-lib-GL-GLee.h head/games/ri-li/Makefile head/games/scramble/Makefile head/games/sdlsand/Makefile head/games/shootingstar/Makefile head/games/simplevaders/Makefile head/games/stormbaancoureur/Makefile head/games/untahris/Makefile head/games/untahris/files/patch-intface.cpp head/games/xorgramana/Makefile head/games/xorgramana/pkg-descr head/games/xtron/Makefile head/graphics/autopano-sift-c/Makefile head/graphics/exifprobe/Makefile head/graphics/ftgl/Makefile head/graphics/ftgl/pkg-descr head/graphics/glosm/Makefile head/graphics/glosm/pkg-descr head/graphics/glpng/Makefile head/graphics/glpng/files/patch-glpng.c head/graphics/makehuman/Makefile head/graphics/nathive/Makefile head/graphics/py-pyglet/Makefile head/graphics/py-rabbyt/Makefile head/graphics/py-rabbyt/pkg-descr head/graphics/quesoglc/Makefile head/graphics/sk1libs/Makefile head/graphics/sk1libs/pkg-descr head/graphics/structuresynth/Makefile head/graphics/structuresynth/files/patch-SyntopiaCore__GLEngine__Raytracer__RayTracer.cpp head/graphics/structuresynth/files/patch-SyntopiaCore__GLEngine__Sphere.h head/graphics/uniconvertor/Makefile head/graphics/uniconvw/Makefile head/graphics/wings-devel/Makefile head/graphics/wings/Makefile head/x11-themes/qt4-style-float/Makefile head/x11-themes/qt4-style-float/pkg-descr head/x11-themes/qt4-style-phase/Makefile head/x11-themes/qt4-style-phase/pkg-descr head/x11-themes/qt4-style-quantumstyle/Makefile head/x11-themes/qt4-style-quantumstyle/pkg-descr Modified: head/audio/wavplay/Makefile ============================================================================== --- head/audio/wavplay/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/audio/wavplay/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: wavplay -# Date created: 14 January 2000 -# Whom: greg -# +# Created by: greg # $FreeBSD$ -# PORTNAME= wavplay PORTVERSION= 1.4 Modified: head/devel/gitg/Makefile ============================================================================== --- head/devel/gitg/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/gitg/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gitg -# Date created: 2010-03-19 -# Whom: kipz -# +# Created by: kipz # $FreeBSD$ -# PORTNAME= gitg PORTVERSION= 0.0.8 @@ -14,11 +10,11 @@ MASTER_SITES= GNOME MAINTAINER= amdmi3@FreeBSD.org COMMENT= GTK-based git repository viewer -RUN_DEPENDS= git>=1.7.0.2:${PORTSDIR}/devel/git - LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +RUN_DEPENDS= git>=1.7.0.2:${PORTSDIR}/devel/git + USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes Modified: head/devel/gitg/pkg-descr ============================================================================== --- head/devel/gitg/pkg-descr Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/gitg/pkg-descr Tue Jun 18 11:46:51 2013 (r321181) @@ -6,4 +6,4 @@ representation of data and actions. It c * Show colorized diff of changes in revisions * Handles extremely large projects very well -WWW: http://trac.novowork.com/gitg/wiki +WWW: http://trac.novowork.com/gitg/wiki Modified: head/devel/love/Makefile ============================================================================== --- head/devel/love/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/love/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: love -# Date created: 01 Aug 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= love PORTVERSION= 0.8.0 @@ -40,11 +36,13 @@ PLIST_FILES= bin/love PORTDOCS= * +.include + post-patch: @${REINPLACE_CMD} -e '/^prefix=/ d; /^bindir=/ d; /^libdir=/ d; \ /test/ s|==|=|' ${WRKSRC}/configure -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} .for f in changes.txt readme.md Modified: head/devel/love07/Makefile ============================================================================== --- head/devel/love07/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/love07/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: love -# Date created: 01 Aug 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= love PORTVERSION= 0.7.2 @@ -46,11 +42,13 @@ PLIST_FILES= bin/love07 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}07 PORTDOCS= * +.include + post-patch: @${REINPLACE_CMD} -e '/^prefix=/ d; /^bindir=/ d; /^libdir=/ d' \ ${WRKSRC}/configure -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} .for f in changes.txt readme.txt Modified: head/devel/love5/Makefile ============================================================================== --- head/devel/love5/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/love5/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: love -# Date created: 01 Aug 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= love DISTVERSION= 0.5-0 @@ -37,13 +33,15 @@ PLIST_FILES= bin/love5 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}5 PORTDOCS= * +.include + post-patch: @${REINPLACE_CMD} -e 's|ILvoid|void|' ${WRKSRC}/src/opengl/Image.cpp \ ${WRKSRC}/src/opengl/love_opengl.cpp @${REINPLACE_CMD} -e '/^prefix=/ d; /^bindir=/ d; /^libdir=/ d' \ ${WRKSRC}/configure -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} .for f in changes.txt readme.txt Modified: head/devel/p5-Tree-R/Makefile ============================================================================== --- head/devel/p5-Tree-R/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/p5-Tree-R/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-Tree-R -# Date created: 03 Mar 2011 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= Tree-R PORTVERSION= 0.06 Modified: head/devel/p5-Tree-R/pkg-descr ============================================================================== --- head/devel/p5-Tree-R/pkg-descr Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/p5-Tree-R/pkg-descr Tue Jun 18 11:46:51 2013 (r321181) @@ -1,3 +1,3 @@ Tree::R - Perl extension for the Rtree data structure and algorithms -WWW: http://search.cpan.org/dist/Tree-R/ +WWW: http://search.cpan.org/dist/Tree-R/ Modified: head/devel/p5-WeakRef/Makefile ============================================================================== --- head/devel/p5-WeakRef/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/p5-WeakRef/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-WeakRef -# Date created: 14 Jun 2006 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= WeakRef PORTVERSION= 0.01 Modified: head/devel/sfml/Makefile ============================================================================== --- head/devel/sfml/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/sfml/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sfml -# Date created: 07 Jul 2009 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= sfml PORTVERSION= 1.6 @@ -15,10 +11,10 @@ DISTNAME= SFML-${PORTVERSION}-sdk-linux- MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple and Fast Multimedia Library -LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile \ + jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ - freetype.9:${PORTSDIR}/print/freetype2 + freetype:${PORTSDIR}/print/freetype2 USE_GMAKE= yes USE_OPENAL= al @@ -34,6 +30,8 @@ PORTDOCS= * PORTSCOUT= limit:[^c]$$ +.include + post-extract: @${RM} -f ${WRKSRC}/lib/* @${FIND} ${WRKSRC}/samples/bin/ -type f -maxdepth 1 -delete @@ -42,7 +40,7 @@ post-install: .for lib in audio graphics network system window @${LN} -s libsfml-${lib}.so.${PORTVERSION} ${PREFIX}/lib/libsfml-${lib}.so.${PORTVERSION:C/^([0-9]).*/\1/} .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "*" ${DOCSDIR}/ .endif Modified: head/devel/tokamak/Makefile ============================================================================== --- head/devel/tokamak/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/devel/tokamak/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: tokamak -# Date created: 24 Jun 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= tokamak PORTVERSION= 1.0.5a @@ -26,7 +22,7 @@ BUILD_WRKSRC= ${WRKSRC}/build/gnu PORTDOCS= * -.include +.include .if !defined(WITH_DEBUG) CPPFLAGS+= -DNDEBUG @@ -43,11 +39,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/include/tokamak.h ${PREFIX}/include/ ${INSTALL_DATA} ${WRKSRC}/include/math/*.h ${PREFIX}/include/math/ ${INSTALL_DATA} ${WRKSRC}/lib/libtokamak_m.a ${PREFIX}/lib/ - -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/license.txt ${WRKSRC}/readme.txt ${DOCSDIR} cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} . ${DOCSDIR} .endif -.include +.include Modified: head/editors/chexedit/Makefile ============================================================================== --- head/editors/chexedit/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/editors/chexedit/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: chexedit -# Date Created: 8 Jul 2000 -# Whom: Roman Shterenzon -# +# Created by: Roman Shterenzon # $FreeBSD$ -# PORTNAME= chexedit PORTVERSION= 0.9.7 Modified: head/editors/chexedit/pkg-descr ============================================================================== --- head/editors/chexedit/pkg-descr Tue Jun 18 11:09:58 2013 (r321180) +++ head/editors/chexedit/pkg-descr Tue Jun 18 11:46:51 2013 (r321181) @@ -14,4 +14,4 @@ times when this is ideal: * Any place you might use od(1) but need more power. Compare more vs less. -WWW: http://www.rogoyski.com/adam/programs/hexedit/ +WWW: http://www.rogoyski.com/adam/programs/hexedit/ Modified: head/editors/hnb/Makefile ============================================================================== --- head/editors/hnb/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/editors/hnb/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: hnb -# Date created: Fri Jul 6 05:37:14 EDT 2001 -# Whom: Patrick Li -# +# Created by: Patrick Li # $FreeBSD$ -# PORTNAME= hnb PORTVERSION= 1.9.17 @@ -21,7 +17,7 @@ MAKE_JOBS_UNSAFE= yes MAN1= hnb.1 -.include +.include .if ${ARCH} != "i386" BROKEN= segfaults on 64bit systems @@ -34,11 +30,11 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hnb ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/../doc/hnb.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for FILE in Documentation.hnb Documentation.html hnbrc ${INSTALL_DATA} ${WRKSRC}/../doc/${FILE} ${DOCSDIR} .endfor .endif -.include +.include Modified: head/games/biloba/Makefile ============================================================================== --- head/games/biloba/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/biloba/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: biloba -# Date created: 02 Oct 2005 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= biloba PORTVERSION= 0.9.3 Modified: head/games/biloba/pkg-descr ============================================================================== --- head/games/biloba/pkg-descr Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/biloba/pkg-descr Tue Jun 18 11:46:51 2013 (r321181) @@ -3,4 +3,4 @@ pawns on a hexagonal board and attempts pawns. Biloba includes an AI opponent, and supports local or network play. -WWW: http://biloba.sourceforge.net/ +WWW: http://biloba.sourceforge.net/ Modified: head/games/connectfive/Makefile ============================================================================== --- head/games/connectfive/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/connectfive/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: connectfive -# Date created: 20 Sep 2005 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= connectfive PORTVERSION= 1.0.2 @@ -24,20 +20,28 @@ USE_SDL= sdl USE_GL= gl USE_XORG= xmu xext x11 USE_GMAKE= yes +USE_DOS2UNIX= glfont2.h WRKSRC= ${WRKDIR}/connectFive +PLIST_FILES= bin/${PORTNAME} +PORTDOCS= * +PORTDATA= * + +.include + post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile.linux @${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/connect.cpp @${REINPLACE_CMD} -e 's|Board::||' ${WRKSRC}/Board.h do-install: - @${MKDIR} ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/connectfive ${PREFIX}/bin/ +.if !defined(NOPORTDATA) ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/ -.if !defined(NOPORTDOCS) +.endif +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG.txt ${WRKSRC}/LICENSE.txt ${WRKSRC}/README.txt ${DOCSDIR}/ .endif Modified: head/games/connectfive/files/patch-glfont2.h ============================================================================== --- head/games/connectfive/files/patch-glfont2.h Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/connectfive/files/patch-glfont2.h Tue Jun 18 11:46:51 2013 (r321181) @@ -1,13 +1,13 @@ --- glfont2.h.orig Sat Dec 20 10:26:21 2003 +++ glfont2.h Wed Sep 21 09:34:38 2005 @@ -8,7 +8,9 @@ - #ifndef GLFONT2_H - #define GLFONT2_H - --//#include -+#if defined(__GNUC__) && (__GNUC__ < 3) -+#include -+#endif - #include - #include - #include + #ifndef GLFONT2_H + #define GLFONT2_H + +-//#include ++#if defined(__GNUC__) && (__GNUC__ < 3) ++#include ++#endif + #include + #include + #include Modified: head/games/critterding/Makefile ============================================================================== --- head/games/critterding/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/critterding/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: critterding -# Date created: 15 Oct 2009 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= critterding DISTVERSION= beta12 @@ -14,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Evolving Artificial Life -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 USE_BZIP2= yes GNU_CONFIGURE= yes @@ -24,11 +20,13 @@ USE_GL= gl CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-system-ftgl -USE_GCC= 4.2+ +USE_GCC= yes MAKE_JOBS_SAFE= yes PORTDOCS= README AUTHORS Changelog +.include + post-patch: @${REINPLACE_CMD} -e 's|../share/critterding|${DATADIR}|' \ ${WRKSRC}/src/gui/textprinter.cpp ${WRKSRC}/src/gl/glwindow.cpp @@ -36,7 +34,7 @@ post-patch: pre-configure: cd ${WRKSRC} && ${AUTORECONF} -fi -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} Added: head/games/critterding/files/patch-src-scenes-evolution.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/critterding/files/patch-src-scenes-evolution.cpp Tue Jun 18 11:46:51 2013 (r321181) @@ -0,0 +1,11 @@ +--- src/scenes/evolution.cpp.orig 2010-03-06 01:14:29.000000000 +0300 ++++ src/scenes/evolution.cpp 2013-06-18 06:00:15.823111566 +0400 +@@ -287,7 +287,7 @@ + } + else if ( world->mouseRayHitEntity->type == 0 ) + { +- CritterB* c = static_cast(world->mouseRayHitEntity); ++ const CritterB* c = static_cast(world->mouseRayHitEntity); + Textprinter::Instance()->print( oldx+margin, oldy, "critter"); + Textprinter::Instance()->print(oldx+rmargindistance, oldy, "%1i", c->critterID); + Textprinter::Instance()->print( oldx+margin, oldy+vspacer, "energy"); Added: head/games/critterding/files/patch-src-utils-bullet-BulletSoftBody-btSoftBody.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/critterding/files/patch-src-utils-bullet-BulletSoftBody-btSoftBody.h Tue Jun 18 11:46:51 2013 (r321181) @@ -0,0 +1,50 @@ +--- src/utils/bullet/BulletSoftBody/btSoftBody.h.orig 2010-02-18 01:52:17.000000000 +0300 ++++ src/utils/bullet/BulletSoftBody/btSoftBody.h 2013-06-18 05:58:55.243113542 +0400 +@@ -182,6 +182,7 @@ + btScalar m_kAST; // Area/Angular stiffness coefficient [0,1] + btScalar m_kVST; // Volume stiffness coefficient [0,1] + int m_flags; // Flags ++ Material() {} + }; + + /* Feature */ +@@ -201,6 +202,7 @@ + btScalar m_area; // Area + btDbvtNode* m_leaf; // Leaf data + int m_battach:1; // Attached ++ Node() {} + }; + /* Link */ + struct Link : Feature +@@ -212,6 +214,7 @@ + btScalar m_c1; // rl^2 + btScalar m_c2; // |gradient|^2/c0 + btVector3 m_c3; // gradient ++ Link() {} + }; + /* Face */ + struct Face : Feature +@@ -220,6 +223,7 @@ + btVector3 m_normal; // Normal + btScalar m_ra; // Rest area + btDbvtNode* m_leaf; // Leaf data ++ Face() {} + }; + /* Tetra */ + struct Tetra : Feature +@@ -230,6 +234,7 @@ + btVector3 m_c0[4]; // gradients + btScalar m_c1; // (4*kVST)/(im0+im1+im2+im3) + btScalar m_c2; // m_c1/sum(|g0..3|^2) ++ Tetra() {} + }; + /* RContact */ + struct RContact +@@ -271,6 +276,7 @@ + int m_rank; // Rank + Node* m_nodes[4]; // Nodes + btScalar m_coords[4]; // Coordinates ++ Note() {} + }; + /* Pose */ + struct Pose Modified: head/games/crrcsim/Makefile ============================================================================== --- head/games/crrcsim/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/crrcsim/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: crrcsim -# Date created: 17 Jun 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= crrcsim PORTVERSION= 0.9.11 @@ -15,8 +11,8 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Model-airplane flight simulation program BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= portaudio.2:${PORTSDIR}/audio/portaudio2 \ - jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= portaudio:${PORTSDIR}/audio/portaudio2 \ + jpeg:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes USE_GMAKE= yes @@ -38,9 +34,11 @@ DESKTOP_ENTRIES="CRRCsim" \ "Game;Simulation;" \ false +.include + post-patch: @${REINPLACE_CMD} -e '/portaudio/ s|==|=|' ${WRKSRC}/configure -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-pkgdataDATA||; \ /^SUBDIRS =/ s|=.*|= man|' ${WRKSRC}/documentation/Makefile.in .endif Modified: head/games/dangen/Makefile ============================================================================== --- head/games/dangen/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/dangen/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dangen -# Date created: 25 Aug 2006 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= dangen PORTVERSION= 0.5 @@ -26,22 +22,25 @@ DESKTOP_ENTRIES="dangen" \ "Game;ArcadeGame;" \ false -PORTDOCS= README +PORTDOCS= * + +PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/image/font.png +PLIST_DIRS= %%DATADIR%%/image %%DATADIR%% MAN6= dangen.6 +.include + post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile.in \ ${WRKSRC}/libtenm/Makefile.in ${WRKSRC}/spqr/Makefile.in @${REINPLACE_CMD} -e 's|$$(datadir)/games/|$$(datadir)/|' ${WRKSRC}/spqr/image/Makefile.in @${REINPLACE_CMD} -e 's|/games||' ${WRKSRC}/util.c -.if !defined(NOPORTDOCS) post-install: +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ .endif .include Modified: head/games/egoboo/Makefile ============================================================================== --- head/games/egoboo/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/egoboo/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,7 +1,4 @@ -# New ports collection makefile for: egoboo -# Date created: Apr 28 2003 -# Whom: Jan Stocker -# +# Created by: Jan Stocker # $FreeBSD$ PORTNAME= egoboo @@ -19,19 +16,26 @@ COMMENT= A 3D dungeon crawling adventure USE_SDL= sdl ttf mixer image USE_GL= yes USE_GMAKE= yes +USE_DOS2UNIX= *.c WRKSRC= ${WRKDIR}/${DISTNAME}/game MAKEFILE= Makefile.unix +PLIST_FILES= bin/${PORTNAME} libexec/${PORTNAME} + +PORTDATA= * + post-patch: @${REINPLACE_CMD} -e 's|/usr/share/egoboo|${DATADIR}|g; \ s|cp -a|cp -RPp|; s|/usr/libexec|${PREFIX}/libexec|' \ ${WRKSRC}/egoboo.sh post-install: +.if !defined(NOPORTDATA) ${MKDIR} ${DATADIR} @cd ${WRKDIR}/${DISTNAME:S/-/-data-/} && \ ${COPYTREE_SHARE} . ${DATADIR} +.endif @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} Modified: head/games/egoboo/files/patch-game-lin-file.c ============================================================================== --- head/games/egoboo/files/patch-game-lin-file.c Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/egoboo/files/patch-game-lin-file.c Tue Jun 18 11:46:51 2013 (r321181) @@ -1,10 +1,10 @@ --- lin-file.c.orig 2007-11-16 22:36:58.000000000 +0300 +++ lin-file.c 2008-02-07 04:09:32.000000000 +0300 @@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - //File Routines----------------------------------------------------------- - void fs_init() + #include + #include + #include ++#include + + //File Routines----------------------------------------------------------- + void fs_init() Modified: head/games/f1spirit-remake/Makefile ============================================================================== --- head/games/f1spirit-remake/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/f1spirit-remake/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: f1spirit-remake -# Date created: 15 May 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= f1spirit-remake PORTVERSION= 1.0 @@ -17,17 +13,23 @@ DISTNAME= f1spirit-linux MAINTAINER= amdmi3@FreeBSD.org COMMENT= Remake of classic F1 Spirit racing game -LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl USE_ZIP= yes USE_GMAKE= yes USE_SDL= sdl net image mixer sound USE_GL= gl glu +USE_DOS2UNIX= *.h *.cpp WRKSRC= "${WRKDIR}/F-1 Spirit" BUILD_WRKSRC= ${WRKSRC}/sources +PLIST_FILES= bin/f1s + PORTDOCS= readme.txt +PORTDATA= * + +.include post-patch: @${FIND} ${BUILD_WRKSRC} -name '*.cpp' -print0 | ${XARGS} -0 ${REINPLACE_CMD} \ @@ -38,10 +40,11 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/f1s ${PREFIX}/bin +.if !defined(NOPORTDATA) ${MKDIR} ${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} 'demos designs f1spirit2.cfg graphics sound tracks' ${DATADIR} - -.if !defined(NOPORTDOCS) +.endif +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/games/f1spirit-remake/files/patch-sources-CCar.h ============================================================================== --- head/games/f1spirit-remake/files/patch-sources-CCar.h Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/f1spirit-remake/files/patch-sources-CCar.h Tue Jun 18 11:46:51 2013 (r321181) @@ -1,11 +1,11 @@ --- sources/CCar.h.orig 2006-02-11 13:48:14.000000000 +0300 +++ sources/CCar.h 2008-05-15 00:17:13.000000000 +0400 @@ -119,6 +119,8 @@ - - }; - -+class F1SpiritGame; -+class CTrack; - - class CCar { - friend class EnemyCCar; + + }; + ++class F1SpiritGame; ++class CTrack; + + class CCar { + friend class EnemyCCar; Modified: head/games/f1spirit-remake/files/patch-sources-CPlayer.cpp ============================================================================== --- head/games/f1spirit-remake/files/patch-sources-CPlayer.cpp Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/f1spirit-remake/files/patch-sources-CPlayer.cpp Tue Jun 18 11:46:51 2013 (r321181) @@ -1,42 +1,42 @@ --- sources/CPlayer.cpp.orig 2008-05-17 02:59:23.000000000 +0400 +++ sources/CPlayer.cpp 2008-05-17 03:01:31.000000000 +0400 @@ -204,7 +204,8 @@ - struct tm *today; - - gettimeofday(&ttime, NULL); -- today=localtime(&(ttime.tv_sec)); -+ time_t tmp = (time_t)ttime.tv_sec; -+ today=localtime(&tmp); - - position_date[i].year=today->tm_year; - position_date[i].month=today->tm_mon; + struct tm *today; + + gettimeofday(&ttime, NULL); +- today=localtime(&(ttime.tv_sec)); ++ time_t tmp = (time_t)ttime.tv_sec; ++ today=localtime(&tmp); + + position_date[i].year=today->tm_year; + position_date[i].month=today->tm_mon; @@ -231,7 +232,8 @@ - struct tm *today; - - gettimeofday(&ttime, NULL); -- today=localtime(&(ttime.tv_sec)); -+ time_t tmp = (time_t)ttime.tv_sec; -+ today=localtime(&tmp); - - time_date[i].year=today->tm_year; - time_date[i].month=today->tm_mon; + struct tm *today; + + gettimeofday(&ttime, NULL); +- today=localtime(&(ttime.tv_sec)); ++ time_t tmp = (time_t)ttime.tv_sec; ++ today=localtime(&tmp); + + time_date[i].year=today->tm_year; + time_date[i].month=today->tm_mon; @@ -258,7 +260,8 @@ - struct tm *today; - - gettimeofday(&ttime, NULL); -- today=localtime(&(ttime.tv_sec)); -+ time_t tmp = (time_t)ttime.tv_sec; -+ today=localtime(&tmp); - - lap_date[i].year=today->tm_year; - lap_date[i].month=today->tm_mon; + struct tm *today; + + gettimeofday(&ttime, NULL); +- today=localtime(&(ttime.tv_sec)); ++ time_t tmp = (time_t)ttime.tv_sec; ++ today=localtime(&tmp); + + lap_date[i].year=today->tm_year; + lap_date[i].month=today->tm_mon; @@ -285,7 +288,8 @@ - struct tm *today; - - gettimeofday(&ttime, NULL); -- today=localtime(&(ttime.tv_sec)); -+ time_t tmp = (time_t)ttime.tv_sec; -+ today=localtime(&tmp); - - position_date[i].year=today->tm_year; - position_date[i].month=today->tm_mon; + struct tm *today; + + gettimeofday(&ttime, NULL); +- today=localtime(&(ttime.tv_sec)); ++ time_t tmp = (time_t)ttime.tv_sec; ++ today=localtime(&tmp); + + position_date[i].year=today->tm_year; + position_date[i].month=today->tm_mon; Modified: head/games/fishsupper/Makefile ============================================================================== --- head/games/fishsupper/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/fishsupper/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fishsupper -# Date created: 25 Mar 2006 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= fishsupper PORTVERSION= 0.1.6 @@ -34,8 +30,10 @@ DESKTOP_ENTRIES="Fish Supper" \ "Game;ArcadeGame;" \ false -.if !defined(NOPORTDOCS) +.include + post-install: +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/games/flyhard/Makefile ============================================================================== --- head/games/flyhard/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/flyhard/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: flyhard -# Date created: 15 Jan 2007 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= flyhard PORTVERSION= 0.42 @@ -27,8 +23,10 @@ LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE} PORTDOCS= README -.if !defined(NOPORTDOCS) +.include + post-install: +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/games/freera/Makefile ============================================================================== --- head/games/freera/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/freera/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: freera -# Date created: 01 Feb 2007 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= freera PORTVERSION= 080203 Modified: head/games/funnyboat/Makefile ============================================================================== --- head/games/funnyboat/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/funnyboat/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: funnyboat -# Date created: 18 Mar 2007 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= funnyboat PORTVERSION= 1.5 @@ -28,6 +24,8 @@ SUB_LIST= PROGRAM_DIR="${PREFIX}/lib/${P PORTDOCS= README.txt +.include + do-install: ${MKDIR} ${PREFIX}/lib/${PORTNAME} ${MKDIR} ${PREFIX}/lib/${PORTNAME}/data @@ -35,8 +33,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/lib/${PORTNAME}/data ${INSTALL_SCRIPT} ${WRKDIR}/funnyboat_ ${PREFIX}/bin/funnyboat -.if !defined(NOPORTDOCS) post-install: +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/games/glsfcave/Makefile ============================================================================== --- head/games/glsfcave/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/glsfcave/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: glsfcave -# Date created: 19 Mar 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= glsfcave PORTVERSION= 1.0 @@ -11,7 +7,6 @@ PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://user.ecc.u-tokyo.ac.jp/~g650192/glsfcave/ \ http://mirror.amdmi3.ru/distfiles/ -MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Control a ribbon to avoid hitting walls @@ -21,21 +16,20 @@ USE_GL= glut WRKSRC= ${WRKDIR}/${PORTNAME} -PORTDOCS= README +PORTDOCS= * PLIST_FILES= bin/glsfcave +.include + do-build: cd ${WRKSRC} && ${CC} -o glsfcave main.c -I${LOCALBASE}/include \ -L${LOCALBASE}/lib -lglut -lGL -lGLU do-install: ${INSTALL_PROGRAM} ${WRKSRC}/glsfcave ${PREFIX}/bin - -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include Modified: head/games/gnudoku/Makefile ============================================================================== --- head/games/gnudoku/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/gnudoku/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,23 +1,21 @@ -# New ports collection makefile for: GNUDoku -# Date created: 12 Jan 2006 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= GNUDoku PORTVERSION= 0.93 PORTREVISION= 6 CATEGORIES= games -MASTER_SITES= http://offload2.icculus.org:9090/~jcspray/GNUDoku/ +MASTER_SITES= http://offload2.icculus.org:9090/~jcspray/GNUDoku/ \ + http://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= A free program for creating and solving Su Doku puzzles -LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 +LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 USE_GMAKE= yes MAKE_ENV= CXXLAGS="${CXXFLAGS}" +USE_PKGCONFIG= build post-patch: @${REINPLACE_CMD} -e 's|PREFIX=|PREFIX?=|' ${WRKSRC}/Makefile Modified: head/games/gnurobbo/Makefile ============================================================================== --- head/games/gnurobbo/Makefile Tue Jun 18 11:09:58 2013 (r321180) +++ head/games/gnurobbo/Makefile Tue Jun 18 11:46:51 2013 (r321181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gnurobbo -# Date created: 05 Mar 2009 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= gnurobbo PORTVERSION= 0.66 @@ -24,9 +20,11 @@ MAKE_ENV= PACKAGE_DATA_DIR="${DATADIR}" PORTDOCS= * +.include + post-patch: @${REINPLACE_CMD} -e '/define DEBUG_DUMP_VM_USAGE/ d' ${WRKSRC}/game.c -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***