[57166] trunk/dports/math/calc

raimue at macports.org raimue at macports.org
Sun Sep 6 17:17:46 PDT 2009


Revision: 57166
          http://trac.macports.org/changeset/57166
Author:   raimue at macports.org
Date:     2009-09-06 17:17:45 -0700 (Sun, 06 Sep 2009)
Log Message:
-----------
math/calc:
Update to latest stable, 2.12.3.3. Fixes the build on Snow Leopard.

Modified Paths:
--------------
    trunk/dports/math/calc/Portfile

Added Paths:
-----------
    trunk/dports/math/calc/files/patch-Makefile.diff

Removed Paths:
-------------
    trunk/dports/math/calc/files/patch-Makefile

Modified: trunk/dports/math/calc/Portfile
===================================================================
--- trunk/dports/math/calc/Portfile	2009-09-07 00:11:03 UTC (rev 57165)
+++ trunk/dports/math/calc/Portfile	2009-09-07 00:17:45 UTC (rev 57166)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name             calc
-version          2.12.1.8
+version          2.12.3.3
 categories       math
 maintainers      nomaintainer
 description      Arbitrary precision calculator
@@ -20,18 +20,24 @@
 homepage         http://www.isthe.com/chongo/tech/comp/calc/
 platforms        darwin
 master_sites     sourceforge
-checksums        sha1 4ff5f8adb638565814319513e8acdf98191cb580
+checksums        md5     2b6b511bba836653a444094622e65041 \
+                 sha1    1bd946c36e9bedea9166996951aae36f7ad872ae \
+                 rmd160  75aacf7b572533da4430ecd2b6493fd31b15f210
+use_bzip2        yes
 
 depends_lib	 port:readline \
 		 port:ncurses
 
-patchfiles       patch-Makefile
+patchfiles       patch-Makefile.diff
 post-patch {
 	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
 
 test.run         yes
 test.target      check

Deleted: trunk/dports/math/calc/files/patch-Makefile
===================================================================
--- trunk/dports/math/calc/files/patch-Makefile	2009-09-07 00:11:03 UTC (rev 57165)
+++ trunk/dports/math/calc/files/patch-Makefile	2009-09-07 00:17:45 UTC (rev 57166)
@@ -1,77 +0,0 @@
---- Makefile.orig	2007-02-07 01:35:20.000000000 +0100
-+++ Makefile	2007-02-18 17:35:50.000000000 +0100
-@@ -571,7 +571,7 @@
- 
- #INCDIR= /usr/local/include
- #INCDIR= /dev/env/DJDIR/include
--INCDIR= /usr/include
-+INCDIR= ___PREFIX___/include
- 
- # Where to install calc realted things
- #
-@@ -598,15 +598,15 @@
- #
- #BINDIR= /usr/local/bin
- #BINDIR= /dev/env/DJDIR/bin
--BINDIR= /usr/bin
-+BINDIR= ___PREFIX___/bin
- 
- #LIBDIR= /usr/local/lib
- #LIBDIR= /dev/env/DJDIR/lib
--LIBDIR= /usr/lib
-+LIBDIR= ___PREFIX___/lib
- 
- #CALC_SHAREDIR= /usr/local/lib/calc
- #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
--CALC_SHAREDIR= /usr/share/calc
-+CALC_SHAREDIR= ___PREFIX___/share/calc
- 
- #CALC_INCDIR= /usr/local/include/calc
- #CALC_INCDIR= /dev/env/DJDIR/include/calc
-@@ -669,7 +669,7 @@
- #
- # If in doubt, use T=
- #
--T=
-+T=___DESTROOT___
- 
- # where man pages are installed
- #
-@@ -680,7 +680,7 @@
- #MANDIR=
- #MANDIR= /usr/local/man/man1
- #MANDIR= /usr/man/man1
--MANDIR= /usr/share/man/man1
-+MANDIR= ___PREFIX___/share/man/man1
- #MANDIR= /dev/env/DJDIR/man/man1
- #MANDIR= /usr/man/u_man/man1
- #MANDIR= /usr/contrib/man/man1
-@@ -785,22 +785,22 @@
- #
- # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
- #
--USE_READLINE=
--#USE_READLINE= -DUSE_READLINE
-+#USE_READLINE=
-+USE_READLINE= -DUSE_READLINE
- #
--READLINE_LIB=
-+#READLINE_LIB=
- #READLINE_LIB= -lreadline -lhistory -lncurses
- #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
--#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
-+READLINE_LIB= -L___PREFIX___/lib -lreadline -lhistory -lncurses
- #
- # For Apple OS X: install fink from http://fink.sourceforge.net
- #		  and then do a 'fink install readline' and then use:
- #
- #READLINE_LIB= -L/sw/lib -lreadline -lhistory -lncurses
- #
--READLINE_INCLUDE=
-+#READLINE_INCLUDE=
- #READLINE_INCLUDE= -I/usr/gnu/include
--#READLINE_INCLUDE= -I/usr/local/include
-+READLINE_INCLUDE= -I___PREFIX___/include
- 
- # If $PAGER is not set, use this program to display a help file
- #

Copied: trunk/dports/math/calc/files/patch-Makefile.diff (from rev 57086, trunk/dports/math/calc/files/patch-Makefile)
===================================================================
--- trunk/dports/math/calc/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/math/calc/files/patch-Makefile.diff	2009-09-07 00:17:45 UTC (rev 57166)
@@ -0,0 +1,101 @@
+--- Makefile.orig	2009-09-07 02:07:08.000000000 +0200
++++ Makefile	2009-09-07 02:07:42.000000000 +0200
+@@ -585,7 +585,7 @@
+ 
+ #INCDIR= /usr/local/include
+ #INCDIR= /dev/env/DJDIR/include
+-INCDIR= /usr/include
++INCDIR= ___PREFIX___/include
+ 
+ # Where to install calc realted things
+ #
+@@ -612,15 +612,15 @@
+ #
+ #BINDIR= /usr/local/bin
+ #BINDIR= /dev/env/DJDIR/bin
+-BINDIR= /usr/bin
++BINDIR= ___PREFIX___/bin
+ 
+ #LIBDIR= /usr/local/lib
+ #LIBDIR= /dev/env/DJDIR/lib
+-LIBDIR= /usr/lib
++LIBDIR= ___PREFIX___/lib
+ 
+ #CALC_SHAREDIR= /usr/local/lib/calc
+ #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+-CALC_SHAREDIR= /usr/share/calc
++CALC_SHAREDIR= ___PREFIX___/share/calc
+ 
+ # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
+ #	Always be sure that the CALC_INCDIR path ends in /calc to avoid
+@@ -687,7 +687,7 @@
+ #
+ # If in doubt, use T=
+ #
+-T=
++T=___DESTROOT___
+ 
+ # where man pages are installed
+ #
+@@ -698,7 +698,7 @@
+ #MANDIR=
+ #MANDIR= /usr/local/man/man1
+ #MANDIR= /usr/man/man1
+-MANDIR= /usr/share/man/man1
++MANDIR= ___PREFIX___/share/man/man1
+ #MANDIR= /dev/env/DJDIR/man/man1
+ #MANDIR= /usr/man/u_man/man1
+ #MANDIR= /usr/contrib/man/man1
+@@ -825,11 +825,11 @@
+ #
+ # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+ #
+-USE_READLINE=
+-#USE_READLINE= -DUSE_READLINE
++#USE_READLINE=
++USE_READLINE= -DUSE_READLINE
+ #
+-READLINE_LIB=
+-READLINE_EXTRAS=
++#READLINE_LIB=
++#READLINE_EXTRAS=
+ #
+ #READLINE_LIB= -lreadline
+ #READLINE_EXTRAS= -lhistory -lncurses
+@@ -840,6 +840,9 @@
+ #READLINE_LIB= -L/usr/local/lib -lreadline
+ #READLINE_EXTRAS= -lhistory -lncurses
+ #
++READLINE_LIB= -L___PREFIX___/local/lib -lreadline
++READLINE_EXTRAS= -lhistory -lncurses
++#
+ # For Apple OS X: install fink from http://fink.sourceforge.net
+ #		  and then do a 'fink install readline' and then use:
+ #
+@@ -1167,7 +1170,7 @@
+ CC_SHARE= -fPIC
+ 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}
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
+ else
+@@ -1184,7 +1187,7 @@
+ CCOPT= ${DEBUG}
+ CCMISC= ${DARWIN_ARCH}
+ #
+-LCC= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} gcc
++LCC= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} ___CC___
+ CC= ${PURIFY} ${LCC} ${CCWERR}
+ #
+ # Darmin dynamic shared lib filenames
+@@ -1199,7 +1202,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
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090906/bf3acc60/attachment.html>


More information about the macports-changes mailing list