- Update to 1.8

PR:		ports/173524
Submitted by:	Hardy Schumacher <hardy.schumacher_  at  _gmx.de>

6 files changed, 25 insertions, 78 deletions

diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index e68d371a2d90..d90eb87f5aa2 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	irrlicht
-PORTVERSION=	1.7.3
-PORTREVISION=	1
+PORTVERSION=	1.8
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION}
 
@@ -61,7 +60,7 @@ MAKE_ENV+=	NDEBUG=1
 .endif
 
 post-extract:
-	@${RM} ${WRKSRC}/media/Thumbs.db
+#	@${RM} ${WRKSRC}/media/Thumbs.db
 
 post-patch:
 	@${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \
diff --git a/x11-toolkits/irrlicht/distinfo b/x11-toolkits/irrlicht/distinfo
index edf33bb57824..2f35b2908684 100644
--- a/x11-toolkits/irrlicht/distinfo
+++ b/x11-toolkits/irrlicht/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irrlicht-1.7.3.zip) = 7230c1210a169944f815a79a975fabf2c0db0d3181dd62345b9fac9095ae026d
-SIZE (irrlicht-1.7.3.zip) = 16344294
+SHA256 (irrlicht-1.8.zip) = f8756c3cf83f16f41eb1eca8f4ebb530f0e8fd572443905e3d8eb8f09445a642
+SIZE (irrlicht-1.8.zip) = 23674513
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp
deleted file mode 100644
index ac80dbe8964f..000000000000
--- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- source/Irrlicht/CImageLoaderPNG.cpp.orig	2012-05-26 13:57:05.000000000 +0200
-+++ source/Irrlicht/CImageLoaderPNG.cpp	2012-05-26 13:58:05.000000000 +0200
-@@ -12,6 +12,7 @@
- 	#else // _IRR_USE_NON_SYSTEM_LIB_PNG_
- 	#include "libpng/png.h" // use irrlicht included lib png
- 	#endif // _IRR_USE_NON_SYSTEM_LIB_PNG_
-+	#include <pngpriv.h>
- #endif // _IRR_COMPILE_WITH_LIBPNG_
- 
- #include "CImage.h"
-@@ -28,7 +29,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
--	longjmp(png_ptr->jmpbuf, 1);
-+	longjmp(png_jmpbuf(png_ptr), 1);
- }
- 
- // PNG function for file reading
-@@ -162,7 +163,7 @@
- 	if (BitDepth < 8)
- 	{
- 		if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA)
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		else
- 			png_set_packing(png_ptr);
- 	}
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp
deleted file mode 100644
index b8b0b273af26..000000000000
--- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- source/Irrlicht/CImageWriterPNG.cpp.orig	2012-05-26 13:57:05.000000000 +0200
-+++ source/Irrlicht/CImageWriterPNG.cpp	2012-05-26 14:39:25.000000000 +0200
-@@ -15,6 +15,7 @@
- #ifdef _IRR_COMPILE_WITH_LIBPNG_
- #ifndef _IRR_USE_NON_SYSTEM_LIB_PNG_
- 	#include <png.h> // use system lib png
-+	#include <pngpriv.h>
- #else // _IRR_USE_NON_SYSTEM_LIB_PNG_
- 	#include "libpng/png.h" // use irrlicht included lib png
- #endif // _IRR_USE_NON_SYSTEM_LIB_PNG_
-@@ -35,7 +36,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
--	longjmp(png_ptr->jmpbuf, 1);
-+	longjmp(png_jmpbuf(png_ptr), 1);
- }
- 
- // PNG function for file writing
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
index fafa3fb438fc..46cf4016ac93 100644
--- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
+++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
@@ -1,29 +1,21 @@
---- source/Irrlicht/Makefile	2012-03-31 12:50:11.000000000 -0500
-+++ source/Irrlicht/Makefile	2012-03-31 12:57:27.000000000 -0500
-@@ -3,14 +3,14 @@
- VERSION_RELEASE = 3
- VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
- # Irrlicht Engine 1.7.3
+--- source/Irrlicht/Makefile	2013-10-01 14:38:36.000000000 -0500
++++ source/Irrlicht/Makefile	2013-10-01 14:45:15.000000000 -0500
+@@ -2,7 +2,7 @@
+ VERSION_MINOR = 8
+ VERSION_RELEASE = 0
+ # Irrlicht Engine 1.8.0
 -# Makefile for Linux
-+# Makefile for Linux/BSD
++# Makefile for Linux/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/[Linux|FreeBSD]. That's all.
- #
- # If you want Irrlicht to be compiled as shared lib (libIrrlicht.so.versionnumber), then run:
- #
-@@ -49,23 +49,20 @@
+@@ -56,23 +56,22 @@
  EXTRAOBJ =
  LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
  	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
 -	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
--	$(BZIP2OBJ) $(EXTRAOBJ)
-+	$(IRRGUIOBJ) $(LIBAESGM) $(EXTRAOBJ)
++	$(IRRGUIOBJ) $(LIBAESGM) \
+ 	$(BZIP2OBJ) $(EXTRAOBJ)
  
  ###############
  #Compiler flags
@@ -35,6 +27,7 @@
  CXXFLAGS += -g -D_DEBUG
  else
 -CXXFLAGS += -fexpensive-optimizations -O3
++CXXFLAGS += 
  endif
  ifdef PROFILE
  CXXFLAGS += -pg
@@ -43,20 +36,17 @@
  
  sharedlib sharedlib_osx: CXXFLAGS += -fPIC
  sharedlib sharedlib_osx: CFLAGS += -fPIC
-@@ -75,15 +72,15 @@
- LIBSELECT=64
+@@ -83,13 +82,13 @@
  endif
  
--#Linux specific options
+ #Linux specific options
 -staticlib sharedlib install: SYSTEM = Linux
-+#Linux/FreeBSD specific options
 +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
- #staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
 -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
@@ -64,7 +54,7 @@
  
  #OSX specific options
  staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
-@@ -104,13 +101,13 @@
+@@ -117,13 +116,13 @@
  
  ####################
  # All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
@@ -73,10 +63,10 @@
  
  # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
  sharedlib: $(LINKOBJ)
--	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
+-	$(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_LIB).$(VERSION) $(LIB_PATH)
+-	cp $(SHARED_FULLNAME) $(LIB_PATH)
 +	cp $(SHARED_LIB).$(SHLIB_VER) $(LIB_PATH)
  
  # Builds Irrlicht as static lib (libIrrlicht.a)
diff --git a/x11-toolkits/irrlicht/pkg-plist b/x11-toolkits/irrlicht/pkg-plist
index a35e471465b2..995cabdc4719 100644
--- a/x11-toolkits/irrlicht/pkg-plist
+++ b/x11-toolkits/irrlicht/pkg-plist
@@ -30,6 +30,7 @@ include/irrlicht/IBillboardSceneNode.h
 include/irrlicht/IBillboardTextSceneNode.h
 include/irrlicht/IBoneSceneNode.h
 include/irrlicht/ICameraSceneNode.h
+include/irrlicht/IColladaMeshWriter.h
 include/irrlicht/ICursorControl.h
 include/irrlicht/IDummyTransformationSceneNode.h
 include/irrlicht/IDynamicMeshBuffer.h
@@ -99,9 +100,11 @@ include/irrlicht/IParticleSphereEmitter.h
 include/irrlicht/IParticleSystemSceneNode.h
 include/irrlicht/IQ3LevelMesh.h
 include/irrlicht/IQ3Shader.h
+include/irrlicht/IRandomizer.h
 include/irrlicht/IReadFile.h
 include/irrlicht/IReferenceCounted.h
 include/irrlicht/ISceneCollisionManager.h
+include/irrlicht/ISceneLoader.h
 include/irrlicht/ISceneManager.h
 include/irrlicht/ISceneNode.h
 include/irrlicht/ISceneNodeAnimator.h
@@ -164,6 +167,8 @@ include/irrlicht/irrString.h
 include/irrlicht/irrTypes.h
 include/irrlicht/irrXML.h
 include/irrlicht/irrlicht.h
+include/irrlicht/irrpack.h
+include/irrlicht/irrunpack.h
 include/irrlicht/line2d.h
 include/irrlicht/line3d.h
 include/irrlicht/matrix4.h