Attachment 126379 Details for Bug 170142 – devel_fnccheck.diff

[patch] devel_fnccheck.diff

devel_fnccheck.diff (text/x-diff), 6.49 KB, created by tkato432 on 2012-07-28 18:58:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-07-28 18:58:08 UTC

Size: 6.49 KB

patch

obsolete

>diff -urN /usr/ports/devel/fnccheck/Makefile devel/fnccheck/Makefile
>--- /usr/ports/devel/fnccheck/Makefile	2011-07-15 00:11:02.000000000 +0900
>+++ devel/fnccheck/Makefile	2012-07-28 18:00:38.000000000 +0900
>@@ -6,35 +6,38 @@
> #
> 
> PORTNAME=	fnccheck
>-PORTVERSION=	1.2
>+PORTVERSION=	3.2.0
> CATEGORIES=	devel
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTVERSION}
>+MASTER_SITES=	SF/${PORTNAME}
>+DISTNAME=	FunctionCheck-${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	A profiling library/utilities for C/C++ programs
> 
>+LICENSE=	GPLv2 LGPL21
>+LICENSE_COMB=	multi
>+
>+USE_BINUTILS=	yes
>+USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
>+LIBTOOLIZE_ARGS=--force
>+ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
>+AUTOMAKE_ARGS=	--force-missing --add-missing --foreign
> USE_LDCONFIG=	yes
>+MAKE_JOBS_SAFE=	yes
>+
>+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
>-USE_CSTD=	gnu89
>+STRIP=		# none
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-devel-${PORTVERSION}
>+INFO=		libfc
> 
>-DOCS=		README.txt README1ST.txt CHANGES.txt \
>-		doc/fncdump.info doc/html/fncdump_toc.html \
>-		doc/html/fncdump.html
>-
>-STRIP=		#
>-
>-do-install:
>-.for B in fncdump fncaverage
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/$B ${PREFIX}/bin
>-.endfor
>-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libfnccheck.so ${PREFIX}/lib
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-.for D in ${DOCS}
>-	${INSTALL_DATA} ${WRKSRC}/$D ${DOCSDIR}
>-.endfor
>-.endif
>+post-patch:
>+	@${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \
>+		's|-ldl -lpthread|| ; \
>+		 s|-lbfd$$|-lbfd -liberty| ; \
>+		 s|-Wall -O3|-Wall|'
>+	@${REINPLACE_CMD} -e \
>+		'/^SUBDIRS/s|test||' ${WRKSRC}/Makefile.am
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/devel/fnccheck/distinfo devel/fnccheck/distinfo
>--- /usr/ports/devel/fnccheck/distinfo	2011-07-03 23:55:42.000000000 +0900
>+++ devel/fnccheck/distinfo	2012-06-19 02:32:29.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (fnccheck-1.2.tar.gz) = 6a7f5769edccb116f20e9a1edb848d06eb742688a2fc01e0044b9d429372938a
>-SIZE (fnccheck-1.2.tar.gz) = 64664
>+SHA256 (FunctionCheck-3.2.0.tar.gz) = df5dec9b3ad4f5b009323b0773baf502b482f18a894b3a5c3b72748fe5c5ba75
>+SIZE (FunctionCheck-3.2.0.tar.gz) = 95451
>diff -urN /usr/ports/devel/fnccheck/files/patch-aa devel/fnccheck/files/patch-aa
>--- /usr/ports/devel/fnccheck/files/patch-aa	2001-01-23 16:40:06.000000000 +0900
>+++ devel/fnccheck/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
>@@ -1,23 +0,0 @@
>---- Makefile.orig	Wed Jan 17 12:48:32 2001
>-+++ Makefile	Mon Jan 22 17:34:43 2001
>-@@ -2,10 +2,9 @@
>- PACKAGE = fnccheck
>- VERSION = 1.1.4
>- 
>--prefix = /usr/local
>- bindir = $(prefix)/bin
>- libdir = $(prefix)/lib
>--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
>-+docdir = $(prefix)/doc/$(PACKAGE)
>- 
>- INSTALL = install
>- 
>-@@ -24,7 +23,7 @@
>- 	echo "Use 'make install' to install the lib" ; \
>- 	echo "Use 'make all' to generate everything"
>- 
>--all: fnccheck fncdump fncaverage essai essai_interact
>-+all: fnccheck fncdump_nobfd fncaverage
>- 
>- fnccheck:
>- 	-@ cd src/ ; make fnccheck
>diff -urN /usr/ports/devel/fnccheck/files/patch-ab devel/fnccheck/files/patch-ab
>--- /usr/ports/devel/fnccheck/files/patch-ab	2001-01-23 16:40:06.000000000 +0900
>+++ devel/fnccheck/files/patch-ab	1970-01-01 09:00:00.000000000 +0900
>@@ -1,51 +0,0 @@
>---- src/Makefile.orig	Tue Jan  9 12:09:48 2001
>-+++ src/Makefile	Mon Jan 22 17:05:13 2001
>-@@ -1,10 +1,9 @@
>--CC	=	gcc
>--CFLAGS	=	-Wall -O3 -I/usr/include  -I/usr/local/include
>--LIBS	=	-L/lib -L/usr/lib -L/usr/local/lib -lm
>-+CC?=	gcc
>- 
>- .c.o:
>- 	$(CC) $(EXT) $(CFLAGS) $(INCLUDE) -c $<
>- 
>-+LIBS=-lm
>- LIBFILE=fnccheck.c
>- LIBNAME=libfnccheck.so
>- DUMP=fncdump
>-@@ -14,28 +13,28 @@
>- 	-@ echo "Please specify a target."
>- 
>- fnccheck:
>--	$(CC) -Wall -O3 -c $(LIBFILE)
>--	$(CC) -Wall -O3 -fPIC -c $(LIBFILE) -o $(LIBNAME)
>-+	$(CC) $(CFLAGS) -c $(LIBFILE)
>-+	$(CC) $(CFLAGS) -fPIC -c $(LIBFILE) -o $(LIBNAME)
>- 	mv $(LIBNAME) ../lib/
>- 
>- dfnccheck:
>--	$(CC) -Wall -O3 -DFNCCHK_DEBUG -c $(LIBFILE)
>--	$(CC) -Wall -O3 -fPIC -DFNCCHK_DEBUG -c $(LIBFILE) -o $(LIBNAME)
>-+	$(CC) $(CFLAGS) -DFNCCHK_DEBUG -c $(LIBFILE)
>-+	$(CC) $(CFLAGS) -fPIC -DFNCCHK_DEBUG -c $(LIBFILE) -o $(LIBNAME)
>- 	mv $(LIBNAME) ../lib/
>- 
>- fncdump:
>- 	-@ export EXT=-DFNCCHK_USE_BFD ; make real_fncdump
>- 
>- real_fncdump: fncdump.o
>--	$(CC) -O3 $(CFLAGS) $(INCLUDE) -o $(DUMP) fncdump.o $(LIBS) -lbfd -liberty
>-+	$(CC) $(CFLAGS) $(INCLUDE) -o $(DUMP) fncdump.o $(LIBS) -lbfd -liberty
>- 	mv $(DUMP) ../bin
>- 
>- fncdump_nobfd: fncdump.o
>--	$(CC) -O3 $(CFLAGS) $(INCLUDE) -o $(DUMP) fncdump.o $(LIBS)
>-+	$(CC) $(CFLAGS) $(INCLUDE) -o $(DUMP) fncdump.o $(LIBS)
>- 	mv $(DUMP) ../bin
>- 
>- fncaverage: fnccheck.o fncaverage.o
>--	$(CC) -O3 $(CFLAGS) $(INCLUDE) -o $(AVG) fncaverage.o fnccheck.o $(LIBS)
>-+	$(CC) $(CFLAGS) $(INCLUDE) -o $(AVG) fncaverage.o fnccheck.o $(LIBS)
>- 	mv $(AVG) ../bin
>- 
>- clean:
>diff -urN /usr/ports/devel/fnccheck/files/patch-ac devel/fnccheck/files/patch-ac
>--- /usr/ports/devel/fnccheck/files/patch-ac	2001-01-23 16:40:06.000000000 +0900
>+++ devel/fnccheck/files/patch-ac	1970-01-01 09:00:00.000000000 +0900
>@@ -1,12 +0,0 @@
>---- test/Makefile.orig	Mon Jan 22 17:06:25 2001
>-+++ test/Makefile	Mon Jan 22 17:06:52 2001
>-@@ -1,6 +1,6 @@
>--CC	=	gcc
>--CFLAGS	=	-Wall -I/usr/include  -I/usr/local/include
>--LIBS	=	-L/lib -L/usr/lib -L/usr/local/lib -lm
>-+CC?	=	gcc
>-+CFLAGS+=	-Wall
>-+LIBS	=	-lm
>- 
>- .c.o:
>- 	$(CC) $(CFLAGS) $(INCLUDE) $(EXTS) -c $<
>diff -urN /usr/ports/devel/fnccheck/pkg-descr devel/fnccheck/pkg-descr
>--- /usr/ports/devel/fnccheck/pkg-descr	2009-12-21 11:16:13.000000000 +0900
>+++ devel/fnccheck/pkg-descr	2012-07-28 18:05:06.000000000 +0900
>@@ -4,4 +4,6 @@
> 
> In order to use FncCheck, you have to compile your .o files
> with '-finstrument-functions -g' switches (gcc V2.95.2 and higher).
>-You have then to link your executable with the library 'libfnccheck.so'.
>+You have then to link your executable with the library 'libfc.so'.
>+
>+WWW: http://sourceforge.net/projects/fnccheck/
>diff -urN /usr/ports/devel/fnccheck/pkg-plist devel/fnccheck/pkg-plist
>--- /usr/ports/devel/fnccheck/pkg-plist	2004-05-29 16:02:47.000000000 +0900
>+++ devel/fnccheck/pkg-plist	2012-06-19 02:45:40.000000000 +0900
>@@ -1,10 +1,6 @@
>-bin/fncaverage
>-bin/fncdump
>-lib/libfnccheck.so
>-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
>-%%PORTDOCS%%%%DOCSDIR%%/README.txt
>-%%PORTDOCS%%%%DOCSDIR%%/README1ST.txt
>-%%PORTDOCS%%%%DOCSDIR%%/fncdump.html
>-%%PORTDOCS%%%%DOCSDIR%%/fncdump.info
>-%%PORTDOCS%%%%DOCSDIR%%/fncdump_toc.html
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+bin/fcdump
>+bin/fcmanager
>+lib/libfc.a
>+lib/libfc.la
>+lib/libfc.so
>+lib/libfc.so.0

Actions: View | Diff

Attachments on bug 170142: 126378 | 126379