[108624] trunk/dports/science/magicspp

[takeshi at macports.org]

Revision: 108624
          https://trac.macports.org/changeset/108624
Author:   takeshi at macports.org
Date:     2013-07-28 15:55:34 -0700 (Sun, 28 Jul 2013)
Log Message:
-----------
magicspp: updated patches to fix build failure

Modified Paths:
--------------
    trunk/dports/science/magicspp/Portfile
    trunk/dports/science/magicspp/files/patch-configure.diff
    trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff

Modified: trunk/dports/science/magicspp/Portfile
===================================================================
--- trunk/dports/science/magicspp/Portfile	2013-07-28 17:31:14 UTC (rev 108623)
+++ trunk/dports/science/magicspp/Portfile	2013-07-28 22:55:34 UTC (rev 108624)
@@ -5,7 +5,7 @@
 
 name                magicspp
 version             2.18.15
-revision            2
+revision            3
 platforms           darwin
 maintainers         takeshi
 license             Apache-2

Modified: trunk/dports/science/magicspp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-configure.diff	2013-07-28 17:31:14 UTC (rev 108623)
+++ trunk/dports/science/magicspp/files/patch-configure.diff	2013-07-28 22:55:34 UTC (rev 108624)
@@ -1,6 +1,6 @@
---- configure.orig	2012-12-05 20:12:16.000000000 +0900
-+++ configure	2013-01-06 07:49:48.000000000 +0900
-@@ -18194,8 +18194,6 @@
+--- configure.orig	2013-04-08 22:50:34.000000000 +0900
++++ configure	2013-07-29 07:35:15.000000000 +0900
+@@ -18234,8 +18234,6 @@
      *-darwin*)
          CPPFLAGS="${CPPFLAGS} -DMAGICS_MAC_GCC"
          LIBS="$LIBS -lpng -lcurl"

Modified: trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff	2013-07-28 17:31:14 UTC (rev 108623)
+++ trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff	2013-07-28 22:55:34 UTC (rev 108624)
@@ -1,11 +1,22 @@
---- src/Makefile.in.orig	2012-12-05 20:47:06.000000000 +0900
-+++ src/Makefile.in	2013-01-05 11:02:23.000000000 +0900
-@@ -718,7 +718,7 @@
+--- src/Makefile.in.orig	2013-04-16 01:36:11.000000000 +0900
++++ src/Makefile.in	2013-07-29 07:29:25.000000000 +0900
+@@ -107,8 +107,8 @@
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
+-libMagPlus_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++libMagPlus_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ 	$(libMagPlus_la_LDFLAGS) $(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I. at am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+@@ -720,7 +720,7 @@
  	  rm -f "$${dir}/so_locations"; \
  	done
  libMagPlus.la: $(libMagPlus_la_OBJECTS) $(libMagPlus_la_DEPENDENCIES) 
 -	$(AM_V_CCLD)$(libMagPlus_la_LINK) -rpath $(libdir) $(libMagPlus_la_OBJECTS) $(libMagPlus_la_LIBADD) $(LIBS)
-+	$(AM_V_CCLD)$(libMagPlus_la_LINK) -rpath $(libdir) $(libMagPlus_la_OBJECTS) $(libMagPlus_la_LIBADD) $(LIBS) $(FLIBS)
++	$(AM_V_CXXLD)$(libMagPlus_la_LINK) -rpath $(libdir) $(libMagPlus_la_OBJECTS) $(libMagPlus_la_LIBADD) $(LIBS) $(FLIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130728/1ccfd808/attachment.html>