summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--print/freetype2/files/patch-aa24
-rw-r--r--print/freetype2/files/patch-builds::unix::freetype-config.in17
2 files changed, 41 insertions, 0 deletions
diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-aa
new file mode 100644
index 000000000..f18618ec8
--- /dev/null
+++ b/print/freetype2/files/patch-aa
@@ -0,0 +1,24 @@
+--- builds/unix/detect.mk.orig 2006-12-09 13:51:54.000000000 -0500
++++ builds/unix/detect.mk 2007-07-06 12:55:05.000000000 -0400
+@@ -21,6 +21,9 @@ ifeq ($(PLATFORM),ansi)
+ is_unix := $(strip $(wildcard /sbin/init) \
+ $(wildcard /usr/sbin/init) \
+ $(wildcard /hurd/auth))
++ # FreeBSD is "unix" so just mandate this to fix the build in
++ # jails that do not have init (see PR#113470).
++ is_unix := true
+ ifneq ($(is_unix),)
+
+ PLATFORM := unix
+@@ -79,9 +82,9 @@ ifeq ($(PLATFORM),unix)
+ ifdef must_configure
+ ifneq ($(have_Makefile),)
+ # we are building FT2 not in the src tree
+- $(TOP_DIR)/builds/unix/configure $(value CFG)
++# $(TOP_DIR)/builds/unix/configure $(value CFG)
+ else
+- cd builds/unix; ./configure $(value CFG)
++# cd builds/unix; ./configure $(value CFG)
+ endif
+ endif
+
diff --git a/print/freetype2/files/patch-builds::unix::freetype-config.in b/print/freetype2/files/patch-builds::unix::freetype-config.in
new file mode 100644
index 000000000..f45d886c8
--- /dev/null
+++ b/print/freetype2/files/patch-builds::unix::freetype-config.in
@@ -0,0 +1,17 @@
+--- builds/unix/freetype-config.in.orig 2009-12-21 18:23:42.000000000 -0500
++++ builds/unix/freetype-config.in 2010-02-21 15:51:17.000000000 -0500
+@@ -131,12 +131,8 @@ if test "$echo_ft_version" = "yes" ; the
+ fi
+
+ if test "$echo_cflags" = "yes" ; then
+- cflags="-I${SYSROOT}$includedir/freetype2"
+- if test "${SYSROOT}$includedir" != "/usr/include" ; then
+- echo $cflags -I${SYSROOT}$includedir
+- else
+- echo $cflags
+- fi
++ cflags="-I@includedir@/freetype2 -I@includedir@"
++ echo $cflags
+ fi
+
+ if test "$echo_libs" = "yes" ; then