View | Details | Raw Unified | Return to bug 252124 | Differences between
and this patch

Collapse All | Expand All

(-)dmalloc-new/Makefile (-13 / +14 lines)
Lines 2-46 Link Here
2
# $FreeBSD: head/devel/dmalloc/Makefile 513602 2019-10-02 18:49:27Z antoine $
2
# $FreeBSD: head/devel/dmalloc/Makefile 513602 2019-10-02 18:49:27Z antoine $
3
3
4
PORTNAME=	dmalloc
4
PORTNAME=	dmalloc
5
PORTVERSION=	5.5.2
5
DISTVERSION=	5.6.5
6
PORTREVISION=	1
7
CATEGORIES=	devel
6
CATEGORIES=	devel
8
# Version 5.5.2 is only available at this URL
9
MASTER_SITES=	http://dmalloc.com/releases/
7
MASTER_SITES=	http://dmalloc.com/releases/
10
EXTRACT_SUFX=	.tgz
11
8
12
MAINTAINER=	mjl@luckie.org.nz
9
MAINTAINER=	mjl@luckie.org.nz
13
COMMENT=	Portable debug memory allocation library
10
COMMENT=	Portable debug memory allocation library
14
11
12
LICENSE=	ISCL
13
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
14
15
USES=		tar:tgz
16
USE_LDCONFIG=	yes
17
15
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
16
CONFIGURE_ARGS=	--enable-threads --enable-shlib
17
GNU_CONFIGURE_PREFIX=	"${STAGEDIR}${PREFIX}"
19
GNU_CONFIGURE_PREFIX=	"${STAGEDIR}${PREFIX}"
20
CONFIGURE_ARGS=	--enable-threads --enable-shlib
18
CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL_DATA}"
21
CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL_DATA}"
19
CFLAGS=		-fPIC
20
USE_LDCONFIG=	yes
21
MAKE_JOBS_UNSAFE=	yes
22
22
23
MAKE_JOBS_UNSAFE=	yes
23
ALL_TARGET=	all heavy
24
ALL_TARGET=	all heavy
24
INSTALL_TARGET=	install
25
INSTALL_TARGET=	install
25
26
27
CFLAGS+=	-fPIC
28
26
OPTIONS_DEFINE=	DOCS
29
OPTIONS_DEFINE=	DOCS
27
30
28
DOCS_INSTALL_TARGET=	installdocs
31
DOCS_INSTALL_TARGET=	installdocs
32
DOCS_BUILD_DEPENDS=	makeinfo:print/texinfo \
33
		texi2html:textproc/texi2html
34
DOCS_INFO=	dmalloc
29
35
30
post-install:
36
post-install:
31
	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/dmalloc
32
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmalloc
37
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmalloc
33
	@(cd ${STAGEDIR}${PREFIX}/lib; \
38
	@(cd ${STAGEDIR}${PREFIX}/lib; \
34
		${CHMOD} 644 libdmalloc.so.1; \
35
		${STRIP_CMD} libdmalloc.so.1; \
39
		${STRIP_CMD} libdmalloc.so.1; \
36
		${LN} -sf libdmalloc.so.1 libdmalloc.so; \
40
		${LN} -sf libdmalloc.so.1 libdmalloc.so; \
37
		${CHMOD} 644 libdmallocxx.so.1; \
38
		${STRIP_CMD} libdmallocxx.so.1; \
41
		${STRIP_CMD} libdmallocxx.so.1; \
39
		${LN} -sf libdmallocxx.so.1 libdmallocxx.so; \
42
		${LN} -sf libdmallocxx.so.1 libdmallocxx.so; \
40
		${CHMOD} 644 libdmallocth.so.1; \
41
		${STRIP_CMD} libdmallocth.so.1; \
43
		${STRIP_CMD} libdmallocth.so.1; \
42
		${LN} -sf libdmallocth.so.1 libdmallocth.so; \
44
		${LN} -sf libdmallocth.so.1 libdmallocth.so; \
43
		${CHMOD} 644 libdmallocthcxx.so.1; \
44
		${STRIP_CMD} libdmallocthcxx.so.1; \
45
		${STRIP_CMD} libdmallocthcxx.so.1; \
45
		${LN} -sf libdmallocthcxx.so.1 libdmallocthcxx.so)
46
		${LN} -sf libdmallocthcxx.so.1 libdmallocthcxx.so)
46
47
(-)dmalloc-new/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (dmalloc-5.5.2.tgz) = d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a
1
TIMESTAMP = 1613355201
2
SIZE (dmalloc-5.5.2.tgz) = 666608
2
SHA256 (dmalloc-5.6.5.tgz) = 480e3414ab6cedca837721c756b7d64b01a84d2d0e837378d98444e2f63a7c01
3
SIZE (dmalloc-5.6.5.tgz) = 322310
(-)dmalloc-new/files/patch-Makefile.in (-42 / +38 lines)
Lines 1-7 Link Here
1
--- Makefile.in.orig	2007-05-14 10:26:14.000000000 -0700
1
--- Makefile.in.orig	2020-12-28 20:55:00 UTC
2
+++ Makefile.in	2019-06-11 15:24:34.190572000 -0700
2
+++ Makefile.in
3
@@ -41,7 +41,7 @@ LIBRARY	= lib$(MODULE).a
3
@@ -14,6 +14,7 @@ bindir = @bindir@
4
 libdir = @libdir@
5
 shlibdir = @shlibdir@
6
 includedir = @includedir@
7
+infodir = @infodir@
8
 docdir = $(prefix)/share/doc/$(MODULE)
4
 
9
 
10
 # default c-compiler
11
@@ -42,7 +43,7 @@ LIBRARY	= lib$(MODULE).a
12
 
5
 # thread version of the library
13
 # thread version of the library
6
 LIB_TH	= lib$(MODULE)th.a
14
 LIB_TH	= lib$(MODULE)th.a
7
-LIB_TH_SL = lib$(MODULE)th.@shlibext@
15
-LIB_TH_SL = lib$(MODULE)th.@shlibext@
Lines 9-15 Link Here
9
 @TH_ON@BUILD_ALL_1 = threads
17
 @TH_ON@BUILD_ALL_1 = threads
10
 @TH_ON@INSTALL_LIB_1 = installth
18
 @TH_ON@INSTALL_LIB_1 = installth
11
 @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
19
 @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
12
@@ -51,7 +51,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@
20
@@ -52,7 +53,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@
13
 
21
 
14
 # C++ version of the library
22
 # C++ version of the library
15
 LIB_CXX	= lib$(MODULE)xx.a
23
 LIB_CXX	= lib$(MODULE)xx.a
Lines 18-24 Link Here
18
 @CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
26
 @CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
19
 @CXX_ON@INSTALL_LIB_3 = installcxx
27
 @CXX_ON@INSTALL_LIB_3 = installcxx
20
 @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
28
 @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
21
@@ -61,7 +61,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
29
@@ -62,7 +63,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
22
 
30
 
23
 # threads + C++
31
 # threads + C++
24
 LIB_TH_CXX = lib$(MODULE)thcxx.a
32
 LIB_TH_CXX = lib$(MODULE)thcxx.a
Lines 27-33 Link Here
27
 @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
35
 @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
28
 @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
36
 @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
29
 @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
37
 @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
30
@@ -76,7 +76,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
38
@@ -77,7 +78,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
31
 @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
39
 @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
32
 
40
 
33
 # shared versions of the libraries
41
 # shared versions of the libraries
Lines 36-42 Link Here
36
 @SL_ON@BUILD_ALL_7 = $(LIB_SL)
44
 @SL_ON@BUILD_ALL_7 = $(LIB_SL)
37
 @SL_ON@INSTALL_LIB_7 = installsl
45
 @SL_ON@INSTALL_LIB_7 = installsl
38
 @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
46
 @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
39
@@ -218,7 +218,6 @@ installsl : $(LIB_SL)
47
@@ -226,7 +227,6 @@ installsl : $(LIB_SL)
40
 installlib : $(INSTALL_LIB)
48
 installlib : $(INSTALL_LIB)
41
 	$(srcdir)/mkinstalldirs $(libdir)
49
 	$(srcdir)/mkinstalldirs $(libdir)
42
 	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
50
 	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
Lines 44-97 Link Here
44
 @SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
52
 @SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
45
 @CXX_OFF@	@echo "Enter 'make installcxx' to install the C++ library"
53
 @CXX_OFF@	@echo "Enter 'make installcxx' to install the C++ library"
46
 @TH_OFF@	@echo "Enter 'make installth' to install thread library"
54
 @TH_OFF@	@echo "Enter 'make installth' to install thread library"
47
@@ -257,7 +256,7 @@ shlib : $(BUILD_SL)
55
@@ -236,7 +236,7 @@ installdocs : $(INSTALL_FILE2) $(HTML_FILE2) $(INFO_FI
48
 # via: http://256.com/gray/email.html
56
 	$(srcdir)/mkinstalldirs $(docdir)
49
 $(LIB_SL) : $(LIBRARY)
57
 	$(INSTALL_DATA) $(INSTALL_FILE2) $(docdir)/$(INSTALL_FILE)
50
 	rm -f $@ $@.t
58
 	$(INSTALL_DATA) $(HTML_FILE2) $(docdir)/$(HTML_FILE)
51
-	@shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
59
-	$(INSTALL_DATA) $(INFO_FILE) $(docdir)
52
+	@shlinkargs@ $(LIBRARY)
60
+	$(INSTALL_DATA) $(INFO_FILE) $(infodir)
53
 	mv $@.t $@
54
 
61
 
55
 $(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
62
 install : installincs installlib $(UTIL)
56
@@ -270,7 +269,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)
63
 	$(srcdir)/mkinstalldirs $(bindir)
64
@@ -259,13 +259,13 @@ dmalloc.h : $(srcdir)/dmalloc.h.1 dmalloc.h.2 $(srcdir
57
 
65
 
58
 $(LIB_TH_SL) : $(LIB_TH)
66
 $(INFO_FILE) : $(srcdir)/$(TEXI_FILE)
59
 	rm -f $@ $@.t
67
 	rm -f $@ $@.t
60
-	@shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)
68
-	makeinfo -o $@.t --fill-column=100 --no-split $<
61
+	@shlinkargs@ $(LIB_TH)
69
+	makeinfo -o $@.t --fill-column=100 --no-split $(srcdir)/$(TEXI_FILE)
62
 	mv $@.t $@
70
 	mv $@.t $@
63
 
71
 
64
 $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
72
 # we need the FILE2 this because make gets confused by ../dmalloc.html
65
@@ -279,7 +278,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
73
 $(HTML_FILE) $(HTML_FILE2) : $(srcdir)/$(TEXI_FILE)
66
 
67
 $(LIB_CXX_SL) : $(LIB_CXX)
68
 	rm -f $@ $@.t
74
 	rm -f $@ $@.t
69
-	@shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
75
-	texi2html --output=$@.t -number -monolithic $<
70
+	@shlinkargs@ $(LIB_CXX)
76
+	texi2html --output=$@.t $(srcdir)/$(TEXI_FILE)
71
 	mv $@.t $@
77
 	mv $@.t $@
72
 
78
 
73
 $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
79
 # we need the FILE2 this because make gets confused by ../INSTALL.txt
74
@@ -288,7 +287,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
80
@@ -353,8 +353,7 @@ utils : $(UTIL)
75
 
81
 
76
 $(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
82
 $(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o append.o
77
 	rm -f $@ $@.t
78
-	@shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
79
+	@shlinkargs@ $(LIB_TH_CXX)
80
 	mv $@.t $@
81
 
82
 threadssl : $(LIB_TH_SL)
83
@@ -311,9 +310,8 @@ utils : $(UTIL)
84
 
85
 $(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o
86
 	rm -f $@
83
 	rm -f $@
87
-	$(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o \
84
-	$(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
88
+	$(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o \
89
 		$(LIBS)
90
-	mv $(A_OUT) $@
85
-	mv $(A_OUT) $@
86
+	$(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
91
 
87
 
92
 # special _th versions of objects with the LOCK_THREADS variable defined to 1
88
 # special _th versions of objects with the LOCK_THREADS variable defined to 1
93
 chunk_th.o : $(srcdir)/chunk.c
89
 chunk_th.o : $(srcdir)/chunk.c
94
@@ -335,13 +333,11 @@ tests : $(TEST) $(TEST_FC)
90
@@ -373,13 +372,11 @@ tests : $(TEST) $(TEST_FC)
95
 
91
 
96
 $(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)
92
 $(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)
97
 	rm -f $@
93
 	rm -f $@
Lines 105-109 Link Here
105
-	mv $(A_OUT) $@
101
-	mv $(A_OUT) $@
106
+	$(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
102
+	$(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
107
 
103
 
108
 check light : $(TEST) $(TEST_FC)
104
 check : $(TEST) $(TEST_FC)
109
 	./$(TEST_FC) -s
105
 	./$(TEST_FC) -s
(-)dmalloc-new/files/patch-configure (-5 / +5 lines)
Lines 1-11 Link Here
1
--- configure	2007-07-06 20:01:39.000000000 +0300
1
--- configure.orig	2020-12-28 20:55:00 UTC
2
+++ configure_new	2007-07-06 16:59:48.000000000 +0300
2
+++ configure
3
@@ -2643,7 +2643,7 @@
3
@@ -3500,7 +3500,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4
 
4
 
5
 
5
 
6
 # see if we actually have a CXX program
6
 # see if we actually have a CXX program
7
-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then
7
-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then
8
+if test "$CXX" = ""; then
8
+if test "$CXX" = ""; then
9
     { echo "$as_me:$LINENO: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5
9
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5
10
 echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;}
10
 $as_echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;}
11
     enable_cxx=no
11
     enable_cxx=no
(-)dmalloc-new/files/patch-settings.dist (+11 lines)
Line 0 Link Here
1
--- settings.dist.orig	2020-12-28 20:55:00 UTC
2
+++ settings.dist
3
@@ -76,7 +76,7 @@
4
  * generate an exception when it sees a free(0L).
5
  */
6
 #define ALLOW_FREE_NULL 1
7
-#define ALLOW_FREE_NULL_MESSAGE 1
8
+#define ALLOW_FREE_NULL_MESSAGE 0
9
 
10
 /*
11
  * Should we use the ra-address macros in return.h.  These are system
(-)dmalloc-new/pkg-plist (-3 / +2 lines)
Lines 1-4 Link Here
1
bin/dmalloc
1
@(,,755) bin/dmalloc
2
include/dmalloc.h
2
include/dmalloc.h
3
lib/libdmalloc.a
3
lib/libdmalloc.a
4
lib/libdmalloc.so
4
lib/libdmalloc.so
Lines 13-17 Link Here
13
lib/libdmallocxx.so
13
lib/libdmallocxx.so
14
lib/libdmallocxx.so.1
14
lib/libdmallocxx.so.1
15
%%PORTDOCS%%%%DOCSDIR%%/dmalloc.html
15
%%PORTDOCS%%%%DOCSDIR%%/dmalloc.html
16
%%PORTDOCS%%%%DOCSDIR%%/dmalloc.pdf
16
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
17
%%PORTDOCS%%%%DOCSDIR%%/dmalloc.texi

Return to bug 252124