Revision: 139560 https://trac.macports.org/changeset/139560 Author: khindenburg@macports.org Date: 2015-08-20 07:49:28 -0700 (Thu, 20 Aug 2015) Log Message: ----------- calc: revert patch to previous state Modified Paths: -------------- trunk/dports/math/calc/files/patch-Makefile.diff Modified: trunk/dports/math/calc/files/patch-Makefile.diff =================================================================== --- trunk/dports/math/calc/files/patch-Makefile.diff 2015-08-20 14:26:00 UTC (rev 139559) +++ trunk/dports/math/calc/files/patch-Makefile.diff 2015-08-20 14:49:28 UTC (rev 139560) @@ -1,11 +1,11 @@ ---- Makefile 2015-08-20 09:42:29.000000000 -0400 -+++ Makefile 2015-08-20 09:51:11.000000000 -0400 +--- Makefile.orig 2014-10-06 10:45:15.000000000 +0200 ++++ Makefile 2015-02-24 21:16:31.000000000 +0100 @@ -573,7 +573,7 @@ #INCDIR= /usr/local/include #INCDIR= /dev/env/DJDIR/include -INCDIR= /usr/include -+INCDIR= /opt/local/include ++INCDIR= ___PREFIX___/include # Where to install calc related things # @@ -14,17 +14,17 @@ #BINDIR= /usr/local/bin #BINDIR= /dev/env/DJDIR/bin -BINDIR= /usr/bin -+BINDIR= /opt/local/bin ++BINDIR= ___PREFIX___/bin #LIBDIR= /usr/local/lib #LIBDIR= /dev/env/DJDIR/lib -LIBDIR= /usr/lib -+LIBDIR= /opt/local/lib ++LIBDIR= ___PREFIX___/lib #CALC_SHAREDIR= /usr/local/lib/calc #CALC_SHAREDIR= /dev/env/DJDIR/share/calc -CALC_SHAREDIR= /usr/share/calc -+CALC_SHAREDIR= /opt/local/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 @@ -33,7 +33,7 @@ # If in doubt, use T= # -T= -+T=/opt/local/var/macports/build/_Volumes_Projects_OtherSoftware_macports-trunk_dports_math_calc/calc/work/destroot ++T=___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= /opt/local/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 @@ -66,20 +66,9 @@ #READLINE_LIB= -L/usr/local/lib -lreadline #READLINE_EXTRAS= -lhistory -lncurses # -+READLINE_LIB= -L/opt/local/lib -lreadline ++READLINE_LIB= -L___PREFIX___/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