Changeset 139560 for trunk/dports/math


Ignore:
Timestamp:
Aug 20, 2015, 2:49:28 PM (5 years ago)
Author:
khindenburg@…
Message:

calc: revert patch to previous state

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/calc/files/patch-Makefile.diff

    r139558 r139560  
    1 --- Makefile    2015-08-20 09:42:29.000000000 -0400
    2 +++ Makefile    2015-08-20 09:51:11.000000000 -0400
     1--- Makefile.orig       2014-10-06 10:45:15.000000000 +0200
     2+++ Makefile    2015-02-24 21:16:31.000000000 +0100
    33@@ -573,7 +573,7 @@
    44 
     
    66 #INCDIR= /dev/env/DJDIR/include
    77-INCDIR= /usr/include
    8 +INCDIR= /opt/local/include
     8+INCDIR= ___PREFIX___/include
    99 
    1010 # Where to install calc related things
     
    1515 #BINDIR= /dev/env/DJDIR/bin
    1616-BINDIR= /usr/bin
    17 +BINDIR= /opt/local/bin
     17+BINDIR= ___PREFIX___/bin
    1818 
    1919 #LIBDIR= /usr/local/lib
    2020 #LIBDIR= /dev/env/DJDIR/lib
    2121-LIBDIR= /usr/lib
    22 +LIBDIR= /opt/local/lib
     22+LIBDIR= ___PREFIX___/lib
    2323 
    2424 #CALC_SHAREDIR= /usr/local/lib/calc
    2525 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
    2626-CALC_SHAREDIR= /usr/share/calc
    27 +CALC_SHAREDIR= /opt/local/share/calc
     27+CALC_SHAREDIR= ___PREFIX___/share/calc
    2828 
    2929 # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
     
    3434 #
    3535-T=
    36 +T=/opt/local/var/macports/build/_Volumes_Projects_OtherSoftware_macports-trunk_dports_math_calc/calc/work/destroot
     36+T=___DESTROOT___
    3737 
    3838 # where man pages are installed
     
    4343 #MANDIR= /usr/man/man1
    4444-MANDIR= /usr/share/man/man1
    45 +MANDIR= /opt/local/share/man/man1
     45+MANDIR= ___PREFIX___/share/man/man1
    4646 #MANDIR= /dev/env/DJDIR/man/man1
    4747 #MANDIR= /usr/man/u_man/man1
     
    6767 #READLINE_EXTRAS= -lhistory -lncurses
    6868 #
    69 +READLINE_LIB= -L/opt/local/lib -lreadline
     69+READLINE_LIB= -L___PREFIX___/lib -lreadline
    7070+READLINE_EXTRAS= -lhistory -lncurses
    7171+#
     
    7373 #                and then do a 'fink install readline' and then use:
    7474 #
    75 @@ -1209,8 +1212,8 @@
    76  CCOPT= ${DEBUG}
    77  CCMISC= ${DARWIN_ARCH}
    78  #
    79 -LCC= clang
    80 -CC= ${PURIFY} ${LCC} ${CCWERR}
    81 +LCC= ${CC}
    82 +#CC= ${PURIFY} ${LCC} ${CCWERR}
    83  #
    84  # Darwin dynamic shared lib filenames
    85  LIB_EXT:= .dylib
Note: See TracChangeset for help on using the changeset viewer.