[139558] trunk/dports/math/calc

[David Evans]

On 8/20/15 7:04 AM, khindenburg at macports.org wrote:
> Revision
>     139558 <https://trac.macports.org/changeset/139558>
> Author
>     khindenburg at macports.org
> Date
>     2015-08-20 07:04:27 -0700 (Thu, 20 Aug 2015)
> 
> 
>       Log Message
> 
> calc: implement UsingTheRightCompiler
> 
> 
>       Modified Paths
> 
>   * trunk/dports/math/calc/Portfile <#trunkdportsmathcalcPortfile>
>   * trunk/dports/math/calc/files/patch-Makefile.diff
>     <#trunkdportsmathcalcfilespatchMakefilediff>
> 
> 
>       Diff
> 
> 
>         Modified: trunk/dports/math/calc/Portfile (139557 => 139558)
> 
> --- trunk/dports/math/calc/Portfile 2015-08-20 12:28:32 UTC (rev 139557)
> +++ trunk/dports/math/calc/Portfile 2015-08-20 14:04:27 UTC (rev 139558)
> @@ -42,6 +42,8 @@ variant universal {} +build.args-append
> CC=${configure.cc} + test.run yes test.target check
> 
> 
>         Modified: trunk/dports/math/calc/files/patch-Makefile.diff
>         (139557 => 139558)
> 
> --- trunk/dports/math/calc/files/patch-Makefile.diff 2015-08-20 12:28:32
> UTC (rev 139557) +++ trunk/dports/math/calc/files/patch-Makefile.diff
> 2015-08-20 14:04:27 UTC (rev 139558) @@ -1,11 +1,11 @@ ----
> Makefile.orig 2014-10-06 10:45:15.000000000 +0200 -+++ Makefile
> 2015-02-24 21:16:31.000000000 +0100 +--- Makefile 2015-08-20
> 09:42:29.000000000 -0400 ++++ Makefile 2015-08-20 09:51:11.000000000
> -0400 @@ -573,7 +573,7 @@ #INCDIR= /usr/local/include #INCDIR=
> /dev/env/DJDIR/include -INCDIR= /usr/include -+INCDIR=
> ___PREFIX___/include ++INCDIR= /opt/local/include # Where to install
> calc related things # @@ -14,17 +14,17 @@ #BINDIR= /usr/local/bin
> #BINDIR= /dev/env/DJDIR/bin -BINDIR= /usr/bin -+BINDIR= ___PREFIX___/bin
> ++BINDIR= /opt/local/bin #LIBDIR= /usr/local/lib #LIBDIR=
> /dev/env/DJDIR/lib -LIBDIR= /usr/lib -+LIBDIR= ___PREFIX___/lib
> ++LIBDIR= /opt/local/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_SHAREDIR= /opt/local/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 @@ -33,7 +33,7 @@ # If in doubt,
> use T= # -T= -+T=___DESTROOT___
> ++T=/opt/local/var/macports/build/_Volumes_Projects_OtherSoftware_macports-trunk_dports_math_calc/calc/work/destroot
> # where man pages are installed # @@ -42,7 +42,7 @@ #MANDIR=
> /usr/local/man/man1 #MANDIR= /usr/man/man1 -MANDIR= /usr/share/man/man1
> -+MANDIR= ___PREFIX___/share/man/man1 ++MANDIR=
> /opt/local/share/man/man1 #MANDIR= /dev/env/DJDIR/man/man1 #MANDIR=
> /usr/man/u_man/man1 #MANDIR= /usr/contrib/man/man1 @@ -66,9 +66,20 @@
> #READLINE_LIB= -L/usr/local/lib -lreadline #READLINE_EXTRAS= -lhistory
> -lncurses # -+READLINE_LIB= -L___PREFIX___/lib -lreadline
> ++READLINE_LIB= -L/opt/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: # +@@ -1209,8 +1212,8 @@ + CCOPT= ${DEBUG} + CCMISC=
> ${DARWIN_ARCH} + # +-LCC= clang +-CC= ${PURIFY} ${LCC} ${CCWERR} ++LCC=
> ${CC} ++#CC= ${PURIFY} ${LCC} ${CCWERR} + # + # Darwin dynamic shared
> lib filenames + LIB_EXT:= .dylib
> 
> 
> 
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> https://lists.macosforge.org/mailman/listinfo/macports-changes
> 

Looks like you need to restore __PREFIX__ and __DESTROOT__ in
patch-Makefile.diff rather than the substituted values.

Dave