[105302] trunk/dports/x11/tigervnc

[ryandesign at macports.org]

Revision: 105302
          https://trac.macports.org/changeset/105302
Author:   ryandesign at macports.org
Date:     2013-04-16 20:01:18 -0700 (Tue, 16 Apr 2013)
Log Message:
-----------
tigervnc: copy the rest of the patches that we had in the fltk port before it was updated to 1.3.2 to hopefully fix the build on OS X < 10.8

Modified Paths:
--------------
    trunk/dports/x11/tigervnc/Portfile

Added Paths:
-----------
    trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff
    trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff

Modified: trunk/dports/x11/tigervnc/Portfile
===================================================================
--- trunk/dports/x11/tigervnc/Portfile	2013-04-17 02:46:51 UTC (rev 105301)
+++ trunk/dports/x11/tigervnc/Portfile	2013-04-17 03:01:18 UTC (rev 105302)
@@ -38,7 +38,9 @@
                         port:xorg-libXinerama \
                         port:zlib
 
-patchfiles              patch-common-fltk-src-filename_list.cxx.diff \
+patchfiles              patch-common-fltk-FL-mac.h.diff \
+                        patch-common-fltk-src-filename_list.cxx.diff \
+                        patch-common-fltk-src-Makefile.diff \
                         patch-gnutls-3.diff
 
 # tigervnc includes its own copy of fltk and gets confused when the MacPorts

Copied: trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff (from rev 99999, trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff)
===================================================================
--- trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff	                        (rev 0)
+++ trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff	2013-04-17 03:01:18 UTC (rev 105302)
@@ -0,0 +1,15 @@
+--- common/fltk/FL/mac.H.orig	2011-05-12 06:50:43.000000000 -0500
++++ common/fltk/FL/mac.H	2012-09-05 18:57:31.000000000 -0500
+@@ -52,6 +52,12 @@
+ #ifndef MAC_OS_X_VERSION_10_6
+ #define MAC_OS_X_VERSION_10_6 1060
+ #endif
++#ifndef MAC_OS_X_VERSION_10_7
++#define MAC_OS_X_VERSION_10_7 1070
++#endif
++#ifndef MAC_OS_X_VERSION_10_8
++#define MAC_OS_X_VERSION_10_8 1080
++#endif
+ 
+ #if !(defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part is used when compiling an application program
+ 


Property changes on: trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/aqua/fltk/files/patch-FL-mac.H.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856

Copied: trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff (from rev 99999, trunk/dports/aqua/fltk/files/patch-src-Makefile.diff)
===================================================================
--- trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff	                        (rev 0)
+++ trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff	2013-04-17 03:01:18 UTC (rev 105302)
@@ -0,0 +1,11 @@
+--- common/fltk/src/Makefile.orig	2011-07-18 23:49:30.000000000 -0500
++++ common/fltk/src/Makefile	2012-09-09 11:35:36.000000000 -0500
+@@ -355,7 +355,7 @@
+ 		-install_name $(libdir)/$@ \
+ 		-current_version 1.3.0 \
+ 		-compatibility_version 1.3.0 \
+-		$(IMGOBJECTS)  -L. $(LDLIBS) $(IMAGELIBS) -lfltk
++		$(IMGOBJECTS)  -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
+ 	$(RM) libfltk_images.dylib
+ 	$(LN) libfltk_images.1.3.dylib libfltk_images.dylib
+ 


Property changes on: trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/aqua/fltk/files/patch-src-Makefile.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130416/a43f3762/attachment-0001.html>