From owner-svn-ports-all@FreeBSD.ORG Sun Jan 12 18:50:44 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org 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 D203DF9E; Sun, 12 Jan 2014 18:50:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B21A017E1; Sun, 12 Jan 2014 18:50:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CIoiJ8056922; Sun, 12 Jan 2014 18:50:44 GMT (envelope-from bar@svn.freebsd.org) Received: (from bar@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CIoiO0056920; Sun, 12 Jan 2014 18:50:44 GMT (envelope-from bar@svn.freebsd.org) Message-Id: <201401121850.s0CIoiO0056920@svn.freebsd.org> From: Barbara Guida Date: Sun, 12 Jan 2014 18:50:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339530 - head/games/vavoom 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.17 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: Sun, 12 Jan 2014 18:50:44 -0000 Author: bar Date: Sun Jan 12 18:50:44 2014 New Revision: 339530 URL: http://svnweb.freebsd.org/changeset/ports/339530 Log: - Support stage directory - Use new syntax for LIB_DEPENDS - Added LICENSE - Added MAKE_JOBS_UNSAFE=yes - Strip some binaries - Replace the broken fixunix.sh script with an equivalent DOS2UNIX_REGEX - Pet portlint - Remove ALLEGRO option - graphics/allegrogl is gone and there is no option to build devel/allegro with opengl extension Approved by: flo (mentor) Modified: head/games/vavoom/Makefile head/games/vavoom/pkg-descr Modified: head/games/vavoom/Makefile ============================================================================== --- head/games/vavoom/Makefile Sun Jan 12 18:50:42 2014 (r339529) +++ head/games/vavoom/Makefile Sun Jan 12 18:50:44 2014 (r339530) @@ -10,25 +10,26 @@ MASTER_SITES= SF/${PORTNAME}/Vavoom-sour MAINTAINER= bar@FreeBSD.org COMMENT= Doom, Doom II, Heretic, Hexen, and Strife source port -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png +LICENSE= GPLv2 + +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png USE_BZIP2= yes -USES= cmake +USES= cmake dos2unix +DOS2UNIX_REGEX= ((.*\.(c|cpp|h|s|asm|inc|vc|ls|acs|cfg|txt|vs|mak|mgw"))$$|\/(makefile\..*|makefile|Makefile)$$) + +MAKE_JOBS_UNSAFE= yes -OPTIONS_SINGLE= HWAPI -OPTIONS_SINGLE_HWAPI= ALLEGRO SDL -OPTIONS_DEFINE= ALLEGRO FLAC LAUNCHER MAD MIKMOD OPENAL OPENGL OPTIMIZED_CFLAGS VORBIS SDL WXUNICODE DOCS +OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL WXUNICODE DOCS OPTIONS_DEFAULT= OPENGL SDL WXUNICODE -ALLEGRO_DESC= Use Allegro for hardware API LAUNCHER_DESC= Build GUI launcher OPENAL_DESC= Enable OpenAL support -SDL_DESC= Use SDL for hardware API +SDL_DESC= Use SDL for OpenGL support WXUNICODE_DESC= Enable Unicode support SUB_FILES= pkg-message -NO_STAGE= yes .include # The `-fno-strict-aliasing' flag (default on FreeBSD 6.0+) produces @@ -36,15 +37,8 @@ NO_STAGE= yes CFLAGS:= ${CFLAGS:N-fno-strict-aliasing} CXXFLAGS:= ${CFLAGS:N-fno-strict-aliasing} -.if ${PORT_OPTIONS:MALLEGRO} -LIB_DEPENDS+= alleg:${PORTSDIR}/devel/allegro -CMAKE_ARGS+= -DWITH_ALLEGRO=Y -.else -CMAKE_ARGS+= -DWITH_ALLEGRO=N -.endif - .if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac +LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac CMAKE_ARGS+= -DWITH_FLAC=Y .else CMAKE_ARGS+= -DWITH_FLAC=N @@ -61,14 +55,14 @@ PLIST_SUB+= LAUNCHER="@comment " .endif .if ${PORT_OPTIONS:MMAD} -LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad +LIB_DEPENDS+= libmad.so:${PORTSDIR}/audio/libmad CMAKE_ARGS+= -DWITH_LIBMAD=Y .else CMAKE_ARGS+= -DWITH_LIBMAD=N .endif .if ${PORT_OPTIONS:MMIKMOD} -LIB_DEPENDS+= mikmod:${PORTSDIR}/audio/libmikmod +LIB_DEPENDS+= libmikmod.so:${PORTSDIR}/audio/libmikmod CMAKE_ARGS+= -DWITH_MIKMOD=Y .else CMAKE_ARGS+= -DWITH_MIKMOD=N @@ -81,23 +75,12 @@ CMAKE_ARGS+= -DWITH_OPENAL=Y CMAKE_ARGS+= -DWITH_OPENAL=N .endif -.if ${PORT_OPTIONS:MOPENGL} -USE_GL= yes -. if ${PORT_OPTIONS:MALLEGRO} -LIB_DEPENDS+= agl:${PORTSDIR}/graphics/allegrogl -BROKEN= please use SDL instead of ALLEGRO, for OPENGL support -. endif -CMAKE_ARGS+= -DWITH_OPENGL=Y -.else -CMAKE_ARGS+= -DWITH_OPENGL=N -.endif - .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif .if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis CMAKE_ARGS+= -DWITH_VORBIS=Y .else CMAKE_ARGS+= -DWITH_VORBIS=N @@ -106,8 +89,11 @@ CMAKE_ARGS+= -DWITH_VORBIS=N .if ${PORT_OPTIONS:MSDL} USE_SDL= mixer sdl CMAKE_ARGS+= -DWITH_SDL=Y +USE_GL= yes +CMAKE_ARGS+= -DWITH_OPENGL=Y .else CMAKE_ARGS+= -DWITH_SDL=N +CMAKE_ARGS+= -DWITH_OPENGL=N .endif .if ${PORT_OPTIONS:MWXUNICODE} @@ -115,7 +101,6 @@ WX_UNICODE=yes .endif post-patch: - @cd ${WRKSRC} && ${SH} fixunix.sh @${REINPLACE_CMD} -e 's|$$\* ||; s|$${IWADDIR}|-iwaddir ${DMDIR} $$*|' \ ${WRKSRC}/source/CMakeLists.txt @${REINPLACE_CMD} -e 's///' \ @@ -132,12 +117,11 @@ post-configure: post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${STAGEDIR}${DOCSDIR} .endif - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vavoom.bin + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vavoom-dedicated.bin .include "${PORTSDIR}/games/doom-data/Makefile.include" Modified: head/games/vavoom/pkg-descr ============================================================================== --- head/games/vavoom/pkg-descr Sun Jan 12 18:50:42 2014 (r339529) +++ head/games/vavoom/pkg-descr Sun Jan 12 18:50:44 2014 (r339530) @@ -15,4 +15,4 @@ Differences from original game: * Jumping; * And many other cool things... -WWW: http://www.vavoom-engine.com/ +WWW: http://www.vavoom-engine.com/