Disable ftgl detection. libcaca doesn't use it, but it break dpb builds.

Bump REVISION.
Reported by and ok nigel@
This commit is contained in:
bcallah 2014-01-15 22:57:44 +00:00
parent 6b80e8e022
commit 7fba8e754b
2 changed files with 28 additions and 5 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.27 2014/01/05 18:39:05 bcallah Exp $
# $OpenBSD: Makefile,v 1.28 2014/01/15 22:57:44 bcallah Exp $
COMMENT= color ascii art library
DISTNAME= libcaca-0.99.beta18
PKGNAME= libcaca-0.99.18
REVISION= 0
SHARED_LIBS += caca 1.1 # .0.99
CATEGORIES= graphics

View File

@ -1,12 +1,34 @@
$OpenBSD: patch-configure,v 1.3 2014/01/05 18:39:05 bcallah Exp $
$OpenBSD: patch-configure,v 1.4 2014/01/15 22:57:44 bcallah Exp $
1. Disable detection of pangoft2.
2. Disable detection of cppunit. (--disable-cppunit is a NOP.)
3. Disable detection of ftgl. (no --disable-ftgl option.)
--- configure.orig Fri Apr 6 16:48:32 2012
+++ configure Sat Jan 4 14:38:01 2014
@@ -18553,7 +18553,7 @@ fi
+++ configure Wed Jan 15 15:16:46 2014
@@ -17412,8 +17412,7 @@ if test -n "$FTGL_CFLAGS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_FTGL_CFLAGS=`$PKG_CONFIG --cflags "ftgl >= 2.1.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+ pkg_failed=untried
else
pkg_failed=yes
fi
@@ -17429,8 +17428,7 @@ if test -n "$FTGL_LIBS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_FTGL_LIBS=`$PKG_CONFIG --libs "ftgl >= 2.1.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+ pkg_failed=untried
else
pkg_failed=yes
fi
@@ -18553,7 +18551,7 @@ fi
# Build development tools?
@ -15,7 +37,7 @@ $OpenBSD: patch-configure,v 1.3 2014/01/05 18:39:05 bcallah Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5
$as_echo_n "checking for PANGOFT2... " >&6; }
@@ -18844,7 +18844,7 @@ fi
@@ -18844,7 +18842,7 @@ fi
# Use cppunit for unit tests?