Date: Wed, 19 May 2021 10:04:40 GMT From: Fukang Chen <loader@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4e5069c63b55 - main - misc/mbuffer: Update to 20210328 Message-ID: <202105191004.14JA4eUa095577@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by loader: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e5069c63b555132431651bee233e971e289bf23 commit 4e5069c63b555132431651bee233e971e289bf23 Author: Fukang Chen <loader@FreeBSD.org> AuthorDate: 2021-05-18 16:03:23 +0000 Commit: Fukang Chen <loader@FreeBSD.org> CommitDate: 2021-05-19 10:03:34 +0000 misc/mbuffer: Update to 20210328 - Update to 20210328 - Switch to USES=autoreconf gmake instead of patching configure and Makefile.in - Take maintainership Reviewed by: koobs Approved by: koobs (ports, mentor, implicit) Differential Revision: https://reviews.freebsd.org/D30338 MFH: No (feature release) --- misc/mbuffer/Makefile | 6 +- misc/mbuffer/distinfo | 6 +- misc/mbuffer/files/patch-Makefile.in | 40 ------------ misc/mbuffer/files/patch-configure | 113 ---------------------------------- misc/mbuffer/files/patch-configure.in | 30 +++++++++ 5 files changed, 36 insertions(+), 159 deletions(-) diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile index 7d92b0353cf5..64370bf34c9f 100644 --- a/misc/mbuffer/Makefile +++ b/misc/mbuffer/Makefile @@ -1,11 +1,11 @@ # Created by: Rong-En Fan <rafan@FreeBSD.org> PORTNAME= mbuffer -PORTVERSION= 20200929 +PORTVERSION= 20210328 CATEGORIES= misc MASTER_SITES= http://www.maier-komor.de/software/mbuffer/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= loader@FreeBSD.org COMMENT= Tool for buffering data streams LICENSE= GPLv3+ @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= gtar:archivers/gtar -USES= localbase ssl tar:tgz +USES= localbase ssl tar:tgz autoreconf gmake GNU_CONFIGURE= yes diff --git a/misc/mbuffer/distinfo b/misc/mbuffer/distinfo index 5320bd81e614..0e17cf6e7703 100644 --- a/misc/mbuffer/distinfo +++ b/misc/mbuffer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608187011 -SHA256 (mbuffer-20200929.tgz) = 53a6e3c14e9a049f18a09840653dd84f18e7ec7560f2dcf2b61c0ab5f0ead4e8 -SIZE (mbuffer-20200929.tgz) = 147855 +TIMESTAMP = 1621234873 +SHA256 (mbuffer-20210328.tgz) = 51b5b8d8488991a55fe1dfce90130f9e47bc1ce286ba03b4f628c04b784fdc5d +SIZE (mbuffer-20210328.tgz) = 148009 diff --git a/misc/mbuffer/files/patch-Makefile.in b/misc/mbuffer/files/patch-Makefile.in deleted file mode 100644 index a93aabeb1d4a..000000000000 --- a/misc/mbuffer/files/patch-Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile.in.orig 2020-09-29 20:57:02 UTC -+++ Makefile.in -@@ -42,26 +42,19 @@ TAR = @TAR@ - - TARGET = mbuffer$(EXE) - SOURCES = log.c network.c mbuffer.c hashing.c input.c common.c settings.c globals.c --OBJECTS = $(SOURCES:%.c=build/%.o) --DEPS = $(SOURCES:%.c=build/%.d) -+OBJECTS = $(SOURCES:.c=.o) - - TESTTREE = /bin /usr/bin - - .PHONY: clean all distclean install check testcleanup - --all: $(TARGET) idev.so tapetest.so have-af -+all: $(TARGET) idev.so have-af - --$(OBJECTS): config.h Makefile -+$(OBJECTS): config.h version.h Makefile - - build: - mkdir build - --build/%.o: %.c -- $(CC) $(CFLAGS) -c $< -o $@ -- --build/%.d: %.c -- $(CC) -MM -MG -MT $(@:%.d=%.o) $(CFLAGS) $< -o $@ -- - always: - - version.h: always -@@ -195,7 +188,3 @@ tapetest.so: tapetest.c config.h - - idev.so: idev.c config.h - $(CC) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS) -- --$(DEPS): | build -- --include $(DEPS) diff --git a/misc/mbuffer/files/patch-configure b/misc/mbuffer/files/patch-configure deleted file mode 100644 index 4f495b69fd94..000000000000 --- a/misc/mbuffer/files/patch-configure +++ /dev/null @@ -1,113 +0,0 @@ -Remove objdump symbol names check. objdump is not available on all -architectures and the symbol names are unlikely to ever change from -their visible names on FreeBSD. - ---- configure.orig 2020-09-29 20:57:02 UTC -+++ configure -@@ -625,8 +625,6 @@ LIBOBJS - AUTOCONF - DEBUG - ALLOCA --ac_ct_OBJDUMP --OBJDUMP - AWK - MT - CP -@@ -4649,97 +4647,6 @@ fi - - - --for ac_prog in gobjdump objdump --do -- # Extract the first word of "$target_alias-$ac_prog", so it can be a program name with args. --set dummy $target_alias-$ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_prog_OBJDUMP+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$OBJDUMP"; then -- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_OBJDUMP="$target_alias-$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- --fi --fi --OBJDUMP=$ac_cv_prog_OBJDUMP --if test -n "$OBJDUMP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 --$as_echo "$OBJDUMP" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- test -n "$OBJDUMP" && break --done --if test -z "$OBJDUMP"; then -- if test "$build" = "$target"; then -- ac_ct_OBJDUMP=$OBJDUMP -- for ac_prog in gobjdump objdump --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_OBJDUMP"; then -- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_OBJDUMP="$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- --fi --fi --ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP --if test -n "$ac_ct_OBJDUMP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 --$as_echo "$ac_ct_OBJDUMP" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- test -n "$ac_ct_OBJDUMP" && break --done -- -- OBJDUMP=$ac_ct_OBJDUMP -- else -- OBJDUMP="" -- fi --fi - - - diff --git a/misc/mbuffer/files/patch-configure.in b/misc/mbuffer/files/patch-configure.in new file mode 100644 index 000000000000..f2104f9de554 --- /dev/null +++ b/misc/mbuffer/files/patch-configure.in @@ -0,0 +1,30 @@ +- AC_PATH_PROG(SH,bash sh) + this only checks whether bash exists in ${PATH}, not sh + AC_PATH_PROGS() is suppose to check for each program in the blank-separated list, + and there is no bash in the FreeBSD base system. + +- AC_CHECK_TARGET_TOOLS(OBJDUMP,gobjdump objdump) + /usr/bin/objdump (the GNU version) was removed from the FreeBSD base system + https://cgit.freebsd.org/src/commit/?id=0ad202f312f6da4f2774ecb7a3f3c2a05b3dde5f + add llvm-objdump to the list for ${OBJDUMP}. + +--- configure.in.orig 2021-01-16 05:20:02 UTC ++++ configure.in +@@ -104,7 +104,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + AC_SUBST(CFLAGS) + + AC_PROG_INSTALL +-AC_PATH_PROG(SH,bash sh) ++AC_PATH_PROG(SH,sh) + AC_PATH_PROG(RM,rm) + AC_PATH_PROG(CP,cp) + AC_PATH_PROG(MT,mt,AC_MSG_WARN(could not find the program mt - you might need this if you want autoloader support)) +@@ -113,7 +113,7 @@ AC_PATH_PROG(AWK,awk) + AC_SYS_LARGEFILE + AC_STRUCT_ST_BLKSIZE + +-AC_CHECK_TARGET_TOOLS(OBJDUMP,gobjdump objdump) ++AC_CHECK_TARGET_TOOLS(OBJDUMP,gobjdump objdump llvm-objdump) + + AC_HEADER_ASSERT + AC_CHECK_LIB(pthread, pthread_mutex_init)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105191004.14JA4eUa095577>