[114158] trunk/dports/aqua/fltk-devel

[michaelld at macports.org]

Revision: 114158
          https://trac.macports.org/changeset/114158
Author:   michaelld at macports.org
Date:     2013-11-30 07:59:00 -0800 (Sat, 30 Nov 2013)
Log Message:
-----------
fltk-devel: update to 1.3.x-r10020.

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

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

Modified: trunk/dports/aqua/fltk-devel/Portfile
===================================================================
--- trunk/dports/aqua/fltk-devel/Portfile	2013-11-30 15:58:58 UTC (rev 114157)
+++ trunk/dports/aqua/fltk-devel/Portfile	2013-11-30 15:59:00 UTC (rev 114158)
@@ -5,7 +5,7 @@
 
 name            fltk-devel
 conflicts       fltk
-version         1.3.x-r9965
+version         1.3.x-r10020
 categories      aqua devel
 license         LGPL
 platforms       macosx
@@ -30,8 +30,8 @@
 distname        fltk-${version}
 use_bzip2       yes
 
-checksums       rmd160  ac32fbec144147aff32d43f14840dfcb2eef950d \
-                sha256  6ddd756316d6071640d75fb31b47a3420c0c4a0d041b3c44e76cb34f84096890
+checksums       rmd160  0fec8d95997ebfd0e77677e16f1bc1b19db11864 \
+                sha256  8f9ed6b125c71a87f44847b06b4e8e7b829d337c9f445bee443c1ebcc6345d31
 
 depends_lib     port:jpeg \
                 port:libpng \
@@ -49,16 +49,28 @@
 
     # Disable silent rules
     reinplace "/^\\.SILENT:$/d" ${worksrcpath}/makeinclude.in
+
+    # tell fltk's make script to create config.sub, which is required
+    # before configure will execute properly.  This command actually
+    # runs configure through once, to create the file; we then call
+    # configure manually with the correct argument, which overwrites
+    # this (and other) files to be what we want.
+
+    system "cd ${worksrcpath} && make config.sub"
 }
 
-variant universal {}
+pre-configure {
+    configure.args-append \
+        --with-archflags="[get_canonical_archflags]"
+}
 
 configure.args  --enable-shared \
                 --disable-localjpeg \
                 --disable-localzlib \
-                --disable-localpng \
-                --with-archflags="[get_canonical_archflags]"
+                --disable-localpng
 
+configure.universal_args-delete --disable-dependency-tracking
+
 post-configure {
     reinplace -E {s|-arch [a-z0-9_]+||g} ${worksrcpath}/fltk-config
 }

Modified: trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff	2013-11-30 15:58:58 UTC (rev 114157)
+++ trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff	2013-11-30 15:59:00 UTC (rev 114158)
@@ -1,11 +1,18 @@
---- fluid/Makefile.orig	2012-09-09 10:28:39.000000000 -0500
-+++ fluid/Makefile	2012-09-09 10:30:39.000000000 -0500
-@@ -54,7 +54,7 @@
+--- 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) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
-+	$(CXX) $(ARCHFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
  
  clean:
  	-$(RM) *.o core.* *~ *.bck *.bck

Modified: trunk/dports/aqua/fltk-devel/files/patch-src-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk-devel/files/patch-src-Makefile.diff	2013-11-30 15:58:58 UTC (rev 114157)
+++ trunk/dports/aqua/fltk-devel/files/patch-src-Makefile.diff	2013-11-30 15:59:00 UTC (rev 114158)
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2013-04-16 10:02:42.000000000 -0400
-+++ src/Makefile	2013-07-02 14:19:06.000000000 -0400
+--- src/Makefile.orig	2013-11-29 14:05:10.000000000 -0500
++++ src/Makefile	2013-11-29 14:05:50.000000000 -0500
 @@ -355,7 +355,7 @@
  		-install_name $(libdir)/$@ \
  		-current_version 1.3.2 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131130/100f82bd/attachment.html>