From owner-svn-ports-head@FreeBSD.ORG Wed Aug 22 21:55:55 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 93984106566B; Wed, 22 Aug 2012 21:55:55 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 650138FC0C; Wed, 22 Aug 2012 21:55:55 +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 q7MLttb1004351; Wed, 22 Aug 2012 21:55:55 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7MLttxX004348; Wed, 22 Aug 2012 21:55:55 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201208222155.q7MLttxX004348@svn.freebsd.org> From: Raphael Kubo da Costa Date: Wed, 22 Aug 2012 21:55:55 +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: r302968 - in head/textproc/liblrdf: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2012 21:55:55 -0000 Author: rakuco Date: Wed Aug 22 21:55:54 2012 New Revision: 302968 URL: http://svn.freebsd.org/changeset/ports/302968 Log: Make the port build if textproc/raptor is installed. Both textproc/raptor and textproc/raptor2 provide a raptor.h header; the former puts it in ${LOCALBASE}/include, whereas the latter puts it into ${LOCALBASE}/include/raptor2. The way CPPFLAGS and LDFLAGS were changed so far, -I${LOCALBASE}/include was passed to the compiler before -I${LOCALBASE}/include/raptor2, so the raptor1 headers were picked up and the build failed. The fix is consists of several separate adjustments: - The port only depends on raptor2 (and obtains the required compiler and linker flags via pkg-config) and optionally on OpenSSL from ports in case one has installed it. We thus need USE_OPENSSL and OPENSSLINC/OPENSSLLIB. - Due to the other the CFLAGS are defined in the port's configure.ac, we need to make raptor2's CFLAGS be passed before the rest, so -I${LOCALBASE}/include/raptor2 is passed to the compiler before other paths such as the infamous ${LOCALBASE}/include. - We need to change CFLAGS instead of CPPFLAGS, otherwise the OpenSSL CFLAGS still come before the actual CFLAGS and the problem persists. Added: head/textproc/liblrdf/files/ head/textproc/liblrdf/files/patch-configure.ac (contents, props changed) Modified: head/textproc/liblrdf/Makefile Modified: head/textproc/liblrdf/Makefile ============================================================================== --- head/textproc/liblrdf/Makefile Wed Aug 22 21:42:37 2012 (r302967) +++ head/textproc/liblrdf/Makefile Wed Aug 22 21:55:54 2012 (r302968) @@ -23,9 +23,10 @@ GNU_CONFIGURE= yes USE_GNOME= gnomehack GNOME_MAKEFILEIN= Makefile.am USE_LDCONFIG= yes +USE_OPENSSL= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${OPENSSLINC} ${PTHREAD_CFLAGS} +LDFLAGS+= -L${OPENSSLLIB} ${PTHREAD_LIBS} WRKSRC= ${WRKDIR}/swh-LRDF-7ebc032 Added: head/textproc/liblrdf/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/liblrdf/files/patch-configure.ac Wed Aug 22 21:55:54 2012 (r302968) @@ -0,0 +1,13 @@ +--- configure.ac~ 2012-08-22 17:58:12.000000000 -0300 ++++ configure.ac 2012-08-22 17:58:36.000000000 -0300 +@@ -34,8 +34,8 @@ + AC_FUNC_VPRINTF + AC_CHECK_FUNCS([getcwd strcasecmp strchr strdup strerror strncasecmp strrchr]) + +-LIBS="$LIBS $RAPTOR_LIBS" +-AM_CFLAGS="$CFLAGS $RAPTOR_CFLAGS" ++LIBS="$RAPTOR_LIBS $LIBS" ++AM_CFLAGS="$RAPTOR_CFLAGS $CFLAGS" + + AC_SUBST(AM_CFLAGS) + AC_SUBST(LIBS)