[113353] trunk/dports/math/calc
ryandesign at macports.org
ryandesign at macports.org
Thu Nov 14 03:15:02 PST 2013
Revision: 113353
https://trac.macports.org/changeset/113353
Author: ryandesign at macports.org
Date: 2013-11-14 03:15:02 -0800 (Thu, 14 Nov 2013)
Log Message:
-----------
calc: update to 2.12.4.13, use the right -arch flags and add a universal variant
Modified Paths:
--------------
trunk/dports/math/calc/Portfile
trunk/dports/math/calc/files/patch-Makefile.diff
Modified: trunk/dports/math/calc/Portfile
===================================================================
--- trunk/dports/math/calc/Portfile 2013-11-14 09:46:58 UTC (rev 113352)
+++ trunk/dports/math/calc/Portfile 2013-11-14 11:15:02 UTC (rev 113353)
@@ -3,7 +3,7 @@
PortSystem 1.0
name calc
-version 2.12.4.3
+version 2.12.4.13
categories math
license LGPL-2.1
maintainers nomaintainer
@@ -24,8 +24,8 @@
master_sites sourceforge:project/calc/calc/${version}
use_bzip2 yes
-checksums rmd160 a0bd19a6e2c0432c65262a826e933a0ae9d664f3 \
- sha256 a4e7d8a9313e7d28653e2c372fca9b0defdc02f965b833bb43479bbdfee51a92
+checksums rmd160 c04d995a500ad7b0be27afbb6edaa6978c42437e \
+ sha256 1e6fd3256bd7bf738fcfe6e2d6a9d8a6bb0f37393aba6020b01d96274419a92c
depends_lib port:readline port:ncurses
@@ -34,13 +34,16 @@
reinplace "s|___PREFIX___|${prefix}|" ${worksrcpath}/Makefile
reinplace "s|___DESTROOT___|${destroot}|" ${worksrcpath}/Makefile
reinplace "s|___CC___|${configure.cc}|" ${worksrcpath}/Makefile
- reinplace "s|___MACOSX_DEPLOYMENT_TARGET___|${macosx_deployment_target}|" \
- ${worksrcpath}/Makefile
}
use_configure no
use_parallel_build no
+variant universal {}
+
+build.args-append DARWIN_ARCH="[get_canonical_archflags]" \
+ MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
+
test.run yes
test.target check
Modified: trunk/dports/math/calc/files/patch-Makefile.diff
===================================================================
--- trunk/dports/math/calc/files/patch-Makefile.diff 2013-11-14 09:46:58 UTC (rev 113352)
+++ trunk/dports/math/calc/files/patch-Makefile.diff 2013-11-14 11:15:02 UTC (rev 113353)
@@ -1,5 +1,5 @@
---- Makefile.orig 2010-09-02 04:48:42.000000000 -0500
-+++ Makefile 2011-10-25 05:31:48.000000000 -0500
+--- Makefile.orig 2013-09-27 03:55:28.000000000 -0500
++++ Makefile 2013-11-14 05:12:38.000000000 -0600
@@ -585,7 +585,7 @@
#INCDIR= /usr/local/include
@@ -7,7 +7,7 @@
-INCDIR= /usr/include
+INCDIR= ___PREFIX___/include
- # Where to install calc realted things
+ # Where to install calc related things
#
@@ -624,15 +624,15 @@
#
@@ -77,10 +77,10 @@
DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
LD_SHARE= ${DARWIN_ARCH}
-LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
-+LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION}
++LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION} ${DARWIN_ARCH}
ifdef ALLOW_CUSTOM
-LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
-+LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION}
++LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION} ${DARWIN_ARCH}
else
LIBCUSTCALC_SHLIB=
endif
@@ -92,13 +92,4 @@
+LCC= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} ___CC___
CC= ${PURIFY} ${LCC} ${CCWERR}
#
- # Darmin dynamic shared lib filenames
-@@ -1212,7 +1215,7 @@
- # DARWIN_ARCH= -arch i386 # Intel binary
- # DARWIN_ARCH= -arch ppc # PPC binary
- DARWIN_ARCH= # native binary
--MACOSX_DEPLOYMENT_TARGET=10.4
-+MACOSX_DEPLOYMENT_TARGET=___MACOSX_DEPLOYMENT_TARGET___
- #
- endif
-
+ # Darwin dynamic shared lib filenames
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131114/02fe22c9/attachment.html>
More information about the macports-changes
mailing list