Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Feb 2013 19:35:44 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r312439 - head/games/lwjgl
Message-ID:  <201302171935.r1HJZiGm048331@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sun Feb 17 19:35:43 2013
New Revision: 312439
URL: http://svnweb.freebsd.org/changeset/ports/312439

Log:
  - Respect CC [1]
  - Make BUILD,RUN_DEPENDS much shorter
  - Trim Makefile header
  
  PR:		ports/175631 [1]
  Submitted by:	Lukasz Gruner <ukaszg@gmail.com> [1]

Modified:
  head/games/lwjgl/Makefile

Modified: head/games/lwjgl/Makefile
==============================================================================
--- head/games/lwjgl/Makefile	Sun Feb 17 19:31:21 2013	(r312438)
+++ head/games/lwjgl/Makefile	Sun Feb 17 19:35:43 2013	(r312439)
@@ -15,15 +15,8 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/${DISTNAME}/doc/LICENSE
 
 BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils \
-		${JAVALIBDIR}/jinput/jinput.jar:${PORTSDIR}/games/jinput \
-		${LOCALBASE}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/libXxf86vm \
-		${LOCALBASE}/include/X11/extensions/Xrandr.h:${PORTSDIR}/x11/libXrandr \
-		${LOCALBASE}/include/X11/Xcursor/Xcursor.h:${PORTSDIR}/x11/libXcursor
-RUN_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils \
-		${JAVALIBDIR}/jinput/jinput.jar:${PORTSDIR}/games/jinput \
-		${LOCALBASE}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/libXxf86vm \
-		${LOCALBASE}/include/X11/extensions/Xrandr.h:${PORTSDIR}/x11/libXrandr \
-		${LOCALBASE}/include/X11/Xcursor/Xcursor.h:${PORTSDIR}/x11/libXcursor
+		${JAVALIBDIR}/jinput/jinput.jar:${PORTSDIR}/games/jinput
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 ONLY_FOR_ARCHS=	i386 amd64
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
@@ -38,6 +31,7 @@ JAVA_VERSION=	1.6+
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
 USE_ANT=	yes
+USE_XORG=	xcursor xrandr xxf86vm
 MAKE_ENV+=	CLASSPATH=${JAVALIBDIR}/jutils/jutils.jar:${JAVALIBDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/
 ALL_TARGET=	jars compile_native
 
@@ -59,7 +53,9 @@ PLIST_FILES+=	lib/${PORTNAME}${PORTVERSI
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' ${WRKSRC}/platform_build/linux_ant/build.xml
+	@${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' \
+		-e '/executable/s/gcc/${CC}/g' \
+		${WRKSRC}/platform_build/linux_ant/build.xml
 
 do-install:
 	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}/${PORTNAME}/ ..."



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