From owner-svn-ports-all@FreeBSD.ORG Fri Sep 6 14:28:03 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BF58DF48; Fri, 6 Sep 2013 14:28:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) 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 9D3F82FFF; Fri, 6 Sep 2013 14:28:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r86ES38p034935; Fri, 6 Sep 2013 14:28:03 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r86ES3B5034933; Fri, 6 Sep 2013 14:28:03 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201309061428.r86ES3B5034933@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 6 Sep 2013 14:28:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326505 - head/games/gtkradiant 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: Fri, 06 Sep 2013 14:28:03 -0000 Author: danfe Date: Fri Sep 6 14:28:02 2013 New Revision: 326505 URL: http://svnweb.freebsd.org/changeset/ports/326505 Log: - Reduce some minor differences with `games/netradiant'; mention the latter in the port description - While here, fix annoying warnings of "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" Modified: head/games/gtkradiant/Makefile head/games/gtkradiant/pkg-descr Modified: head/games/gtkradiant/Makefile ============================================================================== --- head/games/gtkradiant/Makefile Fri Sep 6 14:23:20 2013 (r326504) +++ head/games/gtkradiant/Makefile Fri Sep 6 14:28:02 2013 (r326505) @@ -4,7 +4,7 @@ PORTNAME= gtkradiant PORTVERSION= 1.5.0 PORTREVISION= 9 -CATEGORIES= games +CATEGORIES= games cad MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|source/:id|} \ http://www.bsd-geek.de/FreeBSD/distfiles/:fb DISTNAME= GtkRadiant-GPL @@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:id ${PORTNAME}_gamepacks${EXTRACT_SUFX}:fb MAINTAINER= danfe@FreeBSD.org -COMMENT= Level design program developed by id Software and Loki Software +COMMENT= Map editor for FPS games, by id Software and Loki Software LICENSE= GPLv2 @@ -20,8 +20,6 @@ LIB_DEPENDS= libgtkglext-x11-1.0.so:${PO libmhash.so:${PORTSDIR}/security/mhash \ libpng15.so:${PORTSDIR}/graphics/png -WRKSRC= ${WRKDIR}/GPL/GtkRadiant - USES= pkgconfig USE_ZIP= yes USE_GNOME= gtk20 libxml2 @@ -29,8 +27,10 @@ USE_PYTHON_BUILD= yes USE_SCONS= yes SCONS_ARGS= ${MAKE_ENV} BUILD=release -SUB_FILES= ${PORTNAME} DATADIR= ${PREFIX}/lib/${PORTNAME} +WRKSRC= ${WRKDIR}/GPL/GtkRadiant + +SUB_FILES= ${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's/-ldl//' ${WRKSRC}/SConscript @@ -49,11 +49,16 @@ post-patch: ${WRKSRC}/radiant/patch.cpp \ ${WRKSRC}/radiant/watchbsp.cpp \ ${WRKSRC}/tools/quake3/common/inout.c - @${REINPLACE_CMD} -e '/#include "generic\/reference.h"/x ; 318G' \ +# Fix the build against Clang + @${REINPLACE_CMD} -e '/#include "generic\/reference\.h"/x ; 318G' \ ${WRKSRC}/libs/scenelib.h - @${REINPLACE_CMD} -e '/#include "generic\/referencecounted.h/ { \ + @${REINPLACE_CMD} -e '/#include "generic\/referencecounted\.h/ { \ x ; s/^/#include "scenelib.h"/ ; G ; }' \ ${WRKSRC}/plugins/mapq3/parse.h +# Fix warnings of "GtkSpinButton: setting an adjustment with non-zero +# page size is deprecated" (very annoying) + @${FIND} ${WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} \ + -E 's|(gtk_adjustment_new[^)]*,)[^)]*|\1 0|' post-build: cd ${WRKSRC} && ${PYTHON_CMD} install.py Modified: head/games/gtkradiant/pkg-descr ============================================================================== --- head/games/gtkradiant/pkg-descr Fri Sep 6 14:23:20 2013 (r326504) +++ head/games/gtkradiant/pkg-descr Fri Sep 6 14:28:02 2013 (r326505) @@ -14,4 +14,6 @@ originally under id Software's proprieta editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. +More up-to-date fork, NetRadiant, is available as `games/netradiant' port. + WWW: http://www.qeradiant.com/