From owner-svn-ports-all@FreeBSD.ORG Wed Sep 12 11:10:11 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3845106566C; Wed, 12 Sep 2012 11:10:11 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B4F148FC12; Wed, 12 Sep 2012 11:10:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8CBABu9055294; Wed, 12 Sep 2012 11:10:11 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8CBABce055291; Wed, 12 Sep 2012 11:10:11 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201209121110.q8CBABce055291@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 12 Sep 2012 11:10:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304142 - head/games/cake X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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, 12 Sep 2012 11:10:12 -0000 Author: danfe Date: Wed Sep 12 11:10:11 2012 New Revision: 304142 URL: http://svn.freebsd.org/changeset/ports/304142 Log: - Fix segmentation fault due to inclusion of outdated JPEG header - Remove ABI shlib version from LIB_DEPENDS, define LICENSE - Sort out knobs, throw in a few comments, augment COMMENT - Remove dead master site from Makefile and port description Modified: head/games/cake/Makefile head/games/cake/pkg-descr Modified: head/games/cake/Makefile ============================================================================== --- head/games/cake/Makefile Wed Sep 12 09:47:56 2012 (r304141) +++ head/games/cake/Makefile Wed Sep 12 11:10:11 2012 (r304142) @@ -7,18 +7,23 @@ PORTNAME= cake PORTVERSION= 2005.12.26 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games -MASTER_SITES= http://www.calodox.scene.org/morbac/cake/download/ \ - ${MASTER_SITE_LOCAL} http://freebsd.nsu.ru/distfiles/ -MASTER_SITE_SUBDIR= danfe +MASTER_SITES= http://freebsd.nsu.ru/distfiles/ DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/.//g} MAINTAINER= danfe@FreeBSD.org -COMMENT= Quake3 map viewer +COMMENT= Quake3 map viewer (and powerful 3D game engine) + +LICENSE= GPLv2 + +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg + +USE_XORG= x11 xext xmu xt xi sm ice +USE_GL= glut # Need to pass `-l', but PATCH_ARGS+= won't work because of PATCH_ARGS?= -# in bsd.port.mk. +# in bsd.port.mk PATCH_ARGS= -d ${PATCH_WRKSRC} -N -s -E ${PATCH_STRIP} -l USE_GMAKE= yes USE_ZIP= yes @@ -29,18 +34,18 @@ WRKSRC= ${WRKDIR}/cake_src PLIST_FILES= bin/cake -USE_XORG= x11 xext xmu xt xi sm ice -USE_GL= glut -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg - post-patch: .SILENT ${FIND} -E ${WRKDIR} -type f \( -iregex ".*\.(cpp|h)" -or \ -name Makefile \) \ -exec ${REINPLACE_CMD} -E -e 's/[[:cntrl:]]*$$//' \ -e 's/#pragma[[:blank:]]+pack[[:blank:]]*\([[:blank:]]*push[[:blank:]]*,[[:blank:]]*1[[:blank:]]*\)/#pragma pack(1)/g' \ -e 's/#pragma[[:blank:]]+pack[[:blank:]]*\([[:blank:]]*pop[[:blank:]]*\)/#pragma pack()/g' '{}' \; + ${REINPLACE_CMD} -e 's/jpeg\/JPEGLIB\.H/jpeglib.h/' \ + ${WRKSRC}/cake/texture.cpp +# Fmod library is not supported on FreeBSD, so no sound :( ${REINPLACE_CMD} -e 's/ENABLE_SOUND 1/ENABLE_SOUND 0/' \ ${WRKSRC}/cake/sound.h +# Use traditional mapping for console key (tilde) ${REINPLACE_CMD} -e 's/167/96/' ${WRKSRC}/main.cpp # Fix for GCC 4.x ${REINPLACE_CMD} -e 's/Mat3x2:://' ${WRKSRC}/cake/math.h Modified: head/games/cake/pkg-descr ============================================================================== --- head/games/cake/pkg-descr Wed Sep 12 09:47:56 2012 (r304141) +++ head/games/cake/pkg-descr Wed Sep 12 11:10:11 2012 (r304142) @@ -16,5 +16,3 @@ for id Software's Quake III Arena maps. * models * entities (with variable LOD) * zip compressed files (*.pk3) - -WWW: http://www.calodox.scene.org/morbac/cake/