From owner-svn-ports-all@freebsd.org Thu Mar 26 15:41:24 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FE5D2A2DA3; Thu, 26 Mar 2020 15:41:24 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48p8NM3ldyz4Rfr; Thu, 26 Mar 2020 15:41:23 +0000 (UTC) (envelope-from danfe@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74AF2862A; Thu, 26 Mar 2020 15:41:00 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02QFf0lR044821; Thu, 26 Mar 2020 15:41:00 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02QFf0iu044814; Thu, 26 Mar 2020 15:41:00 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202003261541.02QFf0iu044814@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 26 Mar 2020 15:40:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529196 - head/games/netradiant X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/games/netradiant X-SVN-Commit-Revision: 529196 X-SVN-Commit-Repository: ports 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.29 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: Thu, 26 Mar 2020 15:41:24 -0000 Author: danfe Date: Thu Mar 26 15:40:59 2020 New Revision: 529196 URL: https://svnweb.freebsd.org/changeset/ports/529196 Log: - When fixing __linux__ -> __FreeBSD__ checks, narrow down the file list so sed(1) would only edit necessary files, not every *.[ch] - Add missing USE_XORG components, remove banal comment, and update WWW line in the port description while I'm here Modified: head/games/netradiant/Makefile head/games/netradiant/pkg-descr Modified: head/games/netradiant/Makefile ============================================================================== --- head/games/netradiant/Makefile Thu Mar 26 15:27:03 2020 (r529195) +++ head/games/netradiant/Makefile Thu Mar 26 15:40:59 2020 (r529196) @@ -29,7 +29,7 @@ USES= compiler:c++11-lang gl gmake gnome jpeg localba pkgconfig tar:xz xorg USE_GL= gl glu USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 libxml2 pango pangox-compat -USE_XORG= x11 +USE_XORG= ice sm x11 xmu xt MAKE_ENV= BUILD=release DOWNLOAD_GAMEPACKS=no EXE=${ARCH} \ RADIANT_ABOUTMSG="For ${OPSYS} ${OSREL} (${ARCH})" @@ -52,9 +52,8 @@ post-patch: ${WRKSRC}/tools/quake2/qdata/qdata.c @${REINPLACE_CMD} -e 's,#ifndef WIN32,#ifdef NeXT,' \ ${WRKSRC}/tools/quake3/q3data/q3data.c -# Add missing checks for __FreeBSD__ - @${FIND} ${WRKSRC}/tools -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} \ - -e 's/__linux__/__${OPSYS}__ ) || defined ( &/' + @${GREP} -Rl --null __linux__ ${WRKSRC}/tools | ${XARGS} -0 \ + ${REINPLACE_CMD} -e 's,__linux__,__${OPSYS}__,' pre-install: # Remove a copy of GNU GPL from what we are going to install Modified: head/games/netradiant/pkg-descr ============================================================================== --- head/games/netradiant/pkg-descr Thu Mar 26 15:27:03 2020 (r529195) +++ head/games/netradiant/pkg-descr Thu Mar 26 15:40:59 2020 (r529196) @@ -18,4 +18,4 @@ Fixes include: Original, classic GtkRadiant 1.5 is available as `games/gtkradiant' port. -WWW: http://ingar.satgnu.net/gtkradiant/ +WWW: http://ingar.intranifty.net/gtkradiant/