Index: head/x11-toolkits/irrlicht/Makefile
===================================================================
--- head/x11-toolkits/irrlicht/Makefile	(revision 372080)
+++ head/x11-toolkits/irrlicht/Makefile	(revision 372081)
@@ -1,71 +1,73 @@
 # Created by: Simon Barner <barner@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	irrlicht
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance realtime 3D engine
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/readme.txt
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png
 
 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}
 
 PLIST_SUB+=	SHARED_LIB_VER=${SHARED_LIB_VER}
 SUB_FILES=	pkg-message
 BUILD_WRKSRC=	${WRKSRC}/source/Irrlicht
 
 SHARED_LIB_VER=	1
 EXAMPLEDIRS=	01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \
 		06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \
 		11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \
 		Demo
 
 OPTIONS_DEFINE=	DEBUG EXAMPLES
 
-DEBUG_MAKE_ENV=	NDEBUG=1
+DEBUG_MAKE_ENV_OFF=	NDEBUG=1
 
 BROKEN_sparc64=	Does not compile
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == ia64
 CFLAGS+=	-fPIC
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \
 		-e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \
 		-e '/#define.*_IRR_USE_NON_SYSTEM_ZLIB_/ d' \
 		-e '/#define.*_IRR_USE_NON_SYSTEM_BZLIB_/ d' \
 		-e '/#define.*_IRR_COMPILE_WITH_JOYSTICK_EVENTS_/ d' \
 		${WRKSRC}/include/IrrCompileConfig.h
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	cd ${WRKSRC}/include && \
 		${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libIrrlicht.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/FreeBSD/libIrrlicht.so.${SHARED_LIB_VER} \
 		${STAGEDIR}${PREFIX}/lib && ${LN} -s libIrrlicht.so.${SHARED_LIB_VER} \
 			${STAGEDIR}${PREFIX}/lib/libIrrlicht.so
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${EXAMPLEDIRS}" ${STAGEDIR}${EXAMPLESDIR} "( -name Makefile -or -name *\.cpp -or -name *\.h )"
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/media
 	cd ${WRKSRC}/media && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/media
 .endif
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
===================================================================
--- head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile	(revision 372080)
+++ head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile	(revision 372081)
@@ -1,72 +1,72 @@
 --- source/Irrlicht/Makefile.orig	2014-10-18 07:47:20 UTC
 +++ source/Irrlicht/Makefile
 @@ -2,7 +2,7 @@
  VERSION_MINOR = 8
  VERSION_RELEASE = 1
  # Irrlicht Engine 1.8.1
 -# Makefile for Linux
 +# Makefile for Linux/FreeBSD
  #
  # To use, just run:
  #
 @@ -56,23 +56,20 @@
  EXTRAOBJ =
  LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
  	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
 -	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
 +	$(IRRGUIOBJ) $(LIBAESGM) \
  	$(BZIP2OBJ) $(EXTRAOBJ)
  
  ###############
  #Compiler flags
 -CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
 +CXXINCS = -I../../include -I${LOCALBASE}/include
  CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
  CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
  ifndef NDEBUG
  CXXFLAGS += -g -D_DEBUG
 -else
 -CXXFLAGS += -fexpensive-optimizations -O3
  endif
  ifdef PROFILE
  CXXFLAGS += -pg
  endif
 -CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
  
  sharedlib sharedlib_osx: CXXFLAGS += -fPIC
  sharedlib sharedlib_osx: CFLAGS += -fPIC
 @@ -83,13 +80,13 @@
  endif
  
  #Linux specific options
 -staticlib sharedlib install: SYSTEM = Linux
 +staticlib sharedlib install: SYSTEM = FreeBSD
  STATIC_LIB = libIrrlicht.a
  LIB_PATH = ../../lib/$(SYSTEM)
 -INSTALL_DIR = /usr/local/lib
 +INSTALL_DIR = ${PREFIX}/lib
  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
  staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
 @@ -117,13 +114,13 @@
  
  ####################
  # All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
 -all linux: staticlib
 +all linux: staticlib sharedlib
  
  # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
  sharedlib: $(LINKOBJ)
 -	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS)
 +	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(SHLIB_VER) -o $(SHARED_LIB).$(SHLIB_VER) $^ $(LDFLAGS)
  	mkdir -p $(LIB_PATH)
 -	cp $(SHARED_FULLNAME) $(LIB_PATH)
 +	cp $(SHARED_LIB).$(SHLIB_VER) $(LIB_PATH)
  
  # Builds Irrlicht as static lib (libIrrlicht.a)
  $(STATIC_LIB): $(LINKOBJ)