Date: Thu, 5 Sep 2013 16:33:40 +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: r326412 - in head/games/gtkradiant: . files Message-ID: <201309051633.r85GXeUc045056@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Sep 5 16:33:40 2013 New Revision: 326412 URL: http://svnweb.freebsd.org/changeset/ports/326412 Log: - Attempt to unbreak the build against Clang - Get rid of bogus dependency on devel/py-subversion - Modernize LIB_DEPENDS syntax, copy files with -a - Add an explicit dependency on pkgconfig Reported by: pkg-fallout Modified: head/games/gtkradiant/Makefile head/games/gtkradiant/files/patch-makeversion.py Modified: head/games/gtkradiant/Makefile ============================================================================== --- head/games/gtkradiant/Makefile Thu Sep 5 16:25:38 2013 (r326411) +++ head/games/gtkradiant/Makefile Thu Sep 5 16:33:40 2013 (r326412) @@ -16,13 +16,13 @@ COMMENT= Level design program developed LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libsvn/__init__.py:${PORTSDIR}/devel/py-subversion -LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \ - mhash.2:${PORTSDIR}/security/mhash \ - png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \ + libmhash.so:${PORTSDIR}/security/mhash \ + libpng15.so:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/GPL/GtkRadiant +USES= pkgconfig USE_ZIP= yes USE_GNOME= gtk20 libxml2 USE_PYTHON_BUILD= yes @@ -49,14 +49,19 @@ 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' \ + ${WRKSRC}/libs/scenelib.h + @${REINPLACE_CMD} -e '/#include "generic\/referencecounted.h/ { \ + x ; s/^/#include "scenelib.h"/ ; G ; }' \ + ${WRKSRC}/plugins/mapq3/parse.h post-build: cd ${WRKSRC} && ${PYTHON_CMD} install.py - ${CP} -R ${WRKDIR}/${PORTNAME}_gamepacks/* ${WRKSRC}/install + ${CP} -a ${WRKDIR}/${PORTNAME}_gamepacks/* ${WRKSRC}/install do-install: @${MKDIR} ${DATADIR} - ${CP} -R ${WRKSRC}/install/* ${DATADIR} + ${CP} -a ${WRKSRC}/install/* ${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin .include <bsd.port.mk> Modified: head/games/gtkradiant/files/patch-makeversion.py ============================================================================== --- head/games/gtkradiant/files/patch-makeversion.py Thu Sep 5 16:25:38 2013 (r326411) +++ head/games/gtkradiant/files/patch-makeversion.py Thu Sep 5 16:33:40 2013 (r326412) @@ -1,6 +1,15 @@ --- ./makeversion.py.orig Sun Feb 12 16:47:01 2006 +++ ./makeversion.py Thu Mar 16 16:09:46 2006 -@@ -82,7 +82,7 @@ +@@ -39,8 +39,6 @@ + + import sys, re, string, os + +-import svn +- + def get_version(): + # version + f = open('include/version.default', 'r') +@@ -82,7 +80,7 @@ def radiant_makeversion(append_about): line = f.readline() f.close() else:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309051633.r85GXeUc045056>