ports/70936: devel/calltree: update to callgrind 0.9.8 (repo-copy)

Simon Barner barner at in.tum.de
Wed Aug 25 11:30:31 UTC 2004 

>Number:         70936
>Category:       ports
>Synopsis:       devel/calltree: update to callgrind 0.9.8 (repo-copy)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 25 11:30:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Simon Barner
>Release:        FreeBSD 5.3-ALPHA i386
>Organization:
>Environment:
FreeBSD zi025.glhnet.mhn.de 5.3-ALPHA FreeBSD 5.3-ALPHA #0: Mon Aug 23 14:34:13
CEST 2004     root at zi025.glhnet.mhn.de:/mnt/fbsd521/usr/src/sys/i386/compile/KIS
TE  i386

>Description:

This PR is a bit large, so here are instructions to the individual patch files:

1. calltree.diff
================
calltree was renamed to callgrind, so devel/calltree needs to be "repo-moved" to
devel/callgrind before applying the patch.

2. valgrind.diff and valgrind-snapshot.diff
===========================================
Callgrind needs a header file from valgrind that currently is not installed by
our FreeBSD ports.

3. kcachegrind.diff
===================
kcachegrind depends on calltree. This patch reflects the name change
as well as it brings the following two changes:
 - a fixed pkg-plist
 - an optional run-time dependency to graphics/graphviz (the dot tool
   is needed to render call graphs).

4. MOVED.diff
=============
Sample entry for portupgrade support file.

>How-To-Repeat:

N/A

>Fix:

--- MOVED.diff begins here ---
--- MOVED.orig	Wed Aug 25 13:10:42 2004
+++ MOVED	Wed Aug 25 13:12:01 2004
@@ -1251,3 +1251,4 @@
 japanese/xdvik-vflib|japanese/xdvik|2004-08-20|renamed
 japanese/dvipsk-vflib|japanese/dvipsk|2004-08-20|no longer maintained
 emulators/vmware_xf4mod||2004-08-20|This module is now part of XFree86 as of 4.1.0
+devel/calltree|devel/callgrind|2004-08-25|renamed by author
--- MOVED.diff ends here ---

--- calltree.diff begins here ---
diff -ruN calltree/Makefile callgrind/Makefile
--- calltree/Makefile	Wed Aug 25 09:56:42 2004
+++ callgrind/Makefile	Wed Aug 25 10:05:26 2004
@@ -1,15 +1,14 @@
-# New ports collection makefile for:	calltree
+# New ports collection makefile for:	callgrind
 # Date created:				Jun 3 2004
 # Whom:					Simon Barner <barner at gmx.de>
 #
 # $FreeBSD: ports/devel/calltree/Makefile,v 1.2 2004/08/02 10:45:40 lofi Exp $
 #
 
-PORTNAME=	calltree
-PORTVERSION=	0.9.7
+PORTNAME=	callgrind
+PORTVERSION=	0.9.8
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	kcachegrind
+MASTER_SITES=	http://kcachegrind.sourceforge.net/
 
 MAINTAINER=	barner at gmx.de
 COMMENT=	Valgrind skin for cache simulation and call tracing
diff -ruN calltree/distinfo callgrind/distinfo
--- calltree/distinfo	Wed Aug 25 09:56:42 2004
+++ callgrind/distinfo	Wed Aug 25 10:05:36 2004
@@ -1,2 +1,2 @@
-MD5 (calltree-0.9.7.tar.gz) = f1bb4e6446f26219cf5772849630b380
-SIZE (calltree-0.9.7.tar.gz) = 156812
+MD5 (callgrind-0.9.8.tar.gz) = 5d98a82128b66a8ad4a931b728db420b
+SIZE (callgrind-0.9.8.tar.gz) = 178524
diff -ruN calltree/files/patch-src::Makefile.in callgrind/files/patch-src::Makefile.in
--- calltree/files/patch-src::Makefile.in	Wed Aug 25 09:56:42 2004
+++ callgrind/files/patch-src::Makefile.in	Wed Aug 25 10:07:43 2004
@@ -1,11 +1,13 @@
---- src/Makefile.in.orig	Thu Jun  3 05:08:28 2004
-+++ src/Makefile.in	Thu Jun  3 05:08:54 2004
-@@ -116,7 +116,7 @@
+--- src/Makefile.in.orig	Thu Aug 19 22:46:55 2004
++++ src/Makefile.in	Wed Aug 25 10:07:20 2004
+@@ -167,8 +167,8 @@
+ target_alias = @target_alias@
  SUBDIRS = .
- 
  AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-- -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
-+ -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@
- 
+- -Winline -Wall -Wshadow -O2 -fomit-frame-pointer \
+- @PREFERRED_STACK_BOUNDARY@ -g
++ -fomit-frame-pointer \
++ @PREFERRED_STACK_BOUNDARY@
  
  valdir = $(libdir)/valgrind
+ incincdir = $(includedir)/valgrind
diff -ruN calltree/files/patch-src::ct_main.c callgrind/files/patch-src::ct_main.c
--- calltree/files/patch-src::ct_main.c	Wed Aug 25 09:56:42 2004
+++ callgrind/files/patch-src::ct_main.c	Wed Aug 25 10:21:41 2004
@@ -1,11 +1,10 @@
---- src/ct_main.c.orig	Thu Jun  3 05:04:08 2004
-+++ src/ct_main.c	Thu Jun  3 05:05:51 2004
-@@ -5758,7 +5758,7 @@
-    /* Install own SIGILL handler */
-    sigill_new.ksa_handler  = cpuid_SIGILL_handler;
-    sigill_new.ksa_flags    = 0;
--   sigill_new.ksa_restorer = NULL;
-+   //   sigill_new.ksa_restorer = NULL;
-    res = VG_(ksigemptyset)( &sigill_new.ksa_mask );
-    CT_ASSERT(res == 0);
+--- src/ct_main.c.orig	Wed Aug 25 10:10:18 2004
++++ src/ct_main.c	Wed Aug 25 10:13:36 2004
+@@ -32,6 +32,7 @@
+ */
  
+ #include "vg_skin.h"
++#include "vg_unistd.h"
+ #include "callgrind.h"
+ #include "ct_include.h"
+ #include "ct_events.h"
diff -ruN calltree/files/patch-src::ct_sim.c callgrind/files/patch-src::ct_sim.c
--- calltree/files/patch-src::ct_sim.c	Thu Jan  1 01:00:00 1970
+++ callgrind/files/patch-src::ct_sim.c	Wed Aug 25 10:21:41 2004
@@ -0,0 +1,11 @@
+--- src/ct_sim.c.orig	Wed Aug 25 10:20:57 2004
++++ src/ct_sim.c	Wed Aug 25 10:21:12 2004
+@@ -537,7 +537,7 @@
+    /* Install own SIGILL handler */
+    sigill_new.ksa_handler  = cpuid_SIGILL_handler;
+    sigill_new.ksa_flags    = 0;
+-   sigill_new.ksa_restorer = NULL;
++   //sigill_new.ksa_restorer = NULL;
+    res = VG_(ksigemptyset)( &sigill_new.ksa_mask );
+    CT_ASSERT(res == 0);
+ 
diff -ruN calltree/pkg-descr callgrind/pkg-descr
--- calltree/pkg-descr	Wed Aug 25 09:56:42 2004
+++ callgrind/pkg-descr	Wed Aug 25 13:06:43 2004
@@ -1,9 +1,9 @@
-Calltree uses runtime instrumentation via the Valgrind framework for its
+Callgrind uses runtime instrumentation via the Valgrind framework for its
 cache simulation and call tracing. This way, even shared libraries and
 dynamically opened plugins can be profiled. The data files generated by
-Calltree can be loaded into KCachegrind for browsing the performance results.
+Callgrind can be loaded into KCachegrind for browsing the performance results.
 
-But there is also a command line tool in the Calltree package to get ASCII
-reports from Calltree data files without the need to use KCachegrind.
+But there is also a command line tool in the Callgrind package to get ASCII
+reports from Callgrind data files without the need to use KCachegrind.
 
 WWW: http://kcachegrind.sourceforge.net
diff -ruN calltree/pkg-plist callgrind/pkg-plist
--- calltree/pkg-plist	Wed Aug 25 09:56:42 2004
+++ callgrind/pkg-plist	Wed Aug 25 10:26:14 2004
@@ -1,7 +1,7 @@
-bin/calltree
-bin/ct_annotate
-bin/ct_control
-include/valgrind/calltree.h
-lib/valgrind/vgskin_calltree.so
+bin/callgrind
+bin/callgrind_annotate
+bin/callgrind_control
+include/valgrind/callgrind.h
+lib/valgrind/vgskin_callgrind.so
 share/doc/valgrind/ct_main.html
 share/doc/valgrind/ct_techdocs.html
--- calltree.diff ends here ---

--- kcachegrind.diff begins here ---
diff -ruN kcachegrind.orig/Makefile kcachegrind/Makefile
--- kcachegrind.orig/Makefile	Wed Aug 25 10:35:23 2004
+++ kcachegrind/Makefile	Wed Aug 25 12:03:43 2004
@@ -14,7 +14,7 @@
 MAINTAINER=	barner at gmx.de
 COMMENT=	Profiling Visualization Tool
 
-RUN_DEPENDS=	calltree:${PORTSDIR}/devel/calltree
+RUN_DEPENDS=	callgrind:${PORTSDIR}/devel/callgrind
 
 ONLY_FOR_ARCHS=	i386
 CONFLICTS=	kdesdk3-[0-9]*
@@ -24,8 +24,16 @@
 USE_KDELIBS_VER=3
 USE_REINPLACE=	yes
 
+OPTIONS=	DOT "Use GraphViz/dot to render call graphs" on
+
+.include <bsd.port.pre.mk>
+
+.if defined (WITH_DOT)
+RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN kcachegrind.orig/files/patch-kcachegrind::utils.h kcachegrind/files/patch-kcachegrind::utils.h
--- kcachegrind.orig/files/patch-kcachegrind::utils.h	Thu Jan  1 01:00:00 1970
+++ kcachegrind/files/patch-kcachegrind::utils.h	Wed Aug 25 11:38:58 2004
@@ -0,0 +1,11 @@
+--- kcachegrind/utils.h.orig	Wed Aug 25 09:14:10 2004
++++ kcachegrind/utils.h	Wed Aug 25 09:15:21 2004
+@@ -151,7 +151,7 @@
+     struct AppendListChunk {
+ 	int size;
+ 	struct AppendListChunk* next;
+-	type* data[0];
++	// type* data[0];
+     };
+ 
+     struct AppendListChunk *_next, *_current, *_last;
diff -ruN kcachegrind.orig/pkg-plist kcachegrind/pkg-plist
--- kcachegrind.orig/pkg-plist	Wed Aug 25 10:35:23 2004
+++ kcachegrind/pkg-plist	Wed Aug 25 11:36:54 2004
@@ -12,6 +12,7 @@
 share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
 share/apps/kcachegrind/kcachegrindui.rc
 share/apps/kcachegrind/tips
+share/doc/HTML/en/kcachegrind/common
 share/doc/HTML/en/kcachegrind/index.docbook
 share/doc/HTML/en/kcachegrind/index.cache.bz2
 share/icons/hicolor/32x32/apps/kcachegrind.png
--- kcachegrind.diff ends here ---

--- valgrind-snapshot.diff begins here ---
--- pkg-plist.orig	Wed Aug 25 11:23:23 2004
+++ pkg-plist	Wed Aug 25 11:03:53 2004
@@ -7,6 +7,7 @@
 include/valgrind/vg_constants_skin.h
 include/valgrind/vg_kerneliface.h
 include/valgrind/vg_skin.h
+include/valgrind/vg_unistd.h
 lib/valgrind/default.supp
 lib/valgrind/glibc-2.1.supp
 lib/valgrind/glibc-2.2.supp
--- Makefile.orig	Wed Aug 25 11:01:33 2004
+++ Makefile	Wed Aug 25 11:22:39 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	valgrind
 PORTVERSION=	352
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.rabson.org/
 PKGNAMESUFFIX=	-snapshot
@@ -58,5 +59,9 @@
 	${FIND} ${WRKSRC} -name "Makefile.in" -exec \
 		${REINPLACE_CMD} -e "s/docs//g" {} \;
 .endif
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/coregrind/vg_unistd.h \
+		${LOCALBASE}/include/valgrind
 
 .include <bsd.port.post.mk>
--- valgrind-snapshot.diff ends here ---

--- valgrind.diff begins here ---
--- Makefile.orig	Wed Aug 25 11:21:18 2004
+++ Makefile	Wed Aug 25 11:22:47 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	valgrind
 PORTVERSION=	352
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.rabson.org/
 DISTNAME=	${PORTNAME}-stable-${PORTVERSION}
@@ -64,6 +65,9 @@
 .endif
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/coregrind/vg_unistd.h \
+		${LOCALBASE}/include/valgrind
+
 	@${ECHO} ""
 	@${ECHO} ""
 	@${CAT} ${PKGMESSAGE}
--- pkg-plist.orig	Wed Aug 25 11:22:55 2004
+++ pkg-plist	Wed Aug 25 11:23:09 2004
@@ -7,6 +7,7 @@
 include/valgrind/vg_constants_skin.h
 include/valgrind/vg_kerneliface.h
 include/valgrind/vg_skin.h
+include/valgrind/vg_unistd.h
 lib/valgrind/default.supp
 lib/valgrind/glibc-2.1.supp
 lib/valgrind/glibc-2.2.supp
--- valgrind.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list