From owner-svn-ports-head@FreeBSD.ORG  Sat Mar  1 10:13:26 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 ESMTPS id E5651622;
 Sat,  1 Mar 2014 10:13:26 +0000 (UTC)
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 B83091282;
 Sat,  1 Mar 2014 10:13:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s21ADQdR001530;
 Sat, 1 Mar 2014 10:13:26 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s21ADQq0001528;
 Sat, 1 Mar 2014 10:13:26 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201403011013.s21ADQq0001528@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sat, 1 Mar 2014 10:13:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r346610 - in head/games/gtkradiant: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Mar 2014 10:13:27 -0000

Author: danfe
Date: Sat Mar  1 10:13:26 2014
New Revision: 346610
URL: http://svnweb.freebsd.org/changeset/ports/346610
QAT: https://qat.redports.org/buildarchive/r346610/

Log:
  Unbreak the build on recent -CURRENT, where linker is more strict.
  
  Reported by:	pkg-fallout

Added:
  head/games/gtkradiant/files/patch-SConscript   (contents, props changed)
Modified:
  head/games/gtkradiant/Makefile

Modified: head/games/gtkradiant/Makefile
==============================================================================
--- head/games/gtkradiant/Makefile	Sat Mar  1 10:06:45 2014	(r346609)
+++ head/games/gtkradiant/Makefile	Sat Mar  1 10:13:26 2014	(r346610)
@@ -34,7 +34,6 @@ WRKSRC=		${WRKDIR}/GPL/GtkRadiant
 SUB_FILES=	${PORTNAME}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/-ldl//' ${WRKSRC}/SConscript
 	@${GREP} -Rl 'defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -e \
 		's/\(defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)\)/\1 || defined (__FreeBSD__)/'

Added: head/games/gtkradiant/files/patch-SConscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/gtkradiant/files/patch-SConscript	Sat Mar  1 10:13:26 2014	(r346610)
@@ -0,0 +1,20 @@
+--- SConscript.orig	2006-02-11 06:01:20.000000000 +0800
++++ SConscript
+@@ -359,8 +359,6 @@ module_env = g_env.Copy()
+ module_env['CPPPATH'].append('include')
+ if ( OS == 'Darwin' ):
+   module_env['LINKFLAGS'] += '-dynamiclib -ldl '
+-else:
+-  module_env['LINKFLAGS'] += '-ldl '
+ module_env['LIBPREFIX'] = ''
+ 
+ 
+@@ -485,7 +483,7 @@ module_env.Install(INSTALL + '/modules',
+ 
+ radiant_env = g_env.Copy()
+ radiant_env['CPPPATH'].append('include')
+-radiant_env['LINKFLAGS'] += '-ldl -lGL '
++radiant_env['LINKFLAGS'] += '-lX11 -lGL '
+ if ( OS == 'Darwin' ):
+   radiant_env['CXXFLAGS'] += '-fno-common '
+   radiant_env['CCFLAGS'] += '-fno-common '