Attachment 222502 Details for Bug 252124 – update devel/dmalloc to 5.6.5

[patch] update devel/dmalloc to 5.6.5

patch-dmalloc-5.6.5 (text/plain), 9.37 KB, created by mjl on 2021-02-16 20:40:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mjl

Created: 2021-02-16 20:40:58 UTC

Size: 9.37 KB

patch

obsolete

>diff -uNr dmalloc/Makefile dmalloc-new/Makefile
>--- dmalloc/Makefile	2019-10-03 07:49:27.000000000 +1300
>+++ dmalloc-new/Makefile	2021-02-17 09:23:16.299491000 +1300
>@@ -2,45 +2,45 @@
> # $FreeBSD: head/devel/dmalloc/Makefile 513602 2019-10-02 18:49:27Z antoine $
> 
> PORTNAME=	dmalloc
>-PORTVERSION=	5.5.2
>-PORTREVISION=	1
>+DISTVERSION=	5.6.5
> 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
>+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
>+
>+USES=		tar:tgz
>+USE_LDCONFIG=	yes
>+
>+INFO=		dmalloc
>+
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-threads --enable-shlib
> GNU_CONFIGURE_PREFIX=	"${STAGEDIR}${PREFIX}"
>+CONFIGURE_ARGS=	--enable-threads --enable-shlib
> CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL_DATA}"
>-CFLAGS=		-fPIC
>-USE_LDCONFIG=	yes
>-MAKE_JOBS_UNSAFE=	yes
> 
>+MAKE_JOBS_UNSAFE=	yes
> ALL_TARGET=	all heavy
> INSTALL_TARGET=	install
> 
>+CFLAGS+=	-fPIC
>+
> OPTIONS_DEFINE=	DOCS
> 
> DOCS_INSTALL_TARGET=	installdocs
> 
> post-install:
>-	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/dmalloc
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmalloc
> 	@(cd ${STAGEDIR}${PREFIX}/lib; \
>-		${CHMOD} 644 libdmalloc.so.1; \
> 		${STRIP_CMD} libdmalloc.so.1; \
> 		${LN} -sf libdmalloc.so.1 libdmalloc.so; \
>-		${CHMOD} 644 libdmallocxx.so.1; \
> 		${STRIP_CMD} libdmallocxx.so.1; \
> 		${LN} -sf libdmallocxx.so.1 libdmallocxx.so; \
>-		${CHMOD} 644 libdmallocth.so.1; \
> 		${STRIP_CMD} libdmallocth.so.1; \
> 		${LN} -sf libdmallocth.so.1 libdmallocth.so; \
>-		${CHMOD} 644 libdmallocthcxx.so.1; \
> 		${STRIP_CMD} libdmallocthcxx.so.1; \
> 		${LN} -sf libdmallocthcxx.so.1 libdmallocthcxx.so)
> 
>diff -uNr dmalloc/distinfo dmalloc-new/distinfo
>--- dmalloc/distinfo	2014-01-23 04:30:13.000000000 +1300
>+++ dmalloc-new/distinfo	2021-02-15 15:13:21.720068000 +1300
>@@ -1,2 +1,3 @@
>-SHA256 (dmalloc-5.5.2.tgz) = d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a
>-SIZE (dmalloc-5.5.2.tgz) = 666608
>+TIMESTAMP = 1613355201
>+SHA256 (dmalloc-5.6.5.tgz) = 480e3414ab6cedca837721c756b7d64b01a84d2d0e837378d98444e2f63a7c01
>+SIZE (dmalloc-5.6.5.tgz) = 322310
>diff -uNr dmalloc/files/patch-Makefile.in dmalloc-new/files/patch-Makefile.in
>--- dmalloc/files/patch-Makefile.in	2019-06-12 10:30:00.000000000 +1200
>+++ dmalloc-new/files/patch-Makefile.in	2021-02-17 09:31:17.860827000 +1300
>@@ -1,7 +1,15 @@
>---- Makefile.in.orig	2007-05-14 10:26:14.000000000 -0700
>-+++ Makefile.in	2019-06-11 15:24:34.190572000 -0700
>-@@ -41,7 +41,7 @@ LIBRARY	= lib$(MODULE).a
>+--- Makefile.in.orig	2020-12-28 20:55:00 UTC
>++++ Makefile.in
>+@@ -14,6 +14,7 @@ bindir = @bindir@
>+ libdir = @libdir@
>+ shlibdir = @shlibdir@
>+ includedir = @includedir@
>++infodir = @infodir@
>+ docdir = $(prefix)/share/doc/$(MODULE)
>  
>+ # default c-compiler
>+@@ -42,7 +43,7 @@ LIBRARY	= lib$(MODULE).a
>+ 
>  # thread version of the library
>  LIB_TH	= lib$(MODULE)th.a
> -LIB_TH_SL = lib$(MODULE)th.@shlibext@
>@@ -9,7 +17,7 @@
>  @TH_ON@BUILD_ALL_1 = threads
>  @TH_ON@INSTALL_LIB_1 = installth
>  @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
>-@@ -51,7 +51,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@
>+@@ -52,7 +53,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@
>  
>  # C++ version of the library
>  LIB_CXX	= lib$(MODULE)xx.a
>@@ -18,7 +26,7 @@
>  @CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
>  @CXX_ON@INSTALL_LIB_3 = installcxx
>  @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
>-@@ -61,7 +61,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
>+@@ -62,7 +63,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
>  
>  # threads + C++
>  LIB_TH_CXX = lib$(MODULE)thcxx.a
>@@ -27,7 +35,7 @@
>  @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)
>-@@ -76,7 +76,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
>+@@ -77,7 +78,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
>  @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
>  
>  # shared versions of the libraries
>@@ -36,7 +44,7 @@
>  @SL_ON@BUILD_ALL_7 = $(LIB_SL)
>  @SL_ON@INSTALL_LIB_7 = installsl
>  @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
>-@@ -218,7 +218,6 @@ installsl : $(LIB_SL)
>+@@ -226,7 +227,6 @@ installsl : $(LIB_SL)
>  installlib : $(INSTALL_LIB)
>  	$(srcdir)/mkinstalldirs $(libdir)
>  	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
>@@ -44,54 +52,42 @@
>  @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 $@
>+@@ -236,7 +236,7 @@ installdocs : $(INSTALL_FILE2) $(HTML_FILE2) $(INFO_FI
>+ 	$(srcdir)/mkinstalldirs $(docdir)
>+ 	$(INSTALL_DATA) $(INSTALL_FILE2) $(docdir)/$(INSTALL_FILE)
>+ 	$(INSTALL_DATA) $(HTML_FILE2) $(docdir)/$(HTML_FILE)
>+-	$(INSTALL_DATA) $(INFO_FILE) $(docdir)
>++	$(INSTALL_DATA) $(INFO_FILE) $(infodir)
>  
>- $(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
>-@@ -270,7 +269,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)
>+ install : installincs installlib $(UTIL)
>+ 	$(srcdir)/mkinstalldirs $(bindir)
>+@@ -259,13 +259,13 @@ dmalloc.h : $(srcdir)/dmalloc.h.1 dmalloc.h.2 $(srcdir
>  
>- $(LIB_TH_SL) : $(LIB_TH)
>+ $(INFO_FILE) : $(srcdir)/$(TEXI_FILE)
>  	rm -f $@ $@.t
>--	@shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)
>-+	@shlinkargs@ $(LIB_TH)
>+-	makeinfo -o $@.t --fill-column=100 --no-split $<
>++	makeinfo -o $@.t --fill-column=100 --no-split $(srcdir)/$(TEXI_FILE)
>  	mv $@.t $@
>  
>- $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
>-@@ -279,7 +278,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
>- 
>- $(LIB_CXX_SL) : $(LIB_CXX)
>+ # we need the FILE2 this because make gets confused by ../dmalloc.html
>+ $(HTML_FILE) $(HTML_FILE2) : $(srcdir)/$(TEXI_FILE)
>  	rm -f $@ $@.t
>--	@shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
>-+	@shlinkargs@ $(LIB_CXX)
>+-	texi2html --output=$@.t -number -monolithic $<
>++	texi2html --output=$@.t $(srcdir)/$(TEXI_FILE)
>  	mv $@.t $@
>  
>- $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
>-@@ -288,7 +287,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
>+ # we need the FILE2 this because make gets confused by ../INSTALL.txt
>+@@ -353,8 +353,7 @@ utils : $(UTIL)
>  
>- $(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
>+ $(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o append.o
>  	rm -f $@
>--	$(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o \
>-+	$(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o \
>- 		$(LIBS)
>+-	$(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o append.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
>-@@ -335,13 +333,11 @@ tests : $(TEST) $(TEST_FC)
>+@@ -373,13 +372,11 @@ tests : $(TEST) $(TEST_FC)
>  
>  $(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)
>  	rm -f $@
>@@ -105,5 +101,5 @@
> -	mv $(A_OUT) $@
> +	$(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
>  
>- check light : $(TEST) $(TEST_FC)
>+ check : $(TEST) $(TEST_FC)
>  	./$(TEST_FC) -s
>diff -uNr dmalloc/files/patch-configure dmalloc-new/files/patch-configure
>--- dmalloc/files/patch-configure	2014-01-23 06:40:44.000000000 +1300
>+++ dmalloc-new/files/patch-configure	2021-02-15 16:34:15.654123000 +1300
>@@ -1,11 +1,11 @@
>---- configure	2007-07-06 20:01:39.000000000 +0300
>-+++ configure_new	2007-07-06 16:59:48.000000000 +0300
>-@@ -2643,7 +2643,7 @@
>+--- configure.orig	2020-12-28 20:55:00 UTC
>++++ configure
>+@@ -3500,7 +3500,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>  
>  
>  # see if we actually have a CXX program
> -if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then
> +if test "$CXX" = ""; then
>-     { echo "$as_me:$LINENO: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5
>- echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;}
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5
>+ $as_echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;}
>      enable_cxx=no
>diff -uNr dmalloc/files/patch-settings.dist dmalloc-new/files/patch-settings.dist
>--- dmalloc/files/patch-settings.dist	1970-01-01 12:00:00.000000000 +1200
>+++ dmalloc-new/files/patch-settings.dist	2021-02-15 16:34:15.655995000 +1300
>@@ -0,0 +1,11 @@
>+--- settings.dist.orig	2020-12-28 20:55:00 UTC
>++++ settings.dist
>+@@ -76,7 +76,7 @@
>+  * generate an exception when it sees a free(0L).
>+  */
>+ #define ALLOW_FREE_NULL 1
>+-#define ALLOW_FREE_NULL_MESSAGE 1
>++#define ALLOW_FREE_NULL_MESSAGE 0
>+ 
>+ /*
>+  * Should we use the ra-address macros in return.h.  These are system
>diff -uNr dmalloc/pkg-plist dmalloc-new/pkg-plist
>--- dmalloc/pkg-plist	2014-10-27 23:10:58.000000000 +1300
>+++ dmalloc-new/pkg-plist	2021-02-17 09:23:26.570150000 +1300
>@@ -1,4 +1,4 @@
>-bin/dmalloc
>+@(,,755) bin/dmalloc
> include/dmalloc.h
> lib/libdmalloc.a
> lib/libdmalloc.so
>@@ -13,5 +13,4 @@
> lib/libdmallocxx.so
> lib/libdmallocxx.so.1
> %%PORTDOCS%%%%DOCSDIR%%/dmalloc.html
>-%%PORTDOCS%%%%DOCSDIR%%/dmalloc.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/dmalloc.texi
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt

Flags:

mjl: maintainer-approval+

Actions: View | Diff

Attachments on bug 252124: 220906 | 222452 | 222502 | 222533 | 222544