diff -urN /usr/ports/x11-toolkits/irrlicht.orig/Makefile /usr/ports/x11-toolkits/irrlicht/Makefile --- /usr/ports/x11-toolkits/irrlicht.orig/Makefile 2010-03-29 20:09:11.000000000 +0200 +++ /usr/ports/x11-toolkits/irrlicht/Makefile 2010-12-05 21:04:53.000000000 +0100 @@ -6,10 +6,9 @@ # PORTNAME= irrlicht -PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTVERSION= 1.7.2 CATEGORIES= x11-toolkits graphics -MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.6/${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= High performance realtime 3D engine diff -urN /usr/ports/x11-toolkits/irrlicht.orig/distinfo /usr/ports/x11-toolkits/irrlicht/distinfo --- /usr/ports/x11-toolkits/irrlicht.orig/distinfo 2010-01-22 00:36:04.000000000 +0100 +++ /usr/ports/x11-toolkits/irrlicht/distinfo 2010-12-05 21:05:36.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (irrlicht-1.6.1.zip) = 6c7fa12053c475e3305cad4e720cb711 -SHA256 (irrlicht-1.6.1.zip) = be26182cc4b9edb6d1e355cb4a6b99508333209b563f393c6dfcf5ca295f4df9 -SIZE (irrlicht-1.6.1.zip) = 22299175 +SHA256 (irrlicht-1.7.2.zip) = be1de9a850a94eaa5cc57a6014de5ab5304a364d45ce504315b5442be3e0d01d +SIZE (irrlicht-1.7.2.zip) = 24603866 diff -urN /usr/ports/x11-toolkits/irrlicht.orig/files/patch-include_IrrCompileConfig.h /usr/ports/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h --- /usr/ports/x11-toolkits/irrlicht.orig/files/patch-include_IrrCompileConfig.h2010-01-22 00:36:04.000000000 +0100 +++ /usr/ports/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ ---- include/IrrCompileConfig.h.orig 2010-01-10 08:44:22.000000000 +0300 -+++ include/IrrCompileConfig.h 2010-01-15 22:48:52.000000000 +0300 -@@ -175,7 +175,7 @@ - //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht. - /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system. - This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */ --#define _IRR_USE_NON_SYSTEM_ZLIB_ -+//#define _IRR_USE_NON_SYSTEM_ZLIB_ - - - //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg. -@@ -186,7 +186,7 @@ - //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. - /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. - This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ --#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ -+//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ - - - //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng. -@@ -197,7 +197,7 @@ - //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. - /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. - This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ --#define _IRR_USE_NON_SYSTEM_LIB_PNG_ -+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ - - - //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9 diff -urN /usr/ports/x11-toolkits/irrlicht.orig/files/patch-source-Irrlicht_COSOperator.cpp /usr/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp --- /usr/ports/x11-toolkits/irrlicht.orig/files/patch-source-Irrlicht_COSOperator.cpp 2010-01-22 00:36:04.000000000 +0100 +++ /usr/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ ---- source/Irrlicht/COSOperator.cpp.orig 2009-09-19 15:58:12.000000000 +0400 -+++ source/Irrlicht/COSOperator.cpp 2010-01-15 22:50:26.000000000 +0300 -@@ -15,11 +15,9 @@ - #ifdef _IRR_COMPILE_WITH_OSX_DEVICE_ - #include "MacOSX/OSXClipboard.h" - #endif --#ifdef _IRR_OSX_PLATFORM_ - #include - #include - #endif --#endif - - #if defined(_IRR_COMPILE_WITH_X11_DEVICE_) - #include "CIrrDeviceLinux.h" -@@ -184,7 +182,7 @@ - _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX; - return true; - --#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); diff -urN /usr/ports/x11-toolkits/irrlicht.orig/files/patch-source-Irrlicht_Makefile /usr/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile --- /usr/ports/x11-toolkits/irrlicht.orig/files/patch-source-Irrlicht_Makefile 2010-01-22 00:36:04.000000000 +0100 +++ /usr/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,108 +0,0 @@ ---- source/Irrlicht/Makefile.orig 2010-01-16 01:32:18.000000000 +0300 -+++ source/Irrlicht/Makefile 2010-01-16 01:33:07.000000000 +0300 -@@ -3,7 +3,7 @@ - VERSION_RELEASE = 1 - VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) - # Irrlicht Engine 1.6.0-SVN --# Makefile for Linux -+# Makefile for FreeBSD - # - # To use, just run: - # -@@ -39,29 +39,26 @@ - IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o - IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.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 CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.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 --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 = $(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 -+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/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 -+CXXFLAGS += -fexpensive-optimizations - endif - ifdef PROFILE - CXXFLAGS += -pg - endif --CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES -+#CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES - - sharedlib sharedlib_osx: CXXFLAGS += -fPIC - sharedlib sharedlib_osx: CFLAGS += -fPIC -@@ -71,15 +68,15 @@ - LIBSELECT=64 - endif - --#Linux specific options --staticlib sharedlib install: SYSTEM = 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/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm -lpng -ljpeg -+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include - - #OSX specific options - staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX -@@ -97,20 +94,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 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 - sharedlib: $(LINKOBJ) -- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) -+ mkdir -p $(LIB_PATH) - cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) - - # Builds Irrlicht as static lib (libIrrlicht.a) - $(STATIC_LIB): $(LINKOBJ) - $(AR) rs $@ $^ - --# Copies static lib into /lib/Linux -+# Copies static lib into /lib/FreeBSD - staticlib staticlib_osx: $(STATIC_LIB) -+ mkdir -p $(LIB_PATH) - cp $^ $(LIB_PATH) - - # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc -@@ -153,9 +152,9 @@ - - help: - @echo "Available targets for Irrlicht" -- @echo " sharedlib: Build shared library Irrlicht.so for Linux" -- @echo " staticlib: Build static library Irrlicht.a for Linux" -- @echo " install: Copy shared library to /usr/lib" -+ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD" -+ @echo " staticlib: Build static library Irrlicht.a for FreeBSD" -+ @echo " install: Copy shared library to $(LOCALBASE)/lib" - @echo "" - @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows" - @echo " staticlib_win32: Build static library Irrlicht.a for Windows" diff -urN /usr/ports/x11-toolkits/irrlicht.orig/files/patch-source_Irrlicht_COSOperator.cpp /usr/ports/x11-toolkits/irrlicht/files/patch-source_Irrlicht_COSOperator.cpp --- /usr/ports/x11-toolkits/irrlicht.orig/files/patch-source_Irrlicht_COSOperator.cpp 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/x11-toolkits/irrlicht/files/patch-source_Irrlicht_COSOperator.cpp2010-12-05 21:49:53.000000000 +0100 @@ -0,0 +1,14 @@ +--- source/Irrlicht/COSOperator.cpp.orig 2010-10-24 09:42:46.000000000 +0200 ++++ source/Irrlicht/COSOperator.cpp 2010-12-05 21:48:39.000000000 +0100 +@@ -11,11 +11,9 @@ + #else + #include + #include +-#ifndef _IRR_SOLARIS_PLATFORM_ + #include + #include + #endif +-#endif + + #if defined(_IRR_COMPILE_WITH_X11_DEVICE_) + #include "CIrrDeviceLinux.h" diff -urN /usr/ports/x11-toolkits/irrlicht.orig/files/patch-source_Irrlicht_Makefile /usr/ports/x11-toolkits/irrlicht/files/patch-source_Irrlicht_Makefile --- /usr/ports/x11-toolkits/irrlicht.orig/files/patch-source_Irrlicht_Makefile 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/x11-toolkits/irrlicht/files/patch-source_Irrlicht_Makefile 2010-12-05 21:32:12.000000000 +0100 @@ -0,0 +1,99 @@ +--- source/Irrlicht/Makefile.orig 2010-10-31 17:53:30.000000000 +0100 ++++ source/Irrlicht/Makefile 2010-12-05 21:26:49.000000000 +0100 +@@ -3,7 +3,7 @@ VERSION_MINOR = 7 + VERSION_RELEASE = 2 + VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) + # Irrlicht Engine 1.7.2 +-# Makefile for Linux ++# Makefile for FreeBSD + # + # To use, just run: + # +@@ -49,23 +49,23 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffm + 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 -I/usr/include -I + 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 ++CXXFLAGS += -fexpensive-optimizations + endif + ifdef PROFILE + CXXFLAGS += -pg + endif +-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES ++#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 +@@ -75,15 +75,15 @@ ifeq ($(HOSTTYPE), x86_64) + LIBSELECT=64 + endif + +-#Linux specific options +-staticlib sharedlib install: SYSTEM = 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/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm -lpng -ljpeg ++staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include + + #OSX specific options + staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX +@@ -103,12 +103,12 @@ sharedlib_win32 staticlib_win32: CPPFLAG + 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 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 + sharedlib: $(LINKOBJ) +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) + mkdir -p $(LIB_PATH) + cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) + +@@ -116,7 +116,7 @@ sharedlib: $(LINKOBJ) + $(STATIC_LIB): $(LINKOBJ) + $(AR) rs $@ $^ + +-# Copies static lib into lib/Linux ++# Copies static lib into lib/FreeBSD + staticlib staticlib_osx: $(STATIC_LIB) + mkdir -p $(LIB_PATH) + cp $^ $(LIB_PATH) +@@ -165,9 +165,9 @@ endif + + help: + @echo "Available targets for Irrlicht" +- @echo " sharedlib: Build shared library Irrlicht.so for Linux" +- @echo " staticlib: Build static library Irrlicht.a for Linux" +- @echo " install: Copy shared library to /usr/local/lib" ++ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD" ++ @echo " staticlib: Build static library Irrlicht.a for FreeBSD" ++ @echo " install: Copy shared library to $(LOCALBASE)/lib" + @echo "" + @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows" + @echo " staticlib_win32: Build static library Irrlicht.a for Windows"