5 files changed, 81 insertions, 44 deletions

diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index 270d25e663d0..34cdfb50b271 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	irrlicht
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USE_DOS2UNIX=	Makefile *.cpp *.h *.txt
 USE_GMAKE=	yes
 USE_GL=		yes
 USE_XLIB=	yes
@@ -29,13 +29,14 @@ PLIST_SUB+=	SHARED_LIB_VER=${SHARED_LIB_VER}
 SUB_FILES=	pkg-message
 BUILD_WRKSRC=	${WRKSRC}/source/Irrlicht
 
-SHARED_LIB_VER=	1.3.0
+SHARED_LIB_VER=	1.4
 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=	EXAMPLES	"Install example files"	on
+OPTIONS=	DEBUG	"Compile with debugging simbols" off \
+		EXAMPLES	"Install example files"	on
 
 .include <bsd.port.pre.mk>
 
@@ -49,6 +50,10 @@ PLIST_SUB+=	EXAMPLES=""
 PLIST_SUB+=	EXAMPLES="@comment "
 .endif
 
+.if !defined(WITH_DEBUG)
+MAKE_ENV+=	NDEBUG=1
+.endif
+
 do-install:
 	${MKDIR} ${PREFIX}/include/${PORTNAME}
 	cd ${WRKSRC}/include && \
diff --git a/x11-toolkits/irrlicht/distinfo b/x11-toolkits/irrlicht/distinfo
index c9ad01a3e5ef..d743c009fffc 100644
--- a/x11-toolkits/irrlicht/distinfo
+++ b/x11-toolkits/irrlicht/distinfo
@@ -1,3 +1,3 @@
-MD5 (irrlicht-1.3.1.zip) = 939b21d5fa16d7d949e4ce0c23e0b4b0
-SHA256 (irrlicht-1.3.1.zip) = 91f080776fbad55331ca793b25647def2ef66363eac0cf5fef619f3690044beb
-SIZE (irrlicht-1.3.1.zip) = 16325880
+MD5 (irrlicht-1.4.zip) = 8270a529fa5f1f25e20337e27be3b3a5
+SHA256 (irrlicht-1.4.zip) = 870845bb0b987b5b1e3c086d22a77f58300ba9c4a65f4685768e1695696ccd52
+SIZE (irrlicht-1.4.zip) = 16892787
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp
index 56adcba358a9..27c564fc860f 100644
--- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp
+++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp
@@ -1,5 +1,5 @@
---- source/Irrlicht/COSOperator.cpp	Sun Aug 19 20:14:42 2007
-+++ source/Irrlicht/COSOperator.cpp	Sun Aug 19 20:19:35 2007
+--- source/Irrlicht/COSOperator.cpp	2007-12-24 20:31:04.000000000 -0500
++++ source/Irrlicht/COSOperator.cpp	2007-12-24 20:37:13.000000000 -0500
 @@ -10,12 +10,9 @@
  #else
  #include <string.h>
@@ -13,12 +13,12 @@
  
  namespace irr
  {
-@@ -156,7 +153,7 @@
+@@ -154,7 +151,7 @@
  	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
  	return true;
  
--#elif defined(_IRR_POSIX_API_) // || defined(MACOSX)
-+#elif defined(_IRR_POSIX_API_) && !defined(__FreeBSD__)// || defined(MACOSX)
+-#elif defined(_IRR_POSIX_API_)
++#elif defined(_IRR_POSIX_API_) && !defined(__FreeBSD__)
+ #if defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)
          long ps = sysconf(_SC_PAGESIZE);
          long pp = sysconf(_SC_PHYS_PAGES);
-         long ap = sysconf(_SC_AVPHYS_PAGES);
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
index b86a6ebc7e1f..600437105951 100644
--- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
+++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
@@ -1,55 +1,68 @@
---- source/Irrlicht/Makefile	Sun Aug 19 20:05:59 2007
-+++ source/Irrlicht/Makefile	Sun Aug 19 20:13:03 2007
-@@ -25,35 +25,33 @@
+--- source/Irrlicht/Makefile	2007-12-24 20:52:26.000000000 -0500
++++ source/Irrlicht/Makefile	2007-12-24 21:00:21.000000000 -0500
+@@ -1,13 +1,13 @@
+ VERSION = 1.4
+ # Irrlicht Engine 1.4
+-# Makefile for Linux
++# Makefile for FreeBSD
+ #
+ # To use, just run:
+ #
+ # make
+ #
+ # This will compile Irrlicht, create a static lib (libIrrlicht.a), and copy it
+-# into the subdirectory lib/Linux. That's all.
++# into the subdirectory lib/FreeBSD. That's all.
+ #
+ # If you want Irrlicht to be compiled as shared lib (libIrrlicht.so.versionnumber), then run:
+ #
+@@ -36,24 +36,21 @@
  IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o irrXML.o CAttributes.o
  IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o
- IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o
+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o
 -ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
--JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcphuff.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdphuff.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jidctred.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/rdbmp.o jpeglib/rdcolmap.o jpeglib/rdgif.o jpeglib/rdppm.o jpeglib/rdrle.o jpeglib/rdswitch.o jpeglib/rdtarga.o jpeglib/transupp.o jpeglib/wrbmp.o jpeglib/wrgif.o jpeglib/wrppm.o jpeglib/wrrle.o jpeglib/wrtarga.o
+-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcphuff.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdphuff.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jidctred.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o
 -LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
  # Next variable is for additional scene nodes etc. of customized Irrlicht versions
  EXTRAOBJ =
--LINKOBJ = $(IRROBJ) $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
-+LINKOBJ = $(IRROBJ) $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) $(IRRGUIOBJ) $(EXTRAOBJ)
+ LINKOBJ := $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
++	$(IRRGUIOBJ) $(EXTRAOBJ)
  
  ###############
  #Compiler flags
 -CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
 -CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
 -CXXFLAGS = -Wall
--ifndef NDEBUG
-+CXXINCS = -I../../include -I$(LOCALBASE)/include -I$(X11BASE)/include -I/usr/include
++CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include
 +CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
 +CXXFLAGS += -Wall
-+
-+ifdef DEBUG
- CXXFLAGS += -g
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
  else
 -CXXFLAGS += -fexpensive-optimizations -O3
 +CXXFLAGS += -fexpensive-optimizations
  endif
--CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-+CFLAGS += -fexpensive-optimizations -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
- 
- #Linux specific options
- STATIC_LIB = libIrrlicht.a
+ ifdef PROFILE
+ CXXFLAGS += -pg
+@@ -65,11 +62,11 @@
  SHARED_LIB = libIrrlicht.so
  IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
  LIB_PATH = ../../lib/$(SYSTEM)
 -INSTALL_DIR = /usr/local/lib
 -staticlib sharedlib install: SYSTEM = Linux
--staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias
--sharedlib : LDFLAGS += -L/usr/X11R6/lib -lGLU -lGL -lXxf86vm
--staticlib sharedlib : CXXINCS += -I/usr/X11R6/include
-+
 +INSTALL_DIR = $(PREFIX)/lib
 +staticlib sharedlib install: SYSTEM = FreeBSD
-+staticlib sharedlib : LDFLAGS = -L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib --no-export-all-symbols --add-stdcall-alias -lGLU -lGL -lXxf86vm
-+staticlib sharedlib : CXXINCS += -I$(X11BASE)/include
+ staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias
+-sharedlib : LDFLAGS += -L/usr/X11R6/lib -lGL -lXxf86vm
+-staticlib sharedlib : CXXINCS += -I/usr/X11R6/include
++sharedlib : LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm
++staticlib sharedlib : CXXINCS += -I$(LOCALBASE)/include
  
  #Windows specific options
  sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc
-@@ -62,20 +60,22 @@
+@@ -78,20 +75,22 @@
  staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
  
  ####################
@@ -61,7 +74,8 @@
 -# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux
 +# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/FreeBSD
  sharedlib: $(LINKOBJ)
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).1 -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
 +	mkdir -p $(LIB_PATH)
  	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
  
@@ -76,9 +90,9 @@
  	cp $^ $(LIB_PATH)
  
  # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
-@@ -101,9 +101,9 @@
+@@ -117,9 +116,9 @@
  
- help: 
+ help:
  	@echo "Available targets for Irrlicht"
 -	@echo " sharedlib: Build shared library Irrlicht.so for Linux"
 -	@echo " staticlib: Build static library Irrlicht.a for Linux"
diff --git a/x11-toolkits/irrlicht/pkg-plist b/x11-toolkits/irrlicht/pkg-plist
index 705dbe136d6c..faecd7982db3 100644
--- a/x11-toolkits/irrlicht/pkg-plist
+++ b/x11-toolkits/irrlicht/pkg-plist
@@ -4,19 +4,21 @@ include/irrlicht/EDebugSceneTypes.h
 include/irrlicht/EDriverFeatures.h
 include/irrlicht/EDriverTypes.h
 include/irrlicht/EGUIElementTypes.h
+include/irrlicht/EMaterialFlags.h
+include/irrlicht/EMaterialTypes.h
+include/irrlicht/EMeshWriterEnums.h
+include/irrlicht/EMessageBoxFlags.h
 include/irrlicht/ESceneNodeAnimatorTypes.h
 include/irrlicht/ESceneNodeTypes.h
 include/irrlicht/ETerrainElements.h
 include/irrlicht/IAnimatedMesh.h
-include/irrlicht/IAnimatedMeshB3d.h
 include/irrlicht/IAnimatedMeshMD2.h
 include/irrlicht/IAnimatedMeshMD3.h
-include/irrlicht/IAnimatedMeshMS3D.h
 include/irrlicht/IAnimatedMeshSceneNode.h
-include/irrlicht/IAnimatedMeshX.h
 include/irrlicht/IAttributeExchangingObject.h
 include/irrlicht/IAttributes.h
 include/irrlicht/IBillboardSceneNode.h
+include/irrlicht/IBoneSceneNode.h
 include/irrlicht/ICameraSceneNode.h
 include/irrlicht/ICursorControl.h
 include/irrlicht/IDummyTransformationSceneNode.h
@@ -42,6 +44,7 @@ include/irrlicht/IGUIListBox.h
 include/irrlicht/IGUIMeshViewer.h
 include/irrlicht/IGUIScrollBar.h
 include/irrlicht/IGUISkin.h
+include/irrlicht/IGUISpinBox.h
 include/irrlicht/IGUISpriteBank.h
 include/irrlicht/IGUIStaticText.h
 include/irrlicht/IGUITabControl.h
@@ -60,14 +63,26 @@ include/irrlicht/IMeshCache.h
 include/irrlicht/IMeshLoader.h
 include/irrlicht/IMeshManipulator.h
 include/irrlicht/IMeshSceneNode.h
+include/irrlicht/IMeshWriter.h
 include/irrlicht/IMetaTriangleSelector.h
 include/irrlicht/IOSOperator.h
 include/irrlicht/IParticleAffector.h
+include/irrlicht/IParticleAnimatedMeshSceneNodeEmitter.h
+include/irrlicht/IParticleAttractionAffector.h
+include/irrlicht/IParticleBoxEmitter.h
+include/irrlicht/IParticleCylinderEmitter.h
 include/irrlicht/IParticleEmitter.h
+include/irrlicht/IParticleFadeOutAffector.h
+include/irrlicht/IParticleGravityAffector.h
+include/irrlicht/IParticleMeshEmitter.h
+include/irrlicht/IParticleRingEmitter.h
+include/irrlicht/IParticleRotationAffector.h
+include/irrlicht/IParticleSphereEmitter.h
 include/irrlicht/IParticleSystemSceneNode.h
 include/irrlicht/IQ3LevelMesh.h
 include/irrlicht/IQ3Shader.h
 include/irrlicht/IReadFile.h
+include/irrlicht/IReferenceCounted.h
 include/irrlicht/ISceneCollisionManager.h
 include/irrlicht/ISceneManager.h
 include/irrlicht/ISceneNode.h
@@ -78,12 +93,12 @@ include/irrlicht/ISceneNodeFactory.h
 include/irrlicht/ISceneUserDataSerializer.h
 include/irrlicht/IShaderConstantSetCallBack.h
 include/irrlicht/IShadowVolumeSceneNode.h
+include/irrlicht/ISkinnedMesh.h
 include/irrlicht/ITerrainSceneNode.h
 include/irrlicht/ITextSceneNode.h
 include/irrlicht/ITexture.h
 include/irrlicht/ITimer.h
 include/irrlicht/ITriangleSelector.h
-include/irrlicht/IUnknown.h
 include/irrlicht/IVideoDriver.h
 include/irrlicht/IVideoModeList.h
 include/irrlicht/IWriteFile.h
@@ -100,11 +115,14 @@ include/irrlicht/SIrrCreationParameters.h
 include/irrlicht/SKeyMap.h
 include/irrlicht/SLight.h
 include/irrlicht/SMaterial.h
+include/irrlicht/SMaterialLayer.h
 include/irrlicht/SMesh.h
 include/irrlicht/SMeshBuffer.h
 include/irrlicht/SMeshBufferLightMap.h
 include/irrlicht/SMeshBufferTangents.h
 include/irrlicht/SParticle.h
+include/irrlicht/SSharedMeshBuffer.h
+include/irrlicht/SSkinMeshBuffer.h
 include/irrlicht/SceneParameters.h
 include/irrlicht/SViewFrustum.h
 include/irrlicht/aabbox3d.h