Ticket #65527: patch-csl-build.diff

File patch-csl-build.diff, 4.0 KB (added by mbrethen, 2 years ago)
  • cslbase/configure.ac

    diff -ur csl.orig/cslbase/configure.ac csl/cslbase/configure.ac
    old new  
    473473  then
    474474    CPPFLAGS="$CPPFLAGS -I$HOME/ports/include -I$HOME/ports/include/freetype2"
    475475  fi
    476   if test -d /opt/local/include
     476  if test -d @PREFIX@/include
    477477  then
    478     CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/local/include/freetype2"
     478    CPPFLAGS="$CPPFLAGS -I@PREFIX@/include -I@PREFIX@/include/freetype2"
    479479  fi
    480480  XLIBS="-lXext -lX11 -lXft -lfontconfig -lc"
    481481  macintosh_build="yes"
     
    502502    then
    503503      LDFLAGS="$LDFLAGS -L$HOME/ports/lib"
    504504    fi
    505     if test -d /opt/local/lib
     505    if test -d @PREFIX@/lib
    506506    then
    507       LDFLAGS="$LDFLAGS -L/opt/local/lib"
     507      LDFLAGS="$LDFLAGS -L@PREFIX@/lib"
    508508    fi
    509509    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/X11/lib"
    510510    LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
     
    12251225# libraries are nevertheless available. I will look for freetype-config
    12261226# which may also help me...
    12271227        AC_PATH_PROGS(FREETYPE_CONFIG, freetype-config, [no],
    1228           [/usr/local/bin:/usr/sfw/bin:$HOME/ports/bin:/opt/local/bin:$PATH])
     1228          [/usr/local/bin:/usr/sfw/bin:$HOME/ports/bin:@PREFIX@/bin:$PATH])
    12291229        if test "$FREETYPE_CONFIG" != "no"
    12301230        then
    12311231# I will add to CFLAGS and XLIBS if freetype-config is found, an in fact I
     
    17221722# configured for use without a GUI.
    17231723  if test "$with_gui" = "yes"
    17241724  then
    1725     if test -d /opt/local/lib
     1725    if test -d @PREFIX@/lib
    17261726    then
    1727       LL=/opt/local/lib
     1727      LL=@PREFIX@/lib
    17281728    fi
    17291729    if test -d $HOME/ports/lib
    17301730    then
  • cslbase/create_old_bundle.sh

    diff -ur csl.orig/cslbase/create_old_bundle.sh csl/cslbase/create_old_bundle.sh
    old new  
    2727cp $srcdir/../reduce.doc/*.txt                        $D
    2828cp $srcdir/../reduce.doc/*.tex                        $D
    2929cp $srcdir/../reduce.doc/*.html                       $D
    30 # cp $srcdir/../reduce.gif                            $D
     30cp $srcdir/../reduce.doc/*.gif                        $D
    3131F="$1.app/Contents/MacOS/reduce.fonts"
    3232cp -r $srcdir/fontconfig.conf                         $F
    3333# Copy everything from my source tree. This makes sense if the tree is
  • fox/configure.ac

    diff -ur csl.orig/fox/configure.ac csl/fox/configure.ac
    old new  
    116116  *darwin*)
    117117# Ugh! With macports the autoconf recipe that establishes X11 paths
    118118# fails to include this one but it is needed!
    119     CXXFLAGS="$CXXFLAGS -I/opt/local/include/freetype2"
     119    CXXFLAGS="$CXXFLAGS -I@PREFIX@/include/freetype2"
    120120  ;;
    121121  *mingw32*)
    122122    AC_MSG_NOTICE([host_os=$host_os so building for native Windows])
     
    217217      CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing"
    218218      ;;
    219219  *)
    220       CXXFLAGS="${CXXFLAGS} -Wuninitialized -fomit-frame-pointer -ffast-math -fstrict-aliasing -finline-functions -fexpensive-optimizations"
     220      CXXFLAGS="${CXXFLAGS} -Wuninitialized -fomit-frame-pointer -ffast-math -fstrict-aliasing -finline-functions"
    221221      LDFLAGS="-s ${LDFLAGS}"
    222222      ;;
    223223    esac
  • foxtests/configure.ac

    diff -ur csl.orig/foxtests/configure.ac csl/foxtests/configure.ac
    old new  
    215215    CPPFLAGS="$CPPFLAGS -fno-common -I/usr/X11R6/include"
    216216    DLL_CFLAGS="$CFLAGS -bundle -undefined suppress"
    217217    AC_DEFINE(UNIX,[1],[True if we are running on Unix, Linux, BSD etc])
    218     LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
     218    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
    219219    LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
    220220  fi
    221221  ;;