View | Details | Raw Unified | Return to bug 252737
Collapse All | Expand All

(-)b/misc/mbuffer/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mbuffer
4
PORTNAME=	mbuffer
5
PORTVERSION=	20200505
5
PORTVERSION=	20200929
6
CATEGORIES=	misc
6
CATEGORIES=	misc
7
MASTER_SITES=	http://www.maier-komor.de/software/mbuffer/
7
MASTER_SITES=	http://www.maier-komor.de/software/mbuffer/
8
8
(-)b/misc/mbuffer/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1588997358
1
TIMESTAMP = 1608187011
2
SHA256 (mbuffer-20200505.tgz) = cc046183149e51814c23b9f83fd748cc1625a88ee128651ea500aa7bd5f01f0b
2
SHA256 (mbuffer-20200929.tgz) = 53a6e3c14e9a049f18a09840653dd84f18e7ec7560f2dcf2b61c0ab5f0ead4e8
3
SIZE (mbuffer-20200505.tgz) = 146020
3
SIZE (mbuffer-20200929.tgz) = 147855
(-)b/misc/mbuffer/files/patch-Makefile.in (-6 / +25 lines)
Lines 1-21 Link Here
1
--- Makefile.in.orig	2019-07-25 21:31:45 UTC
1
--- Makefile.in.orig	2020-09-29 20:57:02 UTC
2
+++ Makefile.in
2
+++ Makefile.in
3
@@ -42,7 +42,7 @@ TAR		= @TAR@
3
@@ -42,26 +42,19 @@ TAR		= @TAR@
4
 
4
 
5
 TARGET		= mbuffer$(EXE)
5
 TARGET		= mbuffer$(EXE)
6
 SOURCES		= log.c network.c mbuffer.c hashing.c input.c common.c settings.c globals.c
6
 SOURCES		= log.c network.c mbuffer.c hashing.c input.c common.c settings.c globals.c
7
-OBJECTS		= $(SOURCES:%.c=build/%.o)
7
-OBJECTS		= $(SOURCES:%.c=build/%.o)
8
-DEPS		= $(SOURCES:%.c=build/%.d)
8
+OBJECTS		= $(SOURCES:.c=.o)
9
+OBJECTS		= $(SOURCES:.c=.o)
9
 
10
 
10
 TESTTREE	= /bin /usr/bin
11
 TESTTREE	= /bin /usr/bin
11
 
12
 
12
@@ -54,9 +54,6 @@ $(OBJECTS): build config.h Makefile
13
 .PHONY: clean all distclean install check testcleanup
14
 
15
-all: $(TARGET) idev.so tapetest.so have-af
16
+all: $(TARGET) idev.so have-af
17
 
18
-$(OBJECTS): config.h Makefile
19
+$(OBJECTS): config.h version.h Makefile
13
 
20
 
14
 build:
21
 build:
15
 	mkdir build
22
 	mkdir build
16
-
23
 
17
-build/%.o: %.c
24
-build/%.o: %.c
18
-	$(CC) $(CFLAGS) -c $< -o $@
25
-	$(CC) $(CFLAGS) -c $< -o $@
26
-
27
-build/%.d: %.c
28
-	$(CC) -MM -MG -MT $(@:%.d=%.o) $(CFLAGS) $< -o $@
29
-
30
 always:
31
 
32
 version.h: always
33
@@ -195,7 +188,3 @@ tapetest.so: tapetest.c config.h
19
 
34
 
20
 $(TARGET): $(OBJECTS)
35
 idev.so: idev.c config.h
21
 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
36
 	$(CC) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
37
-
38
-$(DEPS): | build
39
-
40
-include $(DEPS)
(-)b/misc/mbuffer/files/patch-configure (-121 / +64 lines)
Lines 1-43 Link Here
1
Remove objdump and open/read/write/fstat symbol names check.  objdump
1
Remove objdump symbol names check. objdump is not available on all
2
is not available on all architectures and the symbol names are
2
architectures and the symbol names are unlikely to ever change from
3
unlikely to ever change from their visible names on FreeBSD.
3
their visible names on FreeBSD.
4
4
5
--- configure.orig	2020-05-05 17:31:17 UTC
5
--- configure.orig	2020-09-29 20:57:02 UTC
6
+++ configure
6
+++ configure
7
@@ -625,7 +625,6 @@ LIBOBJS
7
@@ -625,8 +625,6 @@ LIBOBJS
8
 AUTOCONF
8
 AUTOCONF
9
 DEBUG
9
 DEBUG
10
 ALLOCA
10
 ALLOCA
11
-ac_ct_OBJDUMP
11
-OBJDUMP
12
-OBJDUMP
12
 AWK
13
 AWK
13
 TAR
14
 MT
14
 MT
15
@@ -4394,51 +4393,6 @@ $as_echo "no" >&6; }
15
 CP
16
 fi
16
@@ -4649,97 +4647,6 @@ fi
17
 
17
 
18
 
18
 
19
-for ac_prog in objdump gobjdump
19
 
20
-for ac_prog in gobjdump objdump
20
-do
21
-do
21
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
22
-  # Extract the first word of "$target_alias-$ac_prog", so it can be a program name with args.
22
-set dummy $ac_prog; ac_word=$2
23
-set dummy $target_alias-$ac_prog; ac_word=$2
23
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
24
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
24
-$as_echo_n "checking for $ac_word... " >&6; }
25
-$as_echo_n "checking for $ac_word... " >&6; }
25
-if ${ac_cv_path_OBJDUMP+:} false; then :
26
-if ${ac_cv_prog_OBJDUMP+:} false; then :
26
-  $as_echo_n "(cached) " >&6
27
-  $as_echo_n "(cached) " >&6
27
-else
28
-else
28
-  case $OBJDUMP in
29
-  if test -n "$OBJDUMP"; then
29
-  [\\/]* | ?:[\\/]*)
30
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
30
-  ac_cv_path_OBJDUMP="$OBJDUMP" # Let the user override the test with a path.
31
-else
31
-  ;;
32
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
32
-  *)
33
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
34
-for as_dir in $PATH
33
-for as_dir in $PATH
35
-do
34
-do
36
-  IFS=$as_save_IFS
35
-  IFS=$as_save_IFS
37
-  test -z "$as_dir" && as_dir=.
36
-  test -z "$as_dir" && as_dir=.
38
-    for ac_exec_ext in '' $ac_executable_extensions; do
37
-    for ac_exec_ext in '' $ac_executable_extensions; do
39
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
38
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
40
-    ac_cv_path_OBJDUMP="$as_dir/$ac_word$ac_exec_ext"
39
-    ac_cv_prog_OBJDUMP="$target_alias-$ac_prog"
41
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
40
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
42
-    break 2
41
-    break 2
43
-  fi
42
-  fi
Lines 45-54 unlikely to ever change from their visible names on FreeBSD. Link Here
45
-  done
44
-  done
46
-IFS=$as_save_IFS
45
-IFS=$as_save_IFS
47
-
46
-
48
-  ;;
49
-esac
50
-fi
47
-fi
51
-OBJDUMP=$ac_cv_path_OBJDUMP
48
-fi
49
-OBJDUMP=$ac_cv_prog_OBJDUMP
52
-if test -n "$OBJDUMP"; then
50
-if test -n "$OBJDUMP"; then
53
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
51
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
54
-$as_echo "$OBJDUMP" >&6; }
52
-$as_echo "$OBJDUMP" >&6; }
Lines 60-169 unlikely to ever change from their visible names on FreeBSD. Link Here
60
-
58
-
61
-  test -n "$OBJDUMP" && break
59
-  test -n "$OBJDUMP" && break
62
-done
60
-done
63
-
64
 # Check whether --enable-largefile was given.
65
 if test "${enable_largefile+set}" = set; then :
66
   enableval=$enable_largefile;
67
@@ -4653,11 +4607,7 @@ fi
68
 
69
 
70
 
71
-if test -z "$OBJDUMP"; then
61
-if test -z "$OBJDUMP"; then
72
-	as_fn_error $? "unable to find objdump" "$LINENO" 5
62
-  if test "$build" = "$target"; then
73
-fi
63
-    ac_ct_OBJDUMP=$OBJDUMP
74
 
64
-    for ac_prog in gobjdump objdump
75
-
65
-do
76
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable assertions" >&5
66
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
77
 $as_echo_n "checking whether to enable assertions... " >&6; }
67
-set dummy $ac_prog; ac_word=$2
78
   # Check whether --enable-assert was given.
68
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
79
@@ -5673,86 +5623,12 @@ fi
69
-$as_echo_n "checking for $ac_word... " >&6; }
80
 fi
70
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
81
 
71
-  $as_echo_n "(cached) " >&6
82
 
72
-else
83
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking open() and write() to detect libc names" >&5
73
-  if test -n "$ac_ct_OBJDUMP"; then
84
-$as_echo_n "checking linking open() and write() to detect libc names... " >&6; }
74
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
85
-ac_ext=c
75
-else
86
-ac_cpp='$CPP $CPPFLAGS'
76
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
87
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
77
-for as_dir in $PATH
88
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
78
-do
89
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
79
-  IFS=$as_save_IFS
90
-
80
-  test -z "$as_dir" && as_dir=.
91
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
81
-    for ac_exec_ext in '' $ac_executable_extensions; do
92
-/* end confdefs.h.  */
82
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
93
-
83
-    ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
94
-
84
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
95
-		#define _LARGEFILE64_SOURCE
85
-    break 2
96
-		#include <unistd.h>
86
-  fi
97
-		#include <fcntl.h>
87
-done
98
-		#include <sys/stat.h>
88
-  done
99
-		int main(int argc, char **argv) {
89
-IFS=$as_save_IFS
100
-			unsigned x;
101
-			struct stat st;
102
-			open(*argv,O_RDONLY);
103
-			fstat(0,&st);
104
-			read(0,&x,sizeof(x));
105
-			write(1,"null",4);
106
-		}
107
-
108
-_ACEOF
109
-if ac_fn_c_try_link "$LINENO"; then :
110
-
111
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
112
-$as_echo "OK" >&6; }
113
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking name of open() in C library" >&5
114
-$as_echo_n "checking name of open() in C library... " >&6; }
115
-	libc_open=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^open/ { print $NF }'`
116
-
117
 cat >>confdefs.h <<_ACEOF
118
-#define LIBC_OPEN $libc_open
119
+#define LIBC_OPEN open
120
+#define LIBC_READ read
121
+#define LIBC_WRITE write
122
+#define LIBC_FSTAT fstat
123
 _ACEOF
124
-
125
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_open" >&5
126
-$as_echo "$libc_open" >&6; }
127
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking name of read() in C library" >&5
128
-$as_echo_n "checking name of read() in C library... " >&6; }
129
-	libc_read=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^read/ { print $NF }'`
130
-
131
-cat >>confdefs.h <<_ACEOF
132
-#define LIBC_READ $libc_read
133
-_ACEOF
134
-
135
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_read" >&5
136
-$as_echo "$libc_read" >&6; }
137
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking name of write() in C library" >&5
138
-$as_echo_n "checking name of write() in C library... " >&6; }
139
-	libc_write=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^write/ { print $NF }'`
140
-
141
-cat >>confdefs.h <<_ACEOF
142
-#define LIBC_WRITE $libc_write
143
-_ACEOF
144
-
145
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_write" >&5
146
-$as_echo "$libc_write" >&6; }
147
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking name of fstat() in C library" >&5
148
-$as_echo_n "checking name of fstat() in C library... " >&6; }
149
-	libc_fstat=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^fstat/ { print $NF }'`
150
-
90
-
151
-cat >>confdefs.h <<_ACEOF
91
-fi
152
-#define LIBC_FSTAT $libc_fstat
92
-fi
153
-_ACEOF
93
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
94
-if test -n "$ac_ct_OBJDUMP"; then
95
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
96
-$as_echo "$ac_ct_OBJDUMP" >&6; }
97
-else
98
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
99
-$as_echo "no" >&6; }
100
-fi
154
-
101
-
155
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_fstat" >&5
156
-$as_echo "$libc_fstat" >&6; }
157
-
102
-
158
-else
103
-  test -n "$ac_ct_OBJDUMP" && break
159
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
104
-done
160
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
161
-as_fn_error $? "failed to link open/write test
162
-See \`config.log' for more details" "$LINENO" 5; }
163
-
105
-
106
-    OBJDUMP=$ac_ct_OBJDUMP
107
-  else
108
-    OBJDUMP=""
109
-  fi
164
-fi
110
-fi
165
-rm -f core conftest.err conftest.$ac_objext \
166
-    conftest$ac_exeext conftest.$ac_ext
167
 
111
 
168
 
112
 
169
 
113
 
170
- 

Return to bug 252737