diff -uNr dmalloc/Makefile dmalloc-new/Makefile --- dmalloc/Makefile 2019-10-03 07:49:27.000000000 +1300 +++ dmalloc-new/Makefile 2020-12-25 19:14:55.199450000 +1300 @@ -2,21 +2,21 @@ # $FreeBSD: head/devel/dmalloc/Makefile 513602 2019-10-02 18:49:27Z antoine $ PORTNAME= dmalloc -PORTVERSION= 5.5.2 -PORTREVISION= 1 +PORTVERSION= 5.6.4 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 diff -uNr dmalloc/distinfo dmalloc-new/distinfo --- dmalloc/distinfo 2014-01-23 04:30:13.000000000 +1300 +++ dmalloc-new/distinfo 2020-12-25 16:27:52.135449000 +1300 @@ -1,2 +1,3 @@ -SHA256 (dmalloc-5.5.2.tgz) = d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a -SIZE (dmalloc-5.5.2.tgz) = 666608 +TIMESTAMP = 1608866872 +SHA256 (dmalloc-5.6.4.tgz) = be790d71e6a0046312ea899c3f14f00c899c6b37868602f49531bc0fd474d274 +SIZE (dmalloc-5.6.4.tgz) = 320579 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 2020-12-25 18:57:46.555614000 +1300 @@ -1,6 +1,6 @@ ---- 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-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 @@ -9,7 +9,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@ +@@ -53,7 +53,7 @@ # C++ version of the library LIB_CXX = lib$(MODULE)xx.a @@ -18,7 +18,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@ +@@ -63,7 +63,7 @@ # threads + C++ LIB_TH_CXX = lib$(MODULE)thcxx.a @@ -27,7 +27,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@ +@@ -78,7 +78,7 @@ @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl # shared versions of the libraries @@ -36,7 +36,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) +@@ -222,12 +222,11 @@ installlib : $(INSTALL_LIB) $(srcdir)/mkinstalldirs $(libdir) $(INSTALL_PROGRAM) $(LIBRARY) $(libdir) @@ -44,54 +44,32 @@ @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 $@ - $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) -@@ -270,7 +269,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +-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 @@ - $(LIB_TH_SL) : $(LIB_TH) + $(INFOFILE) : $(srcdir)/dmalloc.texi 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)/dmalloc.texi mv $@.t $@ - $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -@@ -279,7 +278,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) + INSTALL.txt : $(INFOFILE) +@@ -340,8 +339,7 @@ - $(LIB_CXX_SL) : $(LIB_CXX) - 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 + $(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) +@@ -360,13 +358,11 @@ $(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY) rm -f $@ @@ -105,5 +83,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 2020-11-24 17:50:50.484645000 +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-11-23 12:01:14.000000000 +1300 ++++ configure 2020-11-24 17:49:38.337241000 +1300 +@@ -3490,7 +3490,7 @@ # 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/pkg-plist dmalloc-new/pkg-plist --- dmalloc/pkg-plist 2014-10-27 23:10:58.000000000 +1300 +++ dmalloc-new/pkg-plist 2020-12-25 19:03:29.741808000 +1300 @@ -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%%/dmalloc.info