- Update to 5.5.2

- Pass maintainership to submitter

PR:		114435
Submitted by:	Petar Zhivkov Petrov <pesho.petrov@gmail.com>

5 files changed, 59 insertions, 12 deletions

diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile
index aebc0e828089..47d3f7905327 100644
--- a/devel/dmalloc/Makefile
+++ b/devel/dmalloc/Makefile
@@ -5,13 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	dmalloc
-PORTVERSION=	5.4.2
+PORTVERSION=	5.5.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	dmalloc
+# Version 5.5.2 is only available at this URL
+MASTER_SITES=	http://dmalloc.com/releases/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pesho.petrov@gmail.com
 COMMENT=	Portable debug memory allocation library
 
 GNU_CONFIGURE=	yes
@@ -23,15 +23,12 @@ USE_LDCONFIG=	yes
 ALL_TARGET=	all heavy
 INSTALL_TARGET=	install
 
-INFO=	dmalloc
-
 .if !defined(NOPORTDOCS)
-INSTALL_TARGET+=installdocs installinfo
+INSTALL_TARGET+=installdocs
 .endif
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|\.so|\.so.1|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|\.@shlibext@|\.@shlibext@.1|' ${WRKSRC}/Makefile.in
 
 post-install:
 	@(cd ${PREFIX}/lib; \
diff --git a/devel/dmalloc/distinfo b/devel/dmalloc/distinfo
index b2e7254a4095..0189f34489dc 100644
--- a/devel/dmalloc/distinfo
+++ b/devel/dmalloc/distinfo
@@ -1,3 +1,3 @@
-MD5 (dmalloc-5.4.2.tgz) = ca8d9d72351679e20b8eff96a7a16bf3
-SHA256 (dmalloc-5.4.2.tgz) = e115674be6c8efd503c1c2d68513c9f1686abdf25b520738ee6949e14a702829
-SIZE (dmalloc-5.4.2.tgz) = 371228
+MD5 (dmalloc-5.5.2.tgz) = f92e5606c23a8092f3d5694e8d1c932e
+SHA256 (dmalloc-5.5.2.tgz) = d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a
+SIZE (dmalloc-5.5.2.tgz) = 666608
diff --git a/devel/dmalloc/files/patch-Makefile.in b/devel/dmalloc/files/patch-Makefile.in
new file mode 100644
index 000000000000..cdd59f1838ce
--- /dev/null
+++ b/devel/dmalloc/files/patch-Makefile.in
@@ -0,0 +1,38 @@
+--- Makefile.in	Fri Jul  6 19:20:21 2007
++++ Makefile.in.new	Fri Jul  6 19:20:46 2007
+@@ -257,7 +257,7 @@
+ # 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 +270,7 @@
+ 
+ $(LIB_TH_SL) : $(LIB_TH)
+ 	rm -f $@ $@.t
+-	@shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)
++	@shlinkargs@ $(LIB_TH)
+ 	mv $@.t $@
+ 
+ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
+@@ -279,7 +279,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 +288,7 @@
+ 
+ $(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)
diff --git a/devel/dmalloc/files/patch-configure b/devel/dmalloc/files/patch-configure
new file mode 100644
index 000000000000..11a7b3d973bb
--- /dev/null
+++ b/devel/dmalloc/files/patch-configure
@@ -0,0 +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 @@
+ 
+ 
+ # 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;}
+     enable_cxx=no
diff --git a/devel/dmalloc/pkg-plist b/devel/dmalloc/pkg-plist
index 73dfbdd1a405..65e4e11c6b90 100644
--- a/devel/dmalloc/pkg-plist
+++ b/devel/dmalloc/pkg-plist
@@ -14,5 +14,6 @@ lib/libdmallocxx.a
 lib/libdmallocxx.so
 lib/libdmallocxx.so.1
 %%PORTDOCS%%%%DOCSDIR%%/dmalloc.html
+%%PORTDOCS%%%%DOCSDIR%%/dmalloc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/dmalloc.texi
 %%PORTDOCS%%@dirrm %%DOCSDIR%%