Update to 2.8.3. files/Makefile modified to add $FreeBSD$ even though it

should not be needed.

PR:		ports/94792
Submitted by:	vd

5 files changed, 30 insertions, 33 deletions

diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile
index 9800fd636eee..a9ba73552851 100644
--- a/devel/libdlmalloc/Makefile
+++ b/devel/libdlmalloc/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	dlmalloc
-PORTVERSION=	2.6.5
+PORTVERSION=	2.8.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://gee.cs.oswego.edu/pub/misc/  \
 		ftp://ftp.netsw.org/system/libs/memory/optimize/
-DISTFILES=	malloc-2.6.5.c
+DISTFILES=	malloc-${PORTVERSION}.c malloc-${PORTVERSION}.h
 
 MAINTAINER=	roberto@FreeBSD.org
 COMMENT=	Small, fast malloc library by Doug Lea
@@ -18,10 +18,14 @@ COMMENT=	Small, fast malloc library by Doug Lea
 NO_WRKSUBDIR=	yes
 INSTALLS_SHLIB=	yes
 
+USE_DOS2UNIX=${DISTFILES}
+
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	${CP} -p ${DISTDIR}/${DISTFILES} ${WRKDIR}
+.for f in ${DISTFILES}
+	${CP} -p ${DISTDIR}/${f} ${WRKDIR}
+.endfor
 	${CP} -p ${FILESDIR}/Makefile ${WRKDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/libdlmalloc/distinfo b/devel/libdlmalloc/distinfo
index f18d3767e758..4615df5c6c78 100644
--- a/devel/libdlmalloc/distinfo
+++ b/devel/libdlmalloc/distinfo
@@ -1,3 +1,6 @@
-MD5 (malloc-2.6.5.c) = 75293b0cf29dfeb964f7007c5992390e
-SHA256 (malloc-2.6.5.c) = ce4e1b0d557082c22e03f38c49a8df57eb27885fd1cbcdb80c3d3d35eafafc68
-SIZE (malloc-2.6.5.c) = 100972
+MD5 (malloc-2.8.3.c) = 5ab95c5c6f3169d4322a0d22f81533cb
+SHA256 (malloc-2.8.3.c) = 3a6f3917a0006ac0eb1a71c05e24fa1b043df9d21d195e462bccb4b443fd639c
+SIZE (malloc-2.8.3.c) = 185082
+MD5 (malloc-2.8.3.h) = 994d1d2003401b9867908194b9373d52
+SHA256 (malloc-2.8.3.h) = df30b9fce0f04301d0e77fcacc73703c123381bbbfe4be4fe4887a09e3024f01
+SIZE (malloc-2.8.3.h) = 19808
diff --git a/devel/libdlmalloc/files/Makefile b/devel/libdlmalloc/files/Makefile
index 8877f49814b6..693c913e0212 100644
--- a/devel/libdlmalloc/files/Makefile
+++ b/devel/libdlmalloc/files/Makefile
@@ -7,24 +7,29 @@
 #  A version of malloc/free/realloc written by Doug Lea and released to the 
 #  public domain. 
 #
-#  preliminary VERSION 2.6.5
+#  preliminary VERSION 2.8.3
 #
 #  working version; unreleased.
 #
+# $FreeBSD$
+#
+
+VER=2.8.3
 
 LIBDIR=${PREFIX}/lib
+INCDIR=${PREFIX}/include/dlmalloc
 
 # for the shared lib stuff
 .if ${PORTOBJFORMAT} == "elf"
-VERSION=2
+VERSION=${VER:R:R}
 .else
-VERSION=2.6
+VERSION=${VER:R}
 .endif
 
 LIBMALLOC=libdlmalloc.a
 LIBSMALLOC=libdlmalloc.so.${VERSION}
 
-SRCS = malloc-2.6.5.c
+SRCS = malloc-${VER}.c
 
 OBJS = $(SRCS:.c=.o)
 SOBJS = $(SRCS:.c=.so)
@@ -61,8 +66,10 @@ clean:
 install:
 	install -c -m 644 ${LIBMALLOC} $(LIBDIR)
 	-$(RANLIB) $(LIBDIR)/${LIBMALLOC}
-	install -c -m 555 ${LIBSMALLOC} $(LIBDIR)
+	install -c -m 444 ${LIBSMALLOC} $(LIBDIR)
 	ln -sf ${LIBSMALLOC} $(LIBDIR)/libdlmalloc.so
+	mkdir -p ${INCDIR}
+	install -c -m 444 malloc-${VER}.h ${INCDIR}/malloc.h
 
 $(OBJS): $(SRCS)
 $(SOBJS): $(SRCS)
diff --git a/devel/libdlmalloc/files/patch-aa b/devel/libdlmalloc/files/patch-aa
index cf8731af6d87..0076baff3cd9 100644
--- a/devel/libdlmalloc/files/patch-aa
+++ b/devel/libdlmalloc/files/patch-aa
@@ -1,15 +1,6 @@
---- malloc-2.6.5.c.orig	Thu Nov 28 06:07:12 1996
-+++ malloc-2.6.5.c	Sun Apr 20 17:25:42 1997
-@@ -221,6 +221,8 @@
- 
- /* Preliminaries */
- 
-+#include <sys/param.h>
-+
- #ifndef __STD_C
- #ifdef __STDC__
- #define __STD_C     1
-@@ -495,7 +497,7 @@
+--- malloc-2.8.3.c.orig	Tue Mar 21 18:15:49 2006
++++ malloc-2.8.3.c	Tue Mar 21 18:19:15 2006
+@@ -1200,7 +1200,7 @@
  #  ifdef _SC_PAGE_SIZE
  #    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
  #  else
@@ -18,13 +9,3 @@
         extern size_t getpagesize();
  #      define malloc_getpagesize getpagesize()
  #    else
-@@ -789,7 +791,9 @@
- #else /* INTERNAL_LINUX_C_LIB */
- 
- #if __STD_C
-+#    if !(defined(BSD) && (BSD >= 199306))
- extern Void_t*     sbrk(ptrdiff_t);
-+#    endif
- #else
- extern Void_t*     sbrk();
- #endif
diff --git a/devel/libdlmalloc/pkg-plist b/devel/libdlmalloc/pkg-plist
index 7f3b86f52a64..19ec8980b7bd 100644
--- a/devel/libdlmalloc/pkg-plist
+++ b/devel/libdlmalloc/pkg-plist
@@ -1,3 +1,5 @@
+include/dlmalloc/malloc.h
 lib/libdlmalloc.a
 lib/libdlmalloc.so
 lib/libdlmalloc.so.2.6
+@dirrm include/dlmalloc