[97584] trunk/dports/aqua

[ryandesign at macports.org]

Revision: 97584
          https://trac.macports.org/changeset/97584
Author:   ryandesign at macports.org
Date:     2012-09-09 08:47:30 -0700 (Sun, 09 Sep 2012)
Log Message:
-----------
fltk, fltk-devel: fix link failure when upgrading from an incompatible version (#35986)

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

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

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2012-09-09 15:23:30 UTC (rev 97583)
+++ trunk/dports/aqua/fltk/Portfile	2012-09-09 15:47:30 UTC (rev 97584)
@@ -40,6 +40,7 @@
 use_parallel_build  yes
 
 patchfiles      patch-FL-mac.H.diff \
+                patch-fluid-Makefile.diff \
                 patch-src-filename_list.cxx.diff
 
 post-patch {

Added: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff	2012-09-09 15:47:30 UTC (rev 97584)
@@ -0,0 +1,11 @@
+--- 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-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)
+ 
+ clean:
+ 	-$(RM) *.o core.* *~ *.bck *.bck

Modified: trunk/dports/aqua/fltk-devel/Portfile
===================================================================
--- trunk/dports/aqua/fltk-devel/Portfile	2012-09-09 15:23:30 UTC (rev 97583)
+++ trunk/dports/aqua/fltk-devel/Portfile	2012-09-09 15:47:30 UTC (rev 97584)
@@ -39,6 +39,8 @@
 
 use_parallel_build  yes
 
+patchfiles      patch-fluid-Makefile.diff
+
 post-patch {
     reinplace "s|/Applications|${applications_dir}/fltk|g" \
         ${worksrcpath}/fluid/Makefile \

Added: trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff	2012-09-09 15:47:30 UTC (rev 97584)
@@ -0,0 +1,11 @@
+--- 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-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)
+ 
+ clean:
+ 	-$(RM) *.o core.* *~ *.bck *.bck
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120909/2f259145/attachment.html>