mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Mark BrethenandChristopher Nielsen
8233b60a15
Fixes: https://trac.macports.org/ticket/65527 Fixes: https://trac.macports.org/ticket/60778 Fixes: https://trac.macports.org/ticket/60544 Fixes: https://trac.macports.org/ticket/60543
95 lines
4.0 KiB
Diff
95 lines
4.0 KiB
Diff
diff -ur csl.orig/cslbase/configure.ac csl/cslbase/configure.ac
|
|
--- csl.orig/cslbase/configure.ac 2022-07-22 08:52:43.000000000 -0500
|
|
+++ csl/cslbase/configure.ac 2022-07-22 10:36:09.000000000 -0500
|
|
@@ -473,9 +473,9 @@
|
|
then
|
|
CPPFLAGS="$CPPFLAGS -I$HOME/ports/include -I$HOME/ports/include/freetype2"
|
|
fi
|
|
- if test -d /opt/local/include
|
|
+ if test -d @PREFIX@/include
|
|
then
|
|
- CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/local/include/freetype2"
|
|
+ CPPFLAGS="$CPPFLAGS -I@PREFIX@/include -I@PREFIX@/include/freetype2"
|
|
fi
|
|
XLIBS="-lXext -lX11 -lXft -lfontconfig -lc"
|
|
macintosh_build="yes"
|
|
@@ -502,9 +502,9 @@
|
|
then
|
|
LDFLAGS="$LDFLAGS -L$HOME/ports/lib"
|
|
fi
|
|
- if test -d /opt/local/lib
|
|
+ if test -d @PREFIX@/lib
|
|
then
|
|
- LDFLAGS="$LDFLAGS -L/opt/local/lib"
|
|
+ LDFLAGS="$LDFLAGS -L@PREFIX@/lib"
|
|
fi
|
|
LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/X11/lib"
|
|
LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
|
|
@@ -1225,7 +1225,7 @@
|
|
# libraries are nevertheless available. I will look for freetype-config
|
|
# which may also help me...
|
|
AC_PATH_PROGS(FREETYPE_CONFIG, freetype-config, [no],
|
|
- [/usr/local/bin:/usr/sfw/bin:$HOME/ports/bin:/opt/local/bin:$PATH])
|
|
+ [/usr/local/bin:/usr/sfw/bin:$HOME/ports/bin:@PREFIX@/bin:$PATH])
|
|
if test "$FREETYPE_CONFIG" != "no"
|
|
then
|
|
# I will add to CFLAGS and XLIBS if freetype-config is found, an in fact I
|
|
@@ -1722,9 +1722,9 @@
|
|
# configured for use without a GUI.
|
|
if test "$with_gui" = "yes"
|
|
then
|
|
- if test -d /opt/local/lib
|
|
+ if test -d @PREFIX@/lib
|
|
then
|
|
- LL=/opt/local/lib
|
|
+ LL=@PREFIX@/lib
|
|
fi
|
|
if test -d $HOME/ports/lib
|
|
then
|
|
diff -ur csl.orig/cslbase/create_old_bundle.sh csl/cslbase/create_old_bundle.sh
|
|
--- csl.orig/cslbase/create_old_bundle.sh 2022-07-22 22:16:51.000000000 -0500
|
|
+++ csl/cslbase/create_old_bundle.sh 2022-07-22 22:19:20.000000000 -0500
|
|
@@ -27,7 +27,7 @@
|
|
cp $srcdir/../reduce.doc/*.txt $D
|
|
cp $srcdir/../reduce.doc/*.tex $D
|
|
cp $srcdir/../reduce.doc/*.html $D
|
|
-# cp $srcdir/../reduce.gif $D
|
|
+cp $srcdir/../reduce.doc/*.gif $D
|
|
F="$1.app/Contents/MacOS/reduce.fonts"
|
|
cp -r $srcdir/fontconfig.conf $F
|
|
# Copy everything from my source tree. This makes sense if the tree is
|
|
diff -ur csl.orig/fox/configure.ac csl/fox/configure.ac
|
|
--- csl.orig/fox/configure.ac 2022-07-22 08:52:42.000000000 -0500
|
|
+++ csl/fox/configure.ac 2022-07-22 09:21:54.000000000 -0500
|
|
@@ -116,7 +116,7 @@
|
|
*darwin*)
|
|
# Ugh! With macports the autoconf recipe that establishes X11 paths
|
|
# fails to include this one but it is needed!
|
|
- CXXFLAGS="$CXXFLAGS -I/opt/local/include/freetype2"
|
|
+ CXXFLAGS="$CXXFLAGS -I@PREFIX@/include/freetype2"
|
|
;;
|
|
*mingw32*)
|
|
AC_MSG_NOTICE([host_os=$host_os so building for native Windows])
|
|
@@ -217,7 +217,7 @@
|
|
CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing"
|
|
;;
|
|
*)
|
|
- CXXFLAGS="${CXXFLAGS} -Wuninitialized -fomit-frame-pointer -ffast-math -fstrict-aliasing -finline-functions -fexpensive-optimizations"
|
|
+ CXXFLAGS="${CXXFLAGS} -Wuninitialized -fomit-frame-pointer -ffast-math -fstrict-aliasing -finline-functions"
|
|
LDFLAGS="-s ${LDFLAGS}"
|
|
;;
|
|
esac
|
|
|
|
diff -ur csl.orig/foxtests/configure.ac csl/foxtests/configure.ac
|
|
--- csl.orig/foxtests/configure.ac 2022-07-22 11:29:16.000000000 -0500
|
|
+++ csl/foxtests/configure.ac 2022-07-22 11:34:19.000000000 -0500
|
|
@@ -215,7 +215,7 @@
|
|
CPPFLAGS="$CPPFLAGS -fno-common -I/usr/X11R6/include"
|
|
DLL_CFLAGS="$CFLAGS -bundle -undefined suppress"
|
|
AC_DEFINE(UNIX,[1],[True if we are running on Unix, Linux, BSD etc])
|
|
- LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
|
|
+ LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
|
|
LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
|
|
fi
|
|
;;
|