Index: head/sysutils/syslog-ng-devel/Makefile =================================================================== --- head/sysutils/syslog-ng-devel/Makefile (revision 420313) +++ head/sysutils/syslog-ng-devel/Makefile (revision 420314) @@ -1,185 +1,185 @@ # Created by: Ivan Lago # $FreeBSD$ PORTNAME= syslog-ng # XXX As of 3.8.1beta1, replace PORTVERSION with DISTVERSION=3.8.1beta1 PORTVERSION= 3.8.0b2 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= -devel CATEGORIES= sysutils # XXX As of 3.8.1beta1, delete the following line. DISTVERSION= ${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/} DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ MAINTAINER= cy@FreeBSD.org COMMENT= Powerful syslogd replacement BROKEN_powerpc64= Does not build LIB_DEPENDS= libevtlog.so:sysutils/eventlog \ libpcre.so:devel/pcre \ libcurl.so:ftp/curl \ libuuid.so:misc/e2fsprogs-libuuid CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ syslog-ng-devel-[0-9]* WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON MONGO OPTIONS_DEFAULT= JSON TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support SPOOF_DESC= Build with spoof source support IPV6_DESC= Build with IPV6 support SMTP_DESC= Build with SMTP support JSON_DESC= Build with JSON-C support GEOIP_DESC= Build with GeoIP support REDIS_DESC= Build with Redis support JAVA_DESC= Build with Java support (and modules, like Elastic) PYTHON_DESC= Build with Python 2.7 support USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ gettext-runtime USE_LDCONFIG= yes USE_RC_SUBR= syslog-ng GNU_CONFIGURE= yes USE_GNOME= glib20 SUB_FILES= pkg-message INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking --enable-manpages \ --disable-linux-caps \ --datadir=${PREFIX}/share/ BROKEN_sparc64= Does not compile on sparc64: gcc core dump .include CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" .if ${PORT_OPTIONS:MTCP_WRAPPERS} CONFIGURE_ARGS+= --enable-tcp-wrapper .else CONFIGURE_ARGS+= --disable-tcp-wrapper .endif .if ${PORT_OPTIONS:MSPOOF} LIB_DEPENDS+= libnet.so:net/libnet CONFIGURE_ARGS+= --enable-spoof-source .else CONFIGURE_ARGS+= --disable-spoof-source .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if ${PORT_OPTIONS:MGEOIP} CONFIGURE_ARGS+= --enable-geoip LIB_DEPENDS+= libGeoIP.so:net/GeoIP CONFIGURE_ENV+= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" PLIST_FILES+= lib/syslog-ng/libgeoip-plugin.so .else CONFIGURE_ARGS+= --disable-geoip .endif .if ${PORT_OPTIONS:MREDIS} CONFIGURE_ARGS+= --enable-redis LIB_DEPENDS+= libhiredis.so:databases/hiredis PLIST_FILES+= lib/syslog-ng/libredis.so .else CONFIGURE_ARGS+= --disable-redis .endif .if ${PORT_OPTIONS:MSMTP} CONFIGURE_ARGS+= --with-libesmtp=/usr/local/ LIB_DEPENDS+= libesmtp.so:mail/libesmtp PLIST_FILES+= lib/syslog-ng/libafsmtp.so .else CONFIGURE_ARGS+= --disable-smtp .endif .if ${PORT_OPTIONS:MSQL} LIB_DEPENDS+= libdbi.so:databases/libdbi CONFIGURE_ENV+= LIBDBI_LIBS="-ldbi" CONFIGURE_ARGS+= --enable-sql LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES+= lib/syslog-ng/libafsql.so .else CONFIGURE_ARGS+= --disable-sql .endif .if ${PORT_OPTIONS:MMONGO} BUILD_DEPENDS+= mongo:databases/mongodb RUN_DEPENDS+= mongo:databases/mongodb CONFIGURE_ARGS+= --enable-mongodb PLIST_FILES+= lib/syslog-ng/libafmongodb.so .else CONFIGURE_ARGS+= --disable-mongodb .endif .if ${PORT_OPTIONS:MJSON} LIB_DEPENDS+= libjson-c.so:devel/json-c CONFIGURE_ARGS+= --enable-json PLIST_FILES+= lib/syslog-ng/libjson-plugin.so .else CONFIGURE_ARGS+= --disable-json .endif .if ${PORT_OPTIONS:MJAVA} BROKEN= Unsupported maven downloads. CONFIGURE_ARGS+= --enable-java USE_JAVA= yes BUILD_DEPENDS+= gradle:devel/gradle BUILD_DEPENDS+= bash:shells/bash PLIST_FILES+= lib/syslog-ng/libmod-java.so \ lib/syslog-ng/java-modules/syslog-ng-core.jar \ lib/syslog-ng/java-modules/log4j-1.2.16.jar \ lib/syslog-ng/java-modules/elastic.jar \ lib/syslog-ng/java-modules/http.jar \ lib/syslog-ng/java-modules/kafka.jar \ lib/syslog-ng/java-modules/java-modules.jar \ lib/syslog-ng/java-modules/hdfs.jar \ lib/syslog-ng/java-modules/syslog-ng-common.jar \ lib/syslog-ng/java-modules/dummy.jar .else CONFIGURE_ARGS+= --disable-java .endif .if ${PORT_OPTIONS:MPYTHON} CONFIGURE_ARGS+= --enable-python --with-python=2.7 USES+= python:2.7 PLIST_FILES+= lib/syslog-ng/libmod-python.so .else CONFIGURE_ARGS+= --disable-python .endif post-patch: @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist @${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample post-install: .if ${PORT_OPTIONS:MDOCS} ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS.md ${STAGEDIR}${DOCSDIR} .endif ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/ ${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/ ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \ ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \ ${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ ${STAGEDIR}${PREFIX}/include/syslog-ng/ .include Index: head/sysutils/syslog-ng-devel/files/patch-configure =================================================================== --- head/sysutils/syslog-ng-devel/files/patch-configure (revision 420313) +++ head/sysutils/syslog-ng-devel/files/patch-configure (revision 420314) @@ -1,104 +1,58 @@ ---- configure.orig 2016-07-28 04:37:01.000000000 -0700 -+++ configure 2016-08-09 20:31:51.087322000 -0700 -@@ -10483,7 +10483,7 @@ +--- configure.orig 2016-08-10 07:38:05.000000000 -0700 ++++ configure 2016-08-10 12:33:00.605666000 -0700 +@@ -10250,7 +10250,7 @@ hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no - link_all_deplibs=unknown + link_all_deplibs=no module_cmds= module_expsym_cmds= old_archive_from_new_cmds= -@@ -10785,7 +10785,7 @@ - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - fi - ;; - -@@ -10804,7 +10804,7 @@ - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -10833,7 +10833,7 @@ - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -10851,7 +10851,7 @@ - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -11500,7 +11500,7 @@ - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver' - hardcode_libdir_flag_spec='$wl-rpath,$libdir' - export_dynamic_flag_spec='$wl-E' - else -@@ -12349,7 +12349,7 @@ - version_type=freebsd-$objformat +@@ -11952,6 +11952,7 @@ case $version_type in freebsd-elf*) -- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}${major}' need_version=no need_lib_prefix=no -@@ -13493,7 +13493,7 @@ + ;; +@@ -13035,7 +13036,7 @@ old_striplib= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -15656,9 +15656,9 @@ +@@ -15195,9 +15196,9 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNET" >&5 $as_echo_n "checking for LIBNET... " >&6; } if test "x$with_libnet" = "x"; then - LIBNET_CONFIG="`which libnet-config`" + LIBNET_CONFIG="`which libnet11-config`" else - LIBNET_CONFIG="$with_libnet/libnet-config" + LIBNET_CONFIG="$with_libnet/libnet11-config" fi if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -@@ -16879,7 +16879,7 @@ +@@ -16424,7 +16425,7 @@ if test -e "$JAVA_HOME_CHECKER"; then JNI_HOME=`$JAVA_HOME_CHECKER` else - JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\//"` + JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"` fi JNI_LIBDIR=`find $JNI_HOME \( -name "libjvm.so" -or -name "libjvm.dylib" \) \ -@@ -16980,7 +16980,7 @@ +@@ -16531,7 +16532,7 @@ if test -e "$JAVA_HOME_CHECKER"; then JNI_HOME=`$JAVA_HOME_CHECKER` else - JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\//"` + JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"` fi JNI_LIBDIR=`find $JNI_HOME \( -name "libjvm.so" -or -name "libjvm.dylib" \) \