From owner-svn-ports-all@FreeBSD.ORG Mon Jul 30 10:29:33 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E126106566B; Mon, 30 Jul 2012 10:29:33 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 08BBE8FC08; Mon, 30 Jul 2012 10:29:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6UATWMh076772; Mon, 30 Jul 2012 10:29:32 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6UATWal076769; Mon, 30 Jul 2012 10:29:32 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201207301029.q6UATWal076769@svn.freebsd.org> From: Emanuel Haupt Date: Mon, 30 Jul 2012 10:29:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301713 - in head/sysutils/logstalgia: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2012 10:29:33 -0000 Author: ehaupt Date: Mon Jul 30 10:29:32 2012 New Revision: 301713 URL: http://svn.freebsd.org/changeset/ports/301713 Log: configure requires ftgl 2.1.3 but we have 2.1.3~rc5 which makes configure fail. Trick configure into thinking to require ftgl 2.0.0. While here use the new PKG_CONFIG macro. Added: head/sysutils/logstalgia/files/patch-configure (contents, props changed) Modified: head/sysutils/logstalgia/Makefile Modified: head/sysutils/logstalgia/Makefile ============================================================================== --- head/sysutils/logstalgia/Makefile Mon Jul 30 08:30:17 2012 (r301712) +++ head/sysutils/logstalgia/Makefile Mon Jul 30 10:29:32 2012 (r301713) @@ -22,8 +22,11 @@ LIB_DEPENDS= ftgl:${PORTSDIR}/graphics/f pcre.1:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_SDL= sdl image +CFLAGS+= -L/usr/local/lib -I/usr/local/include + MANCOMPRESSED= yes MAKE_JOBS_SAFE= yes Added: head/sysutils/logstalgia/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logstalgia/files/patch-configure Mon Jul 30 10:29:32 2012 (r301713) @@ -0,0 +1,57 @@ +--- ./configure.orig 2012-07-30 12:15:02.000000000 +0200 ++++ ./configure 2012-07-30 12:16:02.000000000 +0200 +@@ -6658,12 +6658,12 @@ + pkg_cv_FTGL_CFLAGS="$FTGL_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ftgl >= 2.1.3\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "ftgl >= 2.1.3") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ftgl >= 2.0.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "ftgl >= 2.0.0") 2>&5 + 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` ++ pkg_cv_FTGL_CFLAGS=`$PKG_CONFIG --cflags "ftgl >= 2.0.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -6676,12 +6676,12 @@ + pkg_cv_FTGL_LIBS="$FTGL_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ftgl >= 2.1.3\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "ftgl >= 2.1.3") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ftgl >= 2.0.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "ftgl >= 2.0.0") 2>&5 + 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` ++ pkg_cv_FTGL_LIBS=`$PKG_CONFIG --libs "ftgl >= 2.0.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -6700,18 +6700,18 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- FTGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ftgl >= 2.1.3"` ++ FTGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ftgl >= 2.0.0"` + else +- FTGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ftgl >= 2.1.3"` ++ FTGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ftgl >= 2.0.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$FTGL_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- as_fn_error $? "FTGL 2.1.3 or greater is required. Please see INSTALL" "$LINENO" 5 ++ as_fn_error $? "FTGL 2.0.0 or greater is required. Please see INSTALL" "$LINENO" 5 + elif test $pkg_failed = untried; then +- as_fn_error $? "FTGL 2.1.3 or greater is required. Please see INSTALL" "$LINENO" 5 ++ as_fn_error $? "FTGL 2.0.0 or greater is required. Please see INSTALL" "$LINENO" 5 + else + FTGL_CFLAGS=$pkg_cv_FTGL_CFLAGS + FTGL_LIBS=$pkg_cv_FTGL_LIBS