Maintainer update to 2.2.1, obsoleting patch-malloc_hook_mmap_freebsd.h.

PR:		191334
Submitted by:	yuri@rawbw.com (maintainer)

4 files changed, 11 insertions, 71 deletions

diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile
index 4196e69d9156..a3a40d2b8766 100644
--- a/devel/google-perftools/Makefile
+++ b/devel/google-perftools/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	google-perftools
-PORTVERSION=	2.1
-PORTREVISION=	2
+PORTVERSION=	2.2.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES=	https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/ \
 		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	vd/${PORTNAME}
 DISTNAME=	gperftools-${PORTVERSION}
 
 MAINTAINER=	yuri@tsoft.com
diff --git a/devel/google-perftools/distinfo b/devel/google-perftools/distinfo
index 2853536f80d5..08cd080afd55 100644
--- a/devel/google-perftools/distinfo
+++ b/devel/google-perftools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gperftools-2.1.tar.gz) = f3ade29924f89409d8279ab39e00af7420593baa4941c318db42e70ead7e494f
-SIZE (gperftools-2.1.tar.gz) = 1319896
+SHA256 (gperftools-2.2.1.tar.gz) = 56f8f730e56576ad972553bf8467f1c77770f00a6289d3d961ec6f026bf9f313
+SIZE (gperftools-2.2.1.tar.gz) = 1370247
diff --git a/devel/google-perftools/files/patch-malloc_hook_mmap_freebsd.h b/devel/google-perftools/files/patch-malloc_hook_mmap_freebsd.h
deleted file mode 100644
index ed6ba4322843..000000000000
--- a/devel/google-perftools/files/patch-malloc_hook_mmap_freebsd.h
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/malloc_hook_mmap_freebsd.h	2014-01-15 00:52:17.000000000 -0800
-+++ src/malloc_hook_mmap_freebsd.h	2014-01-15 01:12:48.000000000 -0800
-@@ -39,6 +39,7 @@
- #include <sys/syscall.h>
- #include <sys/mman.h>
- #include <errno.h>
-+#include <dlfcn.h>
- 
- // Make sure mmap doesn't get #define'd away by <sys/mman.h>
- #undef mmap
-@@ -73,43 +74,11 @@
- }
- 
- static inline void* do_sbrk(intptr_t increment) {
--  void* curbrk = 0;
-+  static void *(*libc_sbrk)(intptr_t);
-+  if (libc_sbrk == NULL)
-+    libc_sbrk = (void *(*)(intptr_t))dlsym(RTLD_NEXT, "sbrk");
- 
--#if defined(__x86_64__) || defined(__amd64__)
--# ifdef PIC
--  __asm__ __volatile__(
--      "movq .curbrk@GOTPCREL(%%rip), %%rdx;"
--      "movq (%%rdx), %%rax;"
--      "movq %%rax, %0;"
--      : "=r" (curbrk)
--      :: "%rdx", "%rax");
--# else
--  __asm__ __volatile__(
--      "movq .curbrk(%%rip), %%rax;"
--      "movq %%rax, %0;"
--      : "=r" (curbrk)
--      :: "%rax");
--# endif
--#else
--  __asm__ __volatile__(
--      "movl .curbrk, %%eax;"
--      "movl %%eax, %0;"
--      : "=r" (curbrk)
--      :: "%eax");
--#endif
--
--  if (increment == 0) {
--    return curbrk;
--  }
--
--  char* prevbrk = static_cast<char*>(curbrk);
--  void* newbrk = prevbrk + increment;
--
--  if (brk(newbrk) == -1) {
--    return reinterpret_cast<void*>(static_cast<intptr_t>(-1));
--  }
--
--  return prevbrk;
-+  return libc_sbrk(increment);
- }
- 
- 
diff --git a/devel/google-perftools/pkg-plist b/devel/google-perftools/pkg-plist
index 6fd0baeb246f..69d049ee1d27 100644
--- a/devel/google-perftools/pkg-plist
+++ b/devel/google-perftools/pkg-plist
@@ -20,27 +20,27 @@ include/gperftools/tcmalloc.h
 lib/libprofiler.a
 lib/libprofiler.so
 lib/libprofiler.so.0
-lib/libprofiler.so.0.3.2
+lib/libprofiler.so.0.4.1
 lib/libtcmalloc.a
 lib/libtcmalloc.so
 lib/libtcmalloc.so.4
-lib/libtcmalloc.so.4.1.2
+lib/libtcmalloc.so.4.2.2
 lib/libtcmalloc_and_profiler.a
 lib/libtcmalloc_and_profiler.so
 lib/libtcmalloc_and_profiler.so.4
-lib/libtcmalloc_and_profiler.so.4.1.2
+lib/libtcmalloc_and_profiler.so.4.2.2
 lib/libtcmalloc_debug.a
 lib/libtcmalloc_debug.so
 lib/libtcmalloc_debug.so.4
-lib/libtcmalloc_debug.so.4.1.2
+lib/libtcmalloc_debug.so.4.2.2
 lib/libtcmalloc_minimal.a
 lib/libtcmalloc_minimal.so
 lib/libtcmalloc_minimal.so.4
-lib/libtcmalloc_minimal.so.4.1.2
+lib/libtcmalloc_minimal.so.4.2.2
 lib/libtcmalloc_minimal_debug.a
 lib/libtcmalloc_minimal_debug.so
 lib/libtcmalloc_minimal_debug.so.4
-lib/libtcmalloc_minimal_debug.so.4.1.2
+lib/libtcmalloc_minimal_debug.so.4.2.2
 libdata/pkgconfig/libprofiler.pc
 libdata/pkgconfig/libtcmalloc.pc
 libdata/pkgconfig/libtcmalloc_debug.pc
@@ -96,6 +96,6 @@ man/man1/pprof.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/tcmalloc.html
 %%PORTDOCS%%%%DOCSDIR%%/threadheap.dot
 %%PORTDOCS%%%%DOCSDIR%%/threadheap.gif
-@dirrmtry include/gperftools
 @dirrmtry include/google
+@dirrmtry include/gperftools
 %%PORTDOCS%%@dirrm %%DOCSDIR%%