Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Mar 2020 15:40:59 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529196 - head/games/netradiant
Message-ID:  <202003261541.02QFf0iu044814@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003261541.02QFf0iu044814>