[134675] trunk/dports/aqua/fltk

[michaelld at macports.org]

Revision: 134675
          https://trac.macports.org/changeset/134675
Author:   michaelld at macports.org
Date:     2015-04-02 16:33:15 -0700 (Thu, 02 Apr 2015)
Log Message:
-----------
fltk:
+ fix patch for release;
+ update devel to r10653 & fix patch usage.

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

Modified Paths:
--------------
    trunk/dports/aqua/fltk/Portfile
    trunk/dports/aqua/fltk/files/patch-src-Makefile.diff

Added Paths:
-----------
    trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2015-04-02 20:40:48 UTC (rev 134674)
+++ trunk/dports/aqua/fltk/Portfile	2015-04-02 23:33:15 UTC (rev 134675)
@@ -50,9 +50,9 @@
 
     conflicts       fltk
 
-    version         1.3.x-r10606
-    checksums       rmd160 9a521b8af6f93bff8a32332789fe5f28b1baedf2 \
-                    sha256 9dc1f17ddc8c858df9b3057aab5f60cf28b8fb7f918d2598b4d3b8ae762aaaa6
+    version         1.3.x-r10653
+    checksums       rmd160 a70c85855ba06116b7e1653a1670f4e93bb27dd1 \
+                    sha256 20de40cc0a91e676791632cf6f118f3514351c8c6cca6f2a0507958e37dd9155
 
     master_sites    http://fltk.org/pub/fltk/snapshots/
     distname        fltk-${version}
@@ -66,10 +66,17 @@
                 port:libpng \
                 port:zlib
 
-patchfiles      patch-fluid-Makefile.diff \
-                patch-src-Makefile.diff \
-                patch-src-Fl_JPEG_Image.cxx.diff
+patchfiles      patch-fluid-Makefile.diff
 
+if {${subport} eq "fltk"} {
+    patchfiles-append \
+        patch-src-Makefile.diff \
+        patch-src-Fl_JPEG_Image.cxx.diff
+} else {
+    patchfiles-append \
+        patch-src-Makefile_devel.diff
+}
+
 post-patch {
 
     reinplace "s|/Applications|${applications_dir}/fltk|g" \

Modified: trunk/dports/aqua/fltk/files/patch-src-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-Makefile.diff	2015-04-02 20:40:48 UTC (rev 134674)
+++ trunk/dports/aqua/fltk/files/patch-src-Makefile.diff	2015-04-02 23:33:15 UTC (rev 134675)
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2014-10-30 12:05:22.000000000 -0400
-+++ src/Makefile	2014-11-04 09:24:43.000000000 -0500
+--- src/Makefile.orig	2015-04-02 19:28:53.000000000 -0400
++++ src/Makefile	2015-04-02 19:29:45.000000000 -0400
 @@ -360,7 +360,7 @@
  		-install_name $(libdir)/$@ \
  		-current_version 1.3.3 \

Added: trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff	2015-04-02 23:33:15 UTC (rev 134675)
@@ -0,0 +1,11 @@
+--- src/Makefile.orig
++++ src/Makefile
+@@ -363,7 +363,7 @@
+ 		-install_name $(libdir)/$@ \
+ 		-current_version $(FL_VERSION) \
+ 		-compatibility_version $(FL_ABI_VERSION) \
+-		$(IMGOBJECTS)  -L. $(LDLIBS) $(IMAGELIBS) -lfltk
++		$(IMGOBJECTS)  -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
+ 	$(RM) libfltk_images.dylib
+ 	$(LN) libfltk_images.$(FL_DSO_VERSION).dylib libfltk_images.dylib
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150402/b8cc1a0c/attachment-0001.html>