Attachment #220906 for bug #252124




# $FreeBSD: head/devel/dmalloc/Makefile 513602 2019-10-02 18:49:27Z antoine $

PORTNAME=	dmalloc
PORTVERSION=	5.6.4
PORTREVISION=	1
CATEGORIES=	devel
# Version 5.5.2 is only available at this URL
MASTER_SITES=	http://dmalloc.com/releases/
EXTRACT_SUFX=	.tgz

MAINTAINER=	mjl@luckie.org.nz
COMMENT=	Portable debug memory allocation library

LICENSE=	ISCL

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-threads --enable-shlib
GNU_CONFIGURE_PREFIX=	"${STAGEDIR}${PREFIX}"
CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL_DATA}"
CFLAGS=		-fPIC
USES=		tar:tgz
USE_LDCONFIG=	yes
MAKE_JOBS_UNSAFE=	yes


Lines 1-2 Link Here

(-)dmalloc-new/distinfo (-2 / +3 lines)
1	SHA256 (dmalloc-5.5.2.tgz) = d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a	1	TIMESTAMP = 1608866872
2	SIZE (dmalloc-5.5.2.tgz) = 666608	2	SHA256 (dmalloc-5.6.4.tgz) = be790d71e6a0046312ea899c3f14f00c899c6b37868602f49531bc0fd474d274
		3	SIZE (dmalloc-5.6.4.tgz) = 320579




--- Makefile.in.orig	2020-12-25 06:51:42.000000000 +1300
+++ Makefile.in	2020-12-25 18:56:35.672326000 +1300
@@ -43,7 +43,7 @@
 
 # thread version of the library
 LIB_TH	= lib$(MODULE)th.a

 @TH_ON@BUILD_ALL_1 = threads
 @TH_ON@INSTALL_LIB_1 = installth
 @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
@@ -53,7 +53,7 @@
 
 # C++ version of the library
 LIB_CXX	= lib$(MODULE)xx.a

 @CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
 @CXX_ON@INSTALL_LIB_3 = installcxx
 @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
@@ -63,7 +63,7 @@
 
 # threads + C++
 LIB_TH_CXX = lib$(MODULE)thcxx.a

 @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
 @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
 @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
@@ -78,7 +78,7 @@
 @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
 
 # shared versions of the libraries

 @SL_ON@BUILD_ALL_7 = $(LIB_SL)
 @SL_ON@INSTALL_LIB_7 = installsl
 @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
@@ -222,12 +222,11 @@
 installlib : $(INSTALL_LIB)
 	$(srcdir)/mkinstalldirs $(libdir)
 	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)

 @SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
 @CXX_OFF@	@echo "Enter 'make installcxx' to install the C++ library"
 @TH_OFF@	@echo "Enter 'make installth' to install thread library"
@@ -257,7 +256,7 @@ shlib : $(BUILD_SL)
 # via: http://256.com/gray/email.html
 $(LIB_SL) : $(LIBRARY)
 	rm -f $@ $@.t
-	@shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
+	@shlinkargs@ $(LIBRARY)
 	mv $@.t $@
 
-installdocs : $(srcdir)/$(HTMLFILE) $(srcdir)/$(INFOFILE)
+installdocs : $(srcdir)/$(HTMLFILE) $(INFOFILE)
 	$(srcdir)/mkinstalldirs $(docdir)
 	$(INSTALL_DATA) $(srcdir)/$(HTMLFILE) $(docdir)
 	$(INSTALL_DATA) $(srcdir)/$(INFOFILE) $(docdir)
@@ -253,7 +252,7 @@
 
 $(INFOFILE) : $(srcdir)/dmalloc.texi
 	rm -f $@ $@.t
-	makeinfo -o $@.t --fill-column=100 --no-split $<
+	makeinfo -o $@.t --fill-column=100 --no-split $(srcdir)/dmalloc.texi 
 	mv $@.t $@
 
 INSTALL.txt : $(INFOFILE)
@@ -340,8 +339,7 @@
 
 $(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o append.o
 	rm -f $@ $@.t
-	@shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
+	@shlinkargs@ $(LIB_CXX)
 	mv $@.t $@
 
 $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
@@ -288,7 +287,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
 
 $(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
 	rm -f $@ $@.t
-	@shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
+	@shlinkargs@ $(LIB_TH_CXX)
 	mv $@.t $@
 
 threadssl : $(LIB_TH_SL)
@@ -311,9 +310,8 @@ utils : $(UTIL)
 
 $(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o
 	rm -f $@
-	$(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o \
 		$(LIBS)
-	mv $(A_OUT) $@
+	$(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
 
 # special _th versions of objects with the LOCK_THREADS variable defined to 1
 chunk_th.o : $(srcdir)/chunk.c
@@ -360,13 +358,11 @@
 
 $(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)
 	rm -f $@

-	mv $(A_OUT) $@
+	$(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
 
 check : $(TEST) $(TEST_FC)
 	./$(TEST_FC) -s

Lines 1-11 Link Here

(-)dmalloc-new/files/patch-configure (-5 / +5 lines)
1	--- configure 2007-07-06 20:01:39.000000000 +0300	1	--- configure.orig 2020-11-23 12:01:14.000000000 +1300
2	+++ configure_new 2007-07-06 16:59:48.000000000 +0300	2	+++ configure 2020-11-24 17:49:38.337241000 +1300
3	@@ -2643,7 +2643,7 @@	3	@@ -3490,7 +3490,7 @@
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

Lines 13-17 Link Here

(-)dmalloc-new/pkg-plist (-2 / +1 lines)
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%%/dmalloc.info
17	%%PORTDOCS%%%%DOCSDIR%%/dmalloc.texi

Return to bug 252124

Lines 2-22 Link Here

(-)dmalloc-new/Makefile (-4 / +4 lines)
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	PORTVERSION= 5.6.4
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
15	GNU_CONFIGURE= yes	14	GNU_CONFIGURE= yes
16	CONFIGURE_ARGS= --enable-threads --enable-shlib	15	CONFIGURE_ARGS= --enable-threads --enable-shlib
17	GNU_CONFIGURE_PREFIX= "${STAGEDIR}${PREFIX}"	16	GNU_CONFIGURE_PREFIX= "${STAGEDIR}${PREFIX}"
18	CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_DATA}"	17	CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_DATA}"
19	CFLAGS= -fPIC	18	CFLAGS= -fPIC
		19	USES= tar:tgz
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21	MAKE_JOBS_UNSAFE= yes	21	MAKE_JOBS_UNSAFE= yes
22		22

Lines 1-6 Link Here

(-)dmalloc-new/files/patch-Makefile.in (-45 / +23 lines)
1	--- Makefile.in.orig 2007-05-14 10:26:14.000000000 -0700	1	--- Makefile.in.orig 2020-12-25 06:51:42.000000000 +1300
2	+++ Makefile.in 2019-06-11 15:24:34.190572000 -0700	2	+++ Makefile.in 2020-12-25 18:56:35.672326000 +1300
3	@@ -41,7 +41,7 @@ LIBRARY = lib$(MODULE).a	3	@@ -43,7 +43,7 @@
4		4
5	# thread version of the library	5	# thread version of the library
6	LIB_TH = lib$(MODULE)th.a	6	LIB_TH = lib$(MODULE)th.a
Lines 9-15 Link Here
9	@TH_ON@BUILD_ALL_1 = threads	9	@TH_ON@BUILD_ALL_1 = threads
10	@TH_ON@INSTALL_LIB_1 = installth	10	@TH_ON@INSTALL_LIB_1 = installth
11	@SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)	11	@SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
12	@@ -51,7 +51,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@	12	@@ -53,7 +53,7 @@
13		13
14	# C++ version of the library	14	# C++ version of the library
15	LIB_CXX = lib$(MODULE)xx.a	15	LIB_CXX = lib$(MODULE)xx.a
Lines 18-24 Link Here
18	@CXX_ON@BUILD_ALL_3 = $(LIB_CXX)	18	@CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
19	@CXX_ON@INSTALL_LIB_3 = installcxx	19	@CXX_ON@INSTALL_LIB_3 = installcxx
20	@SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)	20	@SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
21	@@ -61,7 +61,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@	21	@@ -63,7 +63,7 @@
22		22
23	# threads + C++	23	# threads + C++
24	LIB_TH_CXX = lib$(MODULE)thcxx.a	24	LIB_TH_CXX = lib$(MODULE)thcxx.a
Lines 27-33 Link Here
27	@TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)	27	@TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
28	@TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx	28	@TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
29	@TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)	29	@TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
30	@@ -76,7 +76,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@	30	@@ -78,7 +78,7 @@
31	@CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl	31	@CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
32		32
33	# shared versions of the libraries	33	# shared versions of the libraries
Lines 36-42 Link Here
36	@SL_ON@BUILD_ALL_7 = $(LIB_SL)	36	@SL_ON@BUILD_ALL_7 = $(LIB_SL)
37	@SL_ON@INSTALL_LIB_7 = installsl	37	@SL_ON@INSTALL_LIB_7 = installsl
38	@SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)	38	@SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
39	@@ -218,7 +218,6 @@ installsl : $(LIB_SL)	39	@@ -222,12 +222,11 @@
40	installlib : $(INSTALL_LIB)	40	installlib : $(INSTALL_LIB)
41	$(srcdir)/mkinstalldirs $(libdir)	41	$(srcdir)/mkinstalldirs $(libdir)
42	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)	42	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
Lines 44-97 Link Here
44	@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"	44	@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
45	@CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library"	45	@CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library"
46	@TH_OFF@ @echo "Enter 'make installth' to install thread library"	46	@TH_OFF@ @echo "Enter 'make installth' to install thread library"
47	@@ -257,7 +256,7 @@ shlib : $(BUILD_SL)
48	# via: http://256.com/gray/email.html
49	$(LIB_SL) : $(LIBRARY)
50	rm -f $@ $@.t
51	- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
52	+ @shlinkargs@ $(LIBRARY)
53	mv $@.t $@
54		47
55	$(LIBRARY) : $(OBJS) $(NORMAL_OBJS)	48	-installdocs : $(srcdir)/$(HTMLFILE) $(srcdir)/$(INFOFILE)
56	@@ -270,7 +269,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)	49	+installdocs : $(srcdir)/$(HTMLFILE) $(INFOFILE)
		50	$(srcdir)/mkinstalldirs $(docdir)
		51	$(INSTALL_DATA) $(srcdir)/$(HTMLFILE) $(docdir)
		52	$(INSTALL_DATA) $(srcdir)/$(INFOFILE) $(docdir)
		53	@@ -253,7 +252,7 @@
57		54
58	$(LIB_TH_SL) : $(LIB_TH)	55	$(INFOFILE) : $(srcdir)/dmalloc.texi
59	rm -f $@ $@.t	56	rm -f $@ $@.t
60	- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)	57	- makeinfo -o $@.t --fill-column=100 --no-split $<
61	+ @shlinkargs@ $(LIB_TH)	58	+ makeinfo -o $@.t --fill-column=100 --no-split $(srcdir)/dmalloc.texi
62	mv $@.t $@	59	mv $@.t $@
63		60
64	$(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)	61	INSTALL.txt : $(INFOFILE)
65	@@ -279,7 +278,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)	62	@@ -340,8 +339,7 @@
66		63
67	$(LIB_CXX_SL) : $(LIB_CXX)	64	$(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o append.o
68	rm -f $@ $@.t
69	- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
70	+ @shlinkargs@ $(LIB_CXX)
71	mv $@.t $@
72
73	$(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
74	@@ -288,7 +287,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
75
76	$(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
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 $@	65	rm -f $@
87	- $(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o \	66	- $(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) $@	67	- mv $(A_OUT) $@
		68	+ $(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
91		69
92	# special _th versions of objects with the LOCK_THREADS variable defined to 1	70	# special _th versions of objects with the LOCK_THREADS variable defined to 1
93	chunk_th.o : $(srcdir)/chunk.c	71	chunk_th.o : $(srcdir)/chunk.c
94	@@ -335,13 +333,11 @@ tests : $(TEST) $(TEST_FC)	72	@@ -360,13 +358,11 @@
95		73
96	$(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)	74	$(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)
97	rm -f $@	75	rm -f $@
Lines 105-109 Link Here
105	- mv $(A_OUT) $@	83	- mv $(A_OUT) $@
106	+ $(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)	84	+ $(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
107		85
108	check light : $(TEST) $(TEST_FC)	86	check : $(TEST) $(TEST_FC)
109	./$(TEST_FC) -s	87	./$(TEST_FC) -s