[60217] trunk/dports/devel/plib

[jmr at macports.org]

Revision: 60217
          http://trac.macports.org/changeset/60217
Author:   jmr at macports.org
Date:     2009-11-05 23:33:42 -0800 (Thu, 05 Nov 2009)
Log Message:
-----------
plib: update to 1.8.5, disable carbon-using components on 64-bit (#22385)

Modified Paths:
--------------
    trunk/dports/devel/plib/Portfile
    trunk/dports/devel/plib/files/patch-src_pui_puGLUT.h.diff

Removed Paths:
-------------
    trunk/dports/devel/plib/files/patch-src_js_jsMacOSX.cxx.diff
    trunk/dports/devel/plib/files/patch-src_pw_pwMacOSX.cxx.diff

Modified: trunk/dports/devel/plib/Portfile
===================================================================
--- trunk/dports/devel/plib/Portfile	2009-11-05 17:54:05 UTC (rev 60216)
+++ trunk/dports/devel/plib/Portfile	2009-11-06 07:33:42 UTC (rev 60217)
@@ -3,7 +3,7 @@
 PortSystem			1.0
 
 name				plib
-version				1.8.4
+version				1.8.5
 categories			devel graphics games
 maintainers			nomaintainer
 description			A Suite of Portable Game Libraries
@@ -18,18 +18,21 @@
 homepage			http://plib.sourceforge.net/
 master_sites		${homepage}dist/
 
-checksums			md5 5e3f289a9d1c5de0b1cfdec76bf139e6 \
-					sha1 16d3faab36fdde85c5bf620046b56c65dfad6769 \
-					rmd160 a0b6f2fdd4035cb2a6b83616726563d779efb87f
+checksums			md5 47a6fbf63668c1eed631024038b2ea90 \
+					sha1 c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc \
+					rmd160 55019bf3758ec2542804d8e3994f4bed5a188e60
 
-patchfiles			patch-src_js_jsMacOSX.cxx.diff patch-src_pw_pwMacOSX.cxx.diff \
-				patch-src_pui_puGLUT.h.diff
+patchfiles			patch-src_pui_puGLUT.h.diff patch-src_ssg_ssgLoadFLT.cxx.diff
 
-platform darwin 9 {
-	patchfiles-append	patch-src_ssg_ssgLoadFLT.cxx.diff
+platform darwin 8 {
+	patchfiles-delete	patch-src_ssg_ssgLoadFLT.cxx.diff
 }
 
 configure.args		--with-x
+if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+    # these components currently use carbon
+    configure.args-append --disable-sl --disable-pw
+}
 
 post-destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}

Deleted: trunk/dports/devel/plib/files/patch-src_js_jsMacOSX.cxx.diff
===================================================================
--- trunk/dports/devel/plib/files/patch-src_js_jsMacOSX.cxx.diff	2009-11-05 17:54:05 UTC (rev 60216)
+++ trunk/dports/devel/plib/files/patch-src_js_jsMacOSX.cxx.diff	2009-11-06 07:33:42 UTC (rev 60217)
@@ -1,24 +0,0 @@
---- src/js/jsMacOSX.cxx.orig	2004-09-21 05:45:55.000000000 -0600
-+++ src/js/jsMacOSX.cxx	2006-04-30 18:46:43.000000000 -0600
-@@ -275,7 +275,7 @@
- 		&elementEnumerator, joy);
- }
- 
--static void os_specific_s::elementEnumerator( const void *element, void* vjs)
-+void os_specific_s::elementEnumerator( const void *element, void* vjs)
- {
- 	if (CFGetTypeID((CFTypeRef) element) != CFDictionaryGetTypeID()) {
- 		ulSetError(UL_WARNING, "element enumerator passed non-dictionary value");
-diff -ur plib-1.8.4-orig/src/js/jsMacOSX.cxx plib-1.8.4/src/js/jsMacOSX.cxx
---- src/js/jsMacOSX.cxx 2004-09-21 05:45:55.000000000 -0600
-+++ src/js/jsMacOSX.cxx 2007-10-30 09:06:32.000000000 -0600
-@@ -26,7 +26,7 @@
- #if defined (UL_MAC_OSX)
- 
- #include <mach/mach.h>
--#include <IOKit/IOkitLib.h>
-+#include <IOKit/IOKitLib.h>
- #include <IOKit/hid/IOHIDLib.h>
- #include <mach/mach_error.h>
- #include <IOKit/hid/IOHIDKeys.h>
-

Modified: trunk/dports/devel/plib/files/patch-src_pui_puGLUT.h.diff
===================================================================
--- trunk/dports/devel/plib/files/patch-src_pui_puGLUT.h.diff	2009-11-05 17:54:05 UTC (rev 60216)
+++ trunk/dports/devel/plib/files/patch-src_pui_puGLUT.h.diff	2009-11-06 07:33:42 UTC (rev 60217)
@@ -8,5 +8,5 @@
  # include <GLUT/glut.h>
 +# define APIENTRY
  #else
- # include <GL/glut.h>
- #endif
+ # ifdef FREEGLUT_IS_PRESENT /* for FreeGLUT like PLIB 1.6.1*/
+ #  include <GL/freeglut.h>

Deleted: trunk/dports/devel/plib/files/patch-src_pw_pwMacOSX.cxx.diff
===================================================================
--- trunk/dports/devel/plib/files/patch-src_pw_pwMacOSX.cxx.diff	2009-11-05 17:54:05 UTC (rev 60216)
+++ trunk/dports/devel/plib/files/patch-src_pw_pwMacOSX.cxx.diff	2009-11-06 07:33:42 UTC (rev 60217)
@@ -1,36 +0,0 @@
---- src/pw/pwMacOSX.cxx.orig	2004-04-06 17:45:19.000000000 -0600
-+++ src/pw/pwMacOSX.cxx	2006-04-30 19:43:22.000000000 -0600
-@@ -311,10 +311,10 @@
- {
- 	OSErr err;
- 	long response;
--	MenuHandle menu = NewMenu(mApple, "\p\024");
-+	MenuHandle menu = NewMenu(mApple, (const unsigned char*) "\p\024");
- 	InsertMenu(menu, 0);
- 
--	InsertMenuItem(menu, "\pAbout Plib...", 0);
-+	InsertMenuItem(menu, (const unsigned char*) "\pAbout Plib...", 0);
- 
- #if !TARGET_API_MAC_CARBON
- 	AppendResMenu(menu, 'DRVR');
-@@ -325,9 +325,9 @@
- 
- 	if (err != noErr || response < 0x00001000)
- 	{
--		menu = NewMenu (mFile, "\pFile");			// new menu
-+		menu = NewMenu (mFile, (const unsigned char*) "\pFile");			// new menu
- 		InsertMenu (menu, 0);						// add menu to end
--		AppendMenu (menu, "\pQuit/Q"); 				// add items
-+		AppendMenu (menu, (const unsigned char*) "\pQuit/Q"); 				// add items
- 	}
- 	
- 	DrawMenuBar();
-@@ -370,7 +370,7 @@
- 	CtoPcpy( Pversion, version );
- 	StandardAlert ( kAlertPlainAlert,
-    					Pversion,
--   					"\pfor more infos see <http://plib.sourceforge.net>",
-+   					(const unsigned char*) "\pfor more infos see <http://plib.sourceforge.net>",
-    					NULL,
-    					&outItemHit  );
- }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091105/58d3038a/attachment.html>