svn commit: r372081 - in head/x11-toolkits/irrlicht: . files

[John Marino]

Author: marino
Date: Sun Nov  2 18:15:19 2014
New Revision: 372081
URL: https://svnweb.freebsd.org/changeset/ports/372081
QAT: https://qat.redports.org/buildarchive/r372081/

Log:
  x11-toolkits/irrlicht: Fix DEBUG option, missing linker symbols
  
  * apply NDEBUG=1 when DEBUG is off
  * Depend on libGL instead of libGLU
  * Add missing -lX11 -lZ to LDFLAGS
  * Add USE_XORG= x11 xxf86vm
  
  PR:		194565
  Submitted by:	Andriy Voskoboinyk

Modified:
  head/x11-toolkits/irrlicht/Makefile
  head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile

Modified: head/x11-toolkits/irrlicht/Makefile
==============================================================================
--- head/x11-toolkits/irrlicht/Makefile	Sun Nov  2 17:43:03 2014	(r372080)
+++ head/x11-toolkits/irrlicht/Makefile	Sun Nov  2 18:15:19 2014	(r372081)
@@ -3,6 +3,7 @@
 
 PORTNAME=	irrlicht
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/
 
@@ -17,7 +18,8 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 
 DOS2UNIX_GLOB=	Makefile *.cpp *.h *.txt
 USES=		alias dos2unix gmake zip
-USE_GL=		yes
+USE_GL=		gl
+USE_XORG=	x11 xxf86vm
 USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
 MAKE_ENV+=	SHLIB_VER=${SHARED_LIB_VER}
@@ -34,7 +36,7 @@ EXAMPLEDIRS=	01.HelloWorld 02.Quake3Map 
 
 OPTIONS_DEFINE=	DEBUG EXAMPLES
 
-DEBUG_MAKE_ENV=	NDEBUG=1
+DEBUG_MAKE_ENV_OFF=	NDEBUG=1
 
 BROKEN_sparc64=	Does not compile
 

Modified: head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
==============================================================================
--- head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile	Sun Nov  2 17:43:03 2014	(r372080)
+++ head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile	Sun Nov  2 18:15:19 2014	(r372081)
@@ -48,7 +48,7 @@
  sharedlib install: SHARED_LIB = libIrrlicht.so
 -sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
 -staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
-+sharedlib: LDFLAGS += -L${LOCALBASE}/lib -lGL -lXxf86vm -lpng -ljpeg -lbz2
++sharedlib: LDFLAGS += -L${LOCALBASE}/lib -lGL -lXxf86vm -lX11 -lpng -ljpeg -lbz2 -lz
 +staticlib sharedlib: CXXINCS += -I${LOCALBASE}/include
  
  #OSX specific options