[146481] trunk/dports/aqua/fltk

[michaelld at macports.org]

Revision: 146481
          https://trac.macports.org/changeset/146481
Author:   michaelld at macports.org
Date:     2016-03-09 05:40:53 -0800 (Wed, 09 Mar 2016)
Log Message:
-----------
fltk-devel: update to 1.3.x-r11279, splitting patch for fluid/Makefile into release and devel versions.

Revision Links:
--------------
    https://trac.macports.org/changeset/11279

Modified Paths:
--------------
    trunk/dports/aqua/fltk/Portfile

Added Paths:
-----------
    trunk/dports/aqua/fltk/files/patch-fluid-Makefile.devel.diff
    trunk/dports/aqua/fltk/files/patch-fluid-Makefile.release.diff

Removed Paths:
-------------
    trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2016-03-09 13:39:03 UTC (rev 146480)
+++ trunk/dports/aqua/fltk/Portfile	2016-03-09 13:40:53 UTC (rev 146481)
@@ -53,9 +53,9 @@
 
     conflicts       fltk
 
-    version         1.3.x-r11217
-    checksums       rmd160 7d5793afa30bb400c249b75e8ca770e62153119d \
-                    sha256 4663a4d535eadb06b78af1e7fa01a2921d9f18af9c4909167fd4e21ae8bade9d
+    version         1.3.x-r11279
+    checksums       rmd160 3884ca24908439cb1d47f9b10f56d450f09256f5 \
+                    sha256 e7e9e344a37f6005130be394b610c460910285cac6f001815791a299978f8d94
 
     master_sites    http://fltk.org/pub/fltk/snapshots/
     distname        fltk-${version}
@@ -69,12 +69,11 @@
                 port:libpng \
                 port:zlib
 
-patchfiles      patch-fluid-Makefile.diff
-
 if {${subport} eq "fltk"} {
     patchfiles-append \
         patch-src-Makefile.release.diff \
-        patch-fix_LP64.release.diff
+        patch-fix_LP64.release.diff \
+        patch-fluid-Makefile.release.diff
 
     # the following patches are already integrated into the devel version
     patchfiles-append \
@@ -84,7 +83,8 @@
 } else {
     patchfiles-append \
         patch-src-Makefile.devel.diff \
-        patch-fix_LP64.devel.diff
+        patch-fix_LP64.devel.diff \
+        patch-fluid-Makefile.devel.diff
 }
 
 post-patch {

Added: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.devel.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.devel.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.devel.diff	2016-03-09 13:40:53 UTC (rev 146481)
@@ -0,0 +1,18 @@
+--- fluid/Makefile.orig	2016-02-27 10:51:09.000000000 -0500
++++ fluid/Makefile	2016-03-08 12:04:16.000000000 -0500
+@@ -48,13 +48,13 @@
+ fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+ 			$(IMGLIBNAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(LDFLAGS)
+ 	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+ 
+ fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
+ 			../src/$(IMGDSONAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
+ 
+ clean:
+ 	-$(RM) *.o core.* *~ *.bck *.bak

Deleted: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff	2016-03-09 13:39:03 UTC (rev 146480)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff	2016-03-09 13:40:53 UTC (rev 146481)
@@ -1,18 +0,0 @@
---- fluid/Makefile.orig	2013-11-29 14:01:44.000000000 -0500
-+++ fluid/Makefile	2013-11-29 14:02:38.000000000 -0500
-@@ -48,13 +48,13 @@
- fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
- 			$(IMGLIBNAME)
- 	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
-+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(LDFLAGS)
- 	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
- 
- fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
- 			../src/$(IMGDSONAME)
- 	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
-+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
- 
- clean:
- 	-$(RM) *.o core.* *~ *.bck *.bck

Copied: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.release.diff (from rev 146480, trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff)
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.release.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.release.diff	2016-03-09 13:40:53 UTC (rev 146481)
@@ -0,0 +1,18 @@
+--- fluid/Makefile.orig	2013-11-29 14:01:44.000000000 -0500
++++ fluid/Makefile	2013-11-29 14:02:38.000000000 -0500
+@@ -48,13 +48,13 @@
+ fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+ 			$(IMGLIBNAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(LDFLAGS)
+ 	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+ 
+ fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
+ 			../src/$(IMGDSONAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
+ 
+ clean:
+ 	-$(RM) *.o core.* *~ *.bck *.bck
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160309/ba6ab735/attachment.html>