aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2021-08-07 09:53:19 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2021-08-07 10:11:31 +0000
commit6923da4303f955134aaf0a8fd35393f1e38422b1 (patch)
tree2a359b983ee851e5ab048d1ccee23a41fa3d12b2
parent15cc5bd5f7e07791137683480cfc174f2d155919 (diff)
downloadports-6923da4303f955134aaf0a8fd35393f1e38422b1.tar.gz
ports-6923da4303f955134aaf0a8fd35393f1e38422b1.zip
sysutils/grub2-pcbsd: prepare for freetype2 update
- freetype2 will no longer ship freetype-config (which was a pkg-config wrapper) in the near future -- use pkg-config to gather the required flags. PR: 251512
-rw-r--r--sysutils/grub2-pcbsd/Makefile4
-rw-r--r--sysutils/grub2-pcbsd/files/patch-configure.ac28
2 files changed, 28 insertions, 4 deletions
diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index 2e679d8edd63..d198c7f7cfed 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \
help2man:misc/help2man
ONLY_FOR_ARCHS= amd64
-USES= autoreconf:build bison cpe gettext gmake makeinfo python tar:xz
+USES= autoreconf:build bison cpe gettext gmake makeinfo pkgconfig python tar:xz
WRKSRC= ${WRKDIR}/grub-2.02
CONFLICTS= grub2-2*
@@ -43,6 +43,8 @@ OPTIONS_SUB= yes
MKFONT_DESC= Build grub-mkfont (require freetype2)
FUSE_DESC= Build grub-mount (require FUSE)
+BINARY_ALIAS= freetype-config=true
+
.include <bsd.port.pre.mk>
.if ${ARCH} != "amd64"
diff --git a/sysutils/grub2-pcbsd/files/patch-configure.ac b/sysutils/grub2-pcbsd/files/patch-configure.ac
index 0410fc189060..c4bd3ba637bc 100644
--- a/sysutils/grub2-pcbsd/files/patch-configure.ac
+++ b/sysutils/grub2-pcbsd/files/patch-configure.ac
@@ -1,6 +1,28 @@
---- configure.ac.orig 2015-06-03 14:54:01 UTC
+--- configure.ac.orig 2015-08-03 16:39:24 UTC
+++ configure.ac
-@@ -1459,7 +1459,7 @@ fi
+@@ -1371,8 +1371,8 @@ unset ac_cv_header_ft2build_h
+
+ if test x"$grub_mkfont_excuse" = x ; then
+ # Check for freetype libraries.
+- freetype_cflags=`$FREETYPE --cflags`
+- freetype_libs=`$FREETYPE --libs`
++ freetype_cflags=`pkg-config freetype2 --cflags`
++ freetype_libs=`pkg-config freetype2 --libs`
+ SAVED_CPPFLAGS="$CPPFLAGS"
+ SAVED_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $freetype_cflags"
+@@ -1432,8 +1432,8 @@ fi
+
+ if test x"$grub_build_mkfont_excuse" = x ; then
+ # Check for freetype libraries.
+- build_freetype_cflags=`$BUILD_FREETYPE --cflags`
+- build_freetype_libs=`$BUILD_FREETYPE --libs`
++ build_freetype_cflags=`pkg-config freetype2 --cflags`
++ build_freetype_libs=`pkg-config freetype2 --libs`
+ SAVED_CPPFLAGS_2="$CPPFLAGS"
+ SAVED_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $build_freetype_cflags"
+@@ -1488,7 +1488,7 @@ fi
if test x"$starfield_excuse" = x; then
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
@@ -9,7 +31,7 @@
if test -f "$dir/DejaVuSans.$ext"; then
DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
break 2
-@@ -1481,7 +1481,7 @@ AC_SUBST([DJVU_FONT_SOURCE])
+@@ -1510,7 +1510,7 @@ AC_SUBST([DJVU_FONT_SOURCE])
FONT_SOURCE=
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do