From owner-svn-ports-all@freebsd.org Wed Dec 14 04:48:48 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D76CEC76253; Wed, 14 Dec 2016 04:48:48 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B20F4155F; Wed, 14 Dec 2016 04:48:48 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBE4mlWG015936; Wed, 14 Dec 2016 04:48:47 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBE4mlKd015934; Wed, 14 Dec 2016 04:48:47 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201612140448.uBE4mlKd015934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Wed, 14 Dec 2016 04:48:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428545 - in head/games: . alienarena alienarena-data 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.23 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: Wed, 14 Dec 2016 04:48:48 -0000 Author: acm Date: Wed Dec 14 04:48:47 2016 New Revision: 428545 URL: https://svnweb.freebsd.org/changeset/ports/428545 Log: - Re-add games/alienarena and games/alienarena-data ports Added: head/games/alienarena/ - copied from r367482, head/games/alienarena/ head/games/alienarena-data/ - copied from r367482, head/games/alienarena-data/ Modified: head/games/Makefile head/games/alienarena/Makefile Modified: head/games/Makefile ============================================================================== --- head/games/Makefile Wed Dec 14 03:47:18 2016 (r428544) +++ head/games/Makefile Wed Dec 14 04:48:47 2016 (r428545) @@ -32,6 +32,8 @@ SUBDIR += alephone-data SUBDIR += alephone-scenarios SUBDIR += alex4 + SUBDIR += alienarena + SUBDIR += alienarena-data SUBDIR += alienblaster SUBDIR += alienwave SUBDIR += allacrost Modified: head/games/alienarena/Makefile ============================================================================== --- head/games/alienarena/Makefile Sat Sep 6 23:03:41 2014 (r367482) +++ head/games/alienarena/Makefile Wed Dec 14 04:48:47 2016 (r428545) @@ -5,29 +5,26 @@ PORTNAME= alienarena PORTVERSION= 2013.766 PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \ - http://ftp.jeuxlinux.fr/files/ \ - http://mirror.ipgn.com.au/games/alienarena/ \ - http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/ \ - http://offload2.icculus.org:9090/alienarena/Files/ \ - http://offload1.icculus.org:9090/alienarena/Files/ \ +MASTER_SITES= SF/alienarena.mirror/Alien%20Arena%207.66/ \ http://icculus.org/alienarena/Files/ \ http://red.planetarena.org/files/ \ ${MASTER_SITE_GENTOO:S|$|distfiles/|} DISTNAME= ${PORTNAME}-7.66-linux20130827 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= acm@FreeBSD.org COMMENT= Alien Arena (native version) RUN_DEPENDS= ${DATADIR}/data1/default.cfg:${PORTSDIR}/games/alienarena-data -USES= dos2unix gmake +USES= compiler:c++11-lib dos2unix gmake +USE_CXXSTD= c++11 GNU_CONFIGURE= yes CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.66/ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--with-xf86vm \ - --with-xf86dga + --with-xf86dga \ + --with-system-libode EXTRACT_AFTER_ARGS= --exclude "data1" @@ -48,7 +45,6 @@ PLIST_SUB= LIBDIR=${LIBDIR:S/${PREFIX}\/ LIBDIR= ${PREFIX}/lib/${PORTNAME} -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCLIENT} @@ -56,8 +52,9 @@ USES+= openal:soft,alut pkgconfig LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng15.so:${PORTSDIR}/graphics/png \ + libpng16.so:${PORTSDIR}/graphics/png \ libvorbis.so:${PORTSDIR}/audio/libvorbis +BUILD_DEPENDS+= ${LOCALBASE}/lib/libode.a:devel/ode USE_GL= yes USE_XORG= xxf86dga xxf86vm .endif @@ -79,24 +76,27 @@ PLIST_SUB+= DEDICATED="@comment " .endif post-patch: + @${REINPLACE_CMD} -e "s|(CCLD)|(CXX)|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/client/snd_openal.c @${REINPLACE_CMD} -e "s|.codered|.config/alienarena|g" ${WRKSRC}/qcommon/qcommon.h # Resolve name collision with jpeg-8 ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \ ${WRKSRC}/ref_gl/r_image.c + ${REINPLACE_CMD} -e 's|inline void IQM_DrawVBO|void IQM_DrawVBO|' \ + ${WRKSRC}/ref_gl/r_iqm.c do-install: - ${MKDIR} ${LIBDIR}/arena ${LIBDIR}/data1 - ${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena - ${LN} -s ${DATADIR}/botinfo ${LIBDIR} - ${LN} -s ${DATADIR}/data1/* ${LIBDIR}/data1 + ${MKDIR} ${STAGEDIR}${LIBDIR}/arena ${STAGEDIR}${LIBDIR}/data1 + ${LN} -s ${DATADIR}/arena/* ${STAGEDIR}${LIBDIR}/arena + ${LN} -s ${DATADIR}/botinfo ${STAGEDIR}${LIBDIR} + ${LN} -s ${DATADIR}/data1/* ${STAGEDIR}${LIBDIR}/data1 .if ${PORT_OPTIONS:MCLIENT} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ - ${PREFIX}/bin/${PORTNAME} + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .endif .if ${PORT_OPTIONS:MDEDICATED} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-ded \ - ${PREFIX}/bin/${PORTNAME}-ded + ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-ded .endif post-install: