- Update to 1.4.2

4 files changed, 31 insertions, 35 deletions

diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index d71a68fdeffa..d8ebb0dd6fd7 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	irrlicht
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +27,7 @@ PLIST_SUB+=	SHARED_LIB_VER=${SHARED_LIB_VER}
 SUB_FILES=	pkg-message
 BUILD_WRKSRC=	${WRKSRC}/source/Irrlicht
 
-SHARED_LIB_VER=	1.4
+SHARED_LIB_VER=	1.4.2
 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 \
diff --git a/x11-toolkits/irrlicht/distinfo b/x11-toolkits/irrlicht/distinfo
index d743c009fffc..cf6718268cb3 100644
--- a/x11-toolkits/irrlicht/distinfo
+++ b/x11-toolkits/irrlicht/distinfo
@@ -1,3 +1,3 @@
-MD5 (irrlicht-1.4.zip) = 8270a529fa5f1f25e20337e27be3b3a5
-SHA256 (irrlicht-1.4.zip) = 870845bb0b987b5b1e3c086d22a77f58300ba9c4a65f4685768e1695696ccd52
-SIZE (irrlicht-1.4.zip) = 16892787
+MD5 (irrlicht-1.4.2.zip) = eabf78fad2f4d7aa58e1a85202b6a4f7
+SHA256 (irrlicht-1.4.2.zip) = 79eab7edfb289d67569ea2061fccd6d5476648b1331f63e51a005931f129af17
+SIZE (irrlicht-1.4.2.zip) = 18306598
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp
index 27c564fc860f..5739973cd69b 100644
--- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp
+++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp
@@ -1,11 +1,10 @@
---- 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>
- #include <unistd.h>
--#ifdef MACOSX
--#include "OSXClipboard.h"
+---  source/Irrlicht/COSOperator.cpp	2008-12-06 13:48:20.000000000 -0500
++++  source/Irrlicht/COSOperator.cpp	2008-12-06 13:49:26.000000000 -0500
+@@ -13,11 +13,9 @@
+ #ifdef _IRR_USE_OSX_DEVICE_
+ #include "OSXClipboard.h"
+ #endif
+-#ifdef _IRR_OSX_PLATFORM_
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #endif
@@ -13,7 +12,7 @@
  
  namespace irr
  {
-@@ -154,7 +151,7 @@
+@@ -157,7 +155,7 @@
  	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
  	return true;
  
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
index 600437105951..7378d67b2042 100644
--- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
+++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
@@ -1,22 +1,14 @@
---- 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
+--- source/Irrlicht/Makefile	2008-12-06 13:51:48.000000000 -0500
++++ source/Irrlicht/Makefile	2008-12-06 14:00:34.000000000 -0500
+@@ -1,6 +1,6 @@
+ VERSION = 1.4.2
+ # Irrlicht Engine 1.4.2
 -# 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 @@
+@@ -36,29 +36,26 @@
  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 CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o
@@ -46,7 +38,13 @@
  endif
  ifdef PROFILE
  CXXFLAGS += -pg
-@@ -65,11 +62,11 @@
+ endif
+-CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
++#CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+ 
+ sharedlib : CXXFLAGS += -fpic
+ sharedlib : CFLAGS += -fpic
+@@ -73,11 +70,11 @@
  SHARED_LIB = libIrrlicht.so
  IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
  LIB_PATH = ../../lib/$(SYSTEM)
@@ -55,21 +53,21 @@
 +INSTALL_DIR = $(PREFIX)/lib
 +staticlib sharedlib install: SYSTEM = FreeBSD
  staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias
--sharedlib : LDFLAGS += -L/usr/X11R6/lib -lGL -lXxf86vm
+-sharedlib : LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
 -staticlib sharedlib : CXXINCS += -I/usr/X11R6/include
-+sharedlib : LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm
++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
-@@ -78,20 +75,22 @@
+@@ -86,20 +83,22 @@
  staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
  
  ####################
 -# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/Linux
 -all linux: staticlib
 +# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/FreeBSD
-+all freebsd: staticlib sharedlib
++all linux: staticlib sharedlib
  
 -# 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
@@ -90,7 +88,7 @@
  	cp $^ $(LIB_PATH)
  
  # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
-@@ -117,9 +116,9 @@
+@@ -125,9 +124,9 @@
  
  help:
  	@echo "Available targets for Irrlicht"