Update to 3.8.0 beta2.

Unbreak: Resolve aclocal not found.

Add reminder to use updated version numbering scheme next release.

Update Notified by:	Peter Czanik (CzP) <peter.czanik@balabit.com>
			Balabit / syslog-ng upstream

4 files changed, 14 insertions, 119 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 8aa198225109..cdb6fe32a625 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -2,21 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.8.0b1
-PORTREVISION=	1
+# XXX Should be: PORTVERSION=	3.8.0.b2
+# XXX update at 3.8.1.
+PORTVERSION=	3.8.0b2
 PKGNAMESUFFIX=	-devel
 CATEGORIES=	sysutils
+# XXX Should be: DISTVERSION=	${PORTVERSION:S/.a/alpha/:S/.b/beta/:S/.r/rc/}
+# XXX update at 3.8.1.
 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}/
-PATCH_SITES=	https://patch-diff.githubusercontent.com/raw/balabit/syslog-ng/pull/
-PATCHFILES=	1141.patch:-p1
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
 BROKEN_powerpc64=	Does not build
-BROKEN=		does not build
 
 LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
 		libpcre.so:devel/pcre
@@ -40,7 +40,7 @@ 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=		gmake libtool pathfix pkgconfig ssl
+USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
@@ -123,7 +123,7 @@ CONFIGURE_ARGS+=        --disable-json
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
-BROKEN=			As per upstream, JAVA option is currently broken.
+BROKEN=			Unsupported maven downloads.
 CONFIGURE_ARGS+=	--enable-java
 USE_JAVA=	yes
 BUILD_DEPENDS+=		gradle:devel/gradle
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index 942ff0edab73..d21ced18867e 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1470798383
-SHA256 (syslog-ng-3.8.0beta1.tar.gz) = 462d4386c2a596d4687d9a6913e04dcd56ac4f392c5082bc523db4d80448d865
-SIZE (syslog-ng-3.8.0beta1.tar.gz) = 8462353
-SHA256 (1141.patch) = 370ac6a00d2fca67fbe1558e728c98c68f9a21ff6e66255a8d9f1573a9575a3d
-SIZE (1141.patch) = 8050
+TIMESTAMP = 1470856945
+SHA256 (syslog-ng-3.8.0beta2.tar.gz) = 1c0c1b49c3adac1dd1d890524c9d2025a0f85344ec6707dd7d3bd8adc0a72fe7
+SIZE (syslog-ng-3.8.0beta2.tar.gz) = 8325034
diff --git a/sysutils/syslog-ng-devel/files/patch-configure b/sysutils/syslog-ng-devel/files/patch-configure
deleted file mode 100644
index 7a9c97a5a1cd..000000000000
--- a/sysutils/syslog-ng-devel/files/patch-configure
+++ /dev/null
@@ -1,104 +0,0 @@
---- configure.orig	2016-07-28 04:37:01.000000000 -0700
-+++ configure	2016-08-09 20:31:51.087322000 -0700
-@@ -10483,7 +10483,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
-   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'
-       need_version=no
-       need_lib_prefix=no
-@@ -13493,7 +13493,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 @@
- { $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 @@
-       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 @@
-       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" \) \
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index bf24e2c507c5..fdce6b3091d0 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -54,6 +54,7 @@ include/syslog-ng/logmsg/gsockaddr-serialize.h
 include/syslog-ng/logmsg/logmsg.h
 include/syslog-ng/logmsg/serialization.h
 include/syslog-ng/logmsg/logmsg-serialize.h
+include/syslog-ng/logmsg/logmsg-serialize-fixup.h
 include/syslog-ng/logmsg/nvtable.h
 include/syslog-ng/logmsg/nvtable-serialize.h
 include/syslog-ng/logmsg/nvtable-serialize-endianutils.h
@@ -208,9 +209,6 @@ lib/libsyslog-ng-3.8.so.0.0.0
 lib/libsyslog-ng-3.8.so.0
 lib/libsyslog-ng.so
 lib/libsyslog-ng-native-connector.a
-lib/pkgconfig/syslog-ng.pc
-lib/pkgconfig/syslog-ng-test.pc
-lib/pkgconfig/syslog-ng-native-connector.pc
 lib/syslog-ng/libtest/libsyslog-ng-test.a
 lib/syslog-ng/libsyslogformat.so
 lib/syslog-ng/libadd-contextual-data.so
@@ -235,6 +233,9 @@ lib/syslog-ng/libafstomp.so
 lib/syslog-ng/libpseudofile.so
 lib/syslog-ng/libgraphite.so
 lib/syslog-ng/libkvformat.so
+libdata/pkgconfig/syslog-ng.pc
+libdata/pkgconfig/syslog-ng-test.pc
+libdata/pkgconfig/syslog-ng-native-connector.pc
 man/man1/loggen.1.gz
 man/man1/pdbtool.1.gz
 man/man1/syslog-ng-ctl.1.gz