Index: head/devel/gearmand-devel/Makefile =================================================================== --- head/devel/gearmand-devel/Makefile (revision 483473) +++ head/devel/gearmand-devel/Makefile (revision 483474) @@ -1,120 +1,117 @@ # Created by: Gea-Suan Lin # $FreeBSD$ PORTNAME= gearmand PORTVERSION= 1.1.8 PORTREVISION= 14 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/ PKGNAMESUFFIX= -devel MAINTAINER= bdrewery@FreeBSD.org COMMENT= Gearman C Server and Library -BROKEN_sparc64= fails to build: cannot link with boost -BROKEN_powerpc64= fails to build: checking for the Boost program_options library... no - BUILD_DEPENDS= boost-libs>=0:devel/boost-libs \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid CONFLICTS= p5-Gearman-Server-1.* gearmand-1.0.* USERS= gearmand GROUPS= gearmand -USES= pathfix perl5 gmake gperf libtool python:build +USES= compiler:c++11-lang pathfix perl5 gmake gperf libtool python:build USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= gearmand SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} USE_CXXSTD= gnu++98 CONFIGURE_ARGS+=--with-lib-prefix=${LOCALBASE} --with-boost=${LOCALBASE} \ --localstatedir=/var/db/${PORTNAME} --enable-static CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo OPTIONS_DEFINE= DRIZZLE MEMCACHED PGSQL SQLITE MYSQL HIREDIS TOKYOCAB OPTIONS_DEFAULT=SQLITE DRIZZLE_DESC= Drizzle support for persistent queue MEMCACHED_DESC= memcached support for persistent queue MYSQL_DESC= MySQL support for persistent queue PGSQL_DESC= PostgreSQL support for persistent queue SQLITE_DESC= SQLite support for persistent queue HIREDIS_DESC= Hiredis support for persistent queue TOKYOCAB_DESC= Tokyo Cabinet support for persistent queue .include .if ${PORT_OPTIONS:MDRIZZLE} LIB_DEPENDS+= libdrizzleso:databases/libdrizzle CONFIGURE_ARGS+= --enable-libdrizzle .else CONFIGURE_ARGS+= --disable-libdrizzle .endif .if ${PORT_OPTIONS:MMEMCACHED} LIB_DEPENDS+= libmemcached.so:databases/libmemcached BUILD_DEPENDS+= memcached>=0:databases/memcached CONFIGURE_ARGS+= --enable-libmemcached # This hack is required for the test programs invoked by configure, # in the event that libmemcached was compiled with SASL support. .if exists(${LOCALBASE}/lib/libsasl.so) LDFLAGS+= -L${LOCALBASE}/lib -lsasl CONFIGURE_ARGS+= --with-memcached-sasl=${LOCALBASE}/bin/memcached .elif exists(${LOCALBASE}/lib/libsasl2.a) LDFLAGS+= -L${LOCALBASE}/lib -lsasl2 CONFIGURE_ARGS+= --with-memcached-sasl=${LOCALBASE}/bin/memcached .else LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-memcached=${LOCALBASE}/bin/memcached .endif .else CONFIGURE_ARGS+= --disable-libmemcached .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=yes .else CONFIGURE_ARGS+= --with-mysql=no .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+= --enable-libpq .else CONFIGURE_ARGS+= --disable-libpq .endif .if ${PORT_OPTIONS:MSQLITE} BUILD_DEPENDS+= sqlite3>=3.0.0:databases/sqlite3 LIB_DEPENDS+= libsqlite3.so:databases/sqlite3 CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} .else CONFIGURE_ARGS+= --without-sqlite3 .endif .if ${PORT_OPTIONS:MTOKYOCAB} LIB_DEPENDS+= libtokyocabinet.so:databases/tokyocabinet CONFIGURE_ARGS+= --enable-libtokyocabinet CONFIGURE_ENV+= LIBTOKYOCABINET_CPPFLAGS=-I${LOCALBASE}/include \ LIBTOKYOCABINET_LDFLAGS=-L${LOCALBASE}/lib .else CONFIGURE_ARGS+= --disable-libtokyocabinet .endif .if ${PORT_OPTIONS:MHIREDIS} LIB_DEPENDS+= libhiredis.so:databases/hiredis CONFIGURE_ARGS+= --enable-hires CONFIGURE_ENV+= LIBHIREDIS_CPPFLAGS=-I${LOCALBASE}/include/hiredis \ LIBHIREDIS_LDFLAGS=-L${LOCALBASE}/lib .else CONFIGURE_ARGS+= --disable-hires .endif .include Index: head/devel/gearmand-devel/files/patch-configure =================================================================== --- head/devel/gearmand-devel/files/patch-configure (revision 483473) +++ head/devel/gearmand-devel/files/patch-configure (revision 483474) @@ -1,40 +1,52 @@ ---- ./configure.orig 2013-06-06 19:06:29.000000000 -0400 -+++ ./configure 2013-07-17 14:33:54.000000000 -0400 -@@ -17976,7 +17976,7 @@ +--- configure.orig 2013-06-06 23:06:29 UTC ++++ configure +@@ -16844,11 +16844,6 @@ fi + $as_echo "$boost_cv_lib_version" >&6; } + # e.g. "134" for 1_34_1 or "135" for 1_35 + boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` +- case $boost_major_version in #( +- '' | *[!0-9]*) +- as_fn_error $? "invalid value: boost_major_version=$boost_major_version" "$LINENO" 5 +- ;; +- esac + fi + CPPFLAGS=$boost_save_CPPFLAGS + +@@ -17976,7 +17971,7 @@ fi done test -n "$CURL_CONFIG" || CURL_CONFIG="no" - if test "$CURL_CONFIG" == "no"; then : + if test "$CURL_CONFIG" = "no"; then : : -@@ -17986,7 +17986,7 @@ +@@ -17986,7 +17981,7 @@ $as_echo "#define HAVE_LIBCURL 0" >>confdefs.h else - if test x"" == x; then : + if test x"" = x; then : CURL_CFLAGS="`$CURL_CONFIG $curl_config_args --cflags`" -@@ -17996,7 +17996,7 @@ +@@ -17996,7 +17991,7 @@ else fi - if test x"" == x; then : + if test x"" = x; then : CURL_LIBS="`$CURL_CONFIG $curl_config_args --libs`" -@@ -23954,8 +23954,8 @@ +@@ -23954,8 +23949,8 @@ else LIBS="$PTHREAD_LIBS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS -Werror conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS -Werror $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext