Updates to 5.2.1.

PR:		54345
Submitted by:	Sean C. Farley <sean-freebsd@farley.org>
Approved by:	maintainer timeout

3 files changed, 23 insertions, 29 deletions

diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile
index cda4f582adc7..5634cf088005 100644
--- a/devel/dmalloc/Makefile
+++ b/devel/dmalloc/Makefile
@@ -5,48 +5,38 @@
 # $FreeBSD$
 
 PORTNAME=	dmalloc
-PORTVERSION=	4.8.1
+PORTVERSION=	5.2.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dmalloc
 EXTRACT_SUFX=	.tgz
 
-# Original from: Gray Watson http://256.com/gray/email.html
 MAINTAINER=	jeremy@external.org
 COMMENT=	Portable debug memory allocation library
 
-INSTALLS_SHLIB=	YES
-GNU_CONFIGURE=	YES
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS+=--enable-threads --enable-shlib
+CONFIGURE_ARGS=	--enable-threads --enable-shlib
 
-# NOTE: we make the test program first because otherwise it screws up
-# and tried to use the .so instead of the .a for some stupid reason
-ALL_TARGET=	dmalloc_t all light
+ALL_TARGET=	all heavy
+INSTALL_TARGET=	install
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET+=installdocs installinfo
+.endif
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dmalloc ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/dmalloc.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/libdmallocthcxx.so ${PREFIX}/lib/libdmallocthcxx.so.1
-	@${LN} -sf ${PREFIX}/lib/libdmallocthcxx.so.1 ${PREFIX}/lib/libdmallocthcxx.so
-	${INSTALL_DATA} ${WRKSRC}/libdmallocthcxx.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libdmallocth.so ${PREFIX}/lib/libdmallocth.so.1
-	@${LN} -sf ${PREFIX}/lib/libdmallocth.so.1 ${PREFIX}/lib/libdmallocth.so
-	${INSTALL_DATA} ${WRKSRC}/libdmallocth.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libdmalloc.so ${PREFIX}/lib/libdmalloc.so.1
-	@${LN} -sf ${PREFIX}/lib/libdmalloc.so.1 ${PREFIX}/lib/libdmalloc.so
-	${INSTALL_DATA} ${WRKSRC}/libdmalloc.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libdmalloclp.a ${PREFIX}/lib
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/dmalloc
-	${INSTALL_DATA} ${WRKSRC}/dmalloc.html ${PREFIX}/share/doc/dmalloc
-.endif
+	@${REINPLACE_CMD} -e 's|\.so|\.so.1|' ${WRKSRC}/Makefile.in
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/dmalloc.info ${PREFIX}/info
+	@(cd ${PREFIX}/lib; \
+		${LN} -sf ${PREFIX}/lib/libdmalloc.so.1 ${PREFIX}/lib/libdmalloc.so; \
+		${LN} -sf ${PREFIX}/lib/libdmallocxx.so.1 ${PREFIX}/lib/libdmallocxx.so; \
+		${LN} -sf ${PREFIX}/lib/libdmallocth.so.1 ${PREFIX}/lib/libdmallocth.so; \
+		${LN} -sf ${PREFIX}/lib/libdmallocthcxx.so.1 ${PREFIX}/lib/libdmallocthcxx.so)
+.if !defined(NOPORTDOCS)
 	@install-info ${PREFIX}/info/dmalloc.info ${PREFIX}/info/dir
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/dmalloc/distinfo b/devel/dmalloc/distinfo
index a25535459982..d02f4aaa8f4f 100644
--- a/devel/dmalloc/distinfo
+++ b/devel/dmalloc/distinfo
@@ -1 +1 @@
-MD5 (dmalloc-4.8.1.tgz) = 730a802f991f4ca293a02bccaa3cf031
+MD5 (dmalloc-5.2.1.tgz) = 09aa52c5f7217c9e0837a67942f87bba
diff --git a/devel/dmalloc/pkg-plist b/devel/dmalloc/pkg-plist
index db0731190d8a..85949ab8e272 100644
--- a/devel/dmalloc/pkg-plist
+++ b/devel/dmalloc/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/dmalloc
 include/dmalloc.h
 @unexec install-info --delete %D/info/dmalloc.info %D/info/dir
@@ -6,12 +7,15 @@ info/dmalloc.info
 lib/libdmalloc.a
 lib/libdmalloc.so
 lib/libdmalloc.so.1
-lib/libdmalloclp.a
 lib/libdmallocth.a
 lib/libdmallocth.so
 lib/libdmallocth.so.1
 lib/libdmallocthcxx.a
 lib/libdmallocthcxx.so
 lib/libdmallocthcxx.so.1
+lib/libdmallocxx.a
+lib/libdmallocxx.so
+lib/libdmallocxx.so.1
 share/doc/dmalloc/dmalloc.html
+share/doc/dmalloc/dmalloc.texi
 @dirrm share/doc/dmalloc