ports/54345: Update port: devel/dmalloc

[Sean C. Farley]

>Number:         54345
>Category:       ports
>Synopsis:       Update port: devel/dmalloc
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 10 15:40:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sean C. Farley
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD thor.farley.org 4.8-STABLE FreeBSD 4.8-STABLE #5: Sat Apr 19 22:17:05 CDT 2003 root at thor.farley.org:/usr/obj/usr/src/sys/THOR i386

>Description:

Updates dmalloc from 4.8.1 to 5.2.1.

>How-To-Repeat:
>Fix:

diff -ru dmalloc.orig/Makefile dmalloc/Makefile
--- dmalloc.orig/Makefile	Fri Feb 21 05:22:29 2003
+++ dmalloc/Makefile	Thu Jul 10 18:01:10 2003
@@ -2,10 +2,10 @@
 # Date created:			7 December 2000
 # Whom:				Jeremy Shaffner <jeremy at external.org>
 #
-# $FreeBSD: ports/devel/dmalloc/Makefile,v 1.5 2003/02/21 11:22:29 knu Exp $
+# $FreeBSD$
 
 PORTNAME=	dmalloc
-PORTVERSION=	4.8.1
+PORTVERSION=	5.2.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dmalloc
@@ -20,33 +20,24 @@
 USE_REINPLACE=	yes
 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 -ru dmalloc.orig/distinfo dmalloc/distinfo
--- dmalloc.orig/distinfo	Mon Dec 25 23:36:52 2000
+++ dmalloc/distinfo	Thu Jul 10 18:01:10 2003
@@ -1 +1 @@
-MD5 (dmalloc-4.8.1.tgz) = 730a802f991f4ca293a02bccaa3cf031
+MD5 (dmalloc-5.2.1.tgz) = 09aa52c5f7217c9e0837a67942f87bba
diff -ru dmalloc.orig/pkg-plist dmalloc/pkg-plist
--- dmalloc.orig/pkg-plist	Mon Dec 25 23:36:52 2000
+++ dmalloc/pkg-plist	Thu Jul 10 18:01:10 2003
@@ -6,12 +6,15 @@
 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
>Release-Note:
>Audit-Trail:
>Unformatted: