Date: Wed, 17 Aug 2016 02:00:51 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420314 - in head/sysutils/syslog-ng-devel: . files Message-ID: <201608170200.u7H20pRO082379@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Wed Aug 17 02:00:51 2016 New Revision: 420314 URL: https://svnweb.freebsd.org/changeset/ports/420314 Log: Now apply the correct patch to files/patch-configure. Modified: head/sysutils/syslog-ng-devel/Makefile head/sysutils/syslog-ng-devel/files/patch-configure Modified: head/sysutils/syslog-ng-devel/Makefile ============================================================================== --- head/sysutils/syslog-ng-devel/Makefile Wed Aug 17 01:59:41 2016 (r420313) +++ head/sysutils/syslog-ng-devel/Makefile Wed Aug 17 02:00:51 2016 (r420314) @@ -4,7 +4,7 @@ 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. Modified: head/sysutils/syslog-ng-devel/files/patch-configure ============================================================================== --- head/sysutils/syslog-ng-devel/files/patch-configure Wed Aug 17 01:59:41 2016 (r420313) +++ head/sysutils/syslog-ng-devel/files/patch-configure Wed Aug 17 02:00:51 2016 (r420314) @@ -1,6 +1,6 @@ ---- 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 @@ -9,61 +9,15 @@ 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; } @@ -72,7 +26,7 @@ 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 @@ -84,7 +38,7 @@ 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 @@ -93,7 +47,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608170200.u7H20pRO082379>