Date: Wed, 20 Aug 2014 14:30:59 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365465 - in head/security/razorback-api: . files Message-ID: <201408201430.s7KEUxfD035887@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Wed Aug 20 14:30:58 2014 New Revision: 365465 URL: http://svnweb.freebsd.org/changeset/ports/365465 QAT: https://qat.redports.org/buildarchive/r365465/ Log: Fix build, broken in the json-c 0.12 upgrade. Given the nature of the errors there are likely other ports that will fail in similar ways. (i.e. libjson.so->libjson-c.so, and json/json.h -> json-c/json.h). While here, use OPTIONS helpers to avoid unnecessary bsd.port.options.mk inclusion. Added: head/security/razorback-api/files/patch-common_m4__api_deps.m4 (contents, props changed) head/security/razorback-api/files/patch-common_m4__compiler_options.m4 (contents, props changed) head/security/razorback-api/files/patch-include__razorback__json_buffer.h (contents, props changed) Modified: head/security/razorback-api/Makefile Modified: head/security/razorback-api/Makefile ============================================================================== --- head/security/razorback-api/Makefile Wed Aug 20 14:23:14 2014 (r365464) +++ head/security/razorback-api/Makefile Wed Aug 20 14:30:58 2014 (r365465) @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libconfig.so:${PORTSDIR}/devel/libconfig \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ libcurl.so:${PORTSDIR}/ftp/curl \ - libjson.so:${PORTSDIR}/devel/json-c + libjson-c.so:${PORTSDIR}/devel/json-c OPTIONS_DEFINE= DEBUG ASSERT CNC_DEBUG STOMP_DEBUG @@ -27,31 +27,15 @@ STOMP_DEBUG_DESC= Enable STOMP Debug GNU_CONFIGURE= yes USES= libtool pathfix pkgconfig USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib BROKEN_sparc64= Does not compile on sparc64 -.include <bsd.port.options.mk> - -.if !empty(PORT_OPTIONS:MDEBUG) -CONFIGURE_ARGS+=--enable-debug -.endif - -.if !empty(PORT_OPTIONS:MASSERT) -CONFIGURE_ARGS+=--enable-assert -.endif - -.if !empty(PORT_OPTIONS:MCNC_DEBUG) -CONFIGURE_ARGS+=--enable-cnc-debug -.endif - -.if !empty(PORT_OPTIONS:MSTOMP_DEBUG) -CONFIGURE_ARGS+=--enable-stomp-debug -.endif - -post-patch: - @${REINPLACE_CMD} -e "s/-Werror//g" \ - ${WRKSRC}/configure +DEBUG_CONFIGURE_ENABLE= debug +ASSERT_CONFIGURE_ENABLE= assert +CNC_DEBUG_CONFIGURE_ENABLE= cnc-debug +STOMP_DEBUG_CONFIGURE_ENABLE= stomp-debug .include <bsd.port.mk> Added: head/security/razorback-api/files/patch-common_m4__api_deps.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/razorback-api/files/patch-common_m4__api_deps.m4 Wed Aug 20 14:30:58 2014 (r365465) @@ -0,0 +1,11 @@ +--- ./common_m4/api_deps.m4.orig 2014-08-20 10:21:22.000000000 -0400 ++++ ./common_m4/api_deps.m4 2014-08-20 10:21:36.000000000 -0400 +@@ -55,7 +55,7 @@ + # [AC_MSG_ERROR("curl header file not found")] + # ) + +-PKG_CHECK_MODULES([JSON], [json >= 0.9]) ++PKG_CHECK_MODULES([JSON], [json-c >= 0.9]) + + CFLAGS="$JSON_CFLAGS $CFLAGS" + LIBS="$JSON_LIBS $LIBS" Added: head/security/razorback-api/files/patch-common_m4__compiler_options.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/razorback-api/files/patch-common_m4__compiler_options.m4 Wed Aug 20 14:30:58 2014 (r365465) @@ -0,0 +1,11 @@ +--- ./common_m4/compiler_options.m4.orig 2014-08-20 10:21:07.000000000 -0400 ++++ ./common_m4/compiler_options.m4 2014-08-20 10:21:17.000000000 -0400 +@@ -28,7 +28,7 @@ + + CFLAGS="$CFLAGS -std=c99 -fno-strict-aliasing" + CPPFLAGS="$CPPFLAGS -fno-strict-aliasing" +- CWARNINGS="$CWARNINGS -Wall -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wformat-security -Wsign-compare -Wcast-align -Wno-unused-parameter" ++ CWARNINGS="$CWARNINGS -Wall -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wformat-security -Wsign-compare -Wcast-align -Wno-unused-parameter" + if test "x$NOT_PEDANTIC" = "x"; then + CWARNINGS="$CWARNINGS -pedantic" + fi Added: head/security/razorback-api/files/patch-include__razorback__json_buffer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/razorback-api/files/patch-include__razorback__json_buffer.h Wed Aug 20 14:30:58 2014 (r365465) @@ -0,0 +1,11 @@ +--- ./include/razorback/json_buffer.h.orig 2014-08-20 10:25:03.000000000 -0400 ++++ ./include/razorback/json_buffer.h 2014-08-20 10:25:26.000000000 -0400 +@@ -9,7 +9,7 @@ + #include <razorback/messages.h> + #include <razorback/ntlv.h> + +-#include <json/json.h> ++#include <json-c/json.h> + + #ifdef __cplusplus + extern "C" {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408201430.s7KEUxfD035887>