Attachment #126378 for bug #170142

Lines 6-40 Link Here

(-)devel/fnccheck/Makefile (-21 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= fnccheck	8	PORTNAME= fnccheck
9	PORTVERSION= 1.2	9	PORTVERSION= 3.2.0
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}
		12	DISTNAME= FunctionCheck-${PORTVERSION}
12		13
13	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
14	COMMENT= A profiling library/utilities for C/C++ programs	15	COMMENT= A profiling library/utilities for C/C++ programs
15		16
		17	LICENSE= GPLv2 LGPL21
		18	LICENSE_COMB= multi
		19
		20	USE_BINUTILS= yes
		21	USE_AUTOTOOLS= libtoolize aclocal automake autoconf
		22	LIBTOOLIZE_ARGS=--force
		23	ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
		24	AUTOMAKE_ARGS= --force-missing --add-missing --foreign
16	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
		26	MAKE_JOBS_SAFE= yes
		27
		28	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		29	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
17		30
18	USE_CSTD= gnu89	31	STRIP= # none
19		32
20	WRKSRC= ${WRKDIR}/${PORTNAME}-devel-${PORTVERSION}	33	INFO= libfc
21		34
22	DOCS= README.txt README1ST.txt CHANGES.txt \	35	post-patch:
23	doc/fncdump.info doc/html/fncdump_toc.html \	36	@${FIND} ${WRKSRC} -name "Makefile.am" \| ${XARGS} ${REINPLACE_CMD} -e \
24	doc/html/fncdump.html	37	's\|-ldl -lpthread\|\| ; \
25		38	s\|-lbfd$$\|-lbfd -liberty\| ; \
26	STRIP= #	39	s\|-Wall -O3\|-Wall\|'
27
28	do-install:
29	.for B in fncdump fncaverage
30	${INSTALL_PROGRAM} ${WRKSRC}/bin/$B ${PREFIX}/bin
31	.endfor
32	${INSTALL_PROGRAM} ${WRKSRC}/lib/libfnccheck.so ${PREFIX}/lib
33	.if !defined(NOPORTDOCS)
34	${MKDIR} ${DOCSDIR}
35	.for D in ${DOCS}
36	${INSTALL_DATA} ${WRKSRC}/$D ${DOCSDIR}
37	.endfor
38	.endif
39		40
40	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/fnccheck/distinfo (-2 / +2 lines)
1	SHA256 (fnccheck-1.2.tar.gz) = 6a7f5769edccb116f20e9a1edb848d06eb742688a2fc01e0044b9d429372938a	1	SHA256 (FunctionCheck-3.2.0.tar.gz) = df5dec9b3ad4f5b009323b0773baf502b482f18a894b3a5c3b72748fe5c5ba75
2	SIZE (fnccheck-1.2.tar.gz) = 64664	2	SIZE (FunctionCheck-3.2.0.tar.gz) = 95451




--- 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




--- 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:




--- 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 $<

Lines 5-7 Link Here

(-)devel/fnccheck/pkg-descr (+2 lines)
5	In order to use FncCheck, you have to compile your .o files	5	In order to use FncCheck, you have to compile your .o files
6	with '-finstrument-functions -g' switches (gcc V2.95.2 and higher).	6	with '-finstrument-functions -g' switches (gcc V2.95.2 and higher).
7	You have then to link your executable with the library 'libfnccheck.so'.	7	You have then to link your executable with the library 'libfnccheck.so'.
		8
		9	WWW: http://sourceforge.net/projects/fnccheck/

Lines 1-10 Link Here

(-)devel/fnccheck/pkg-plist (-10 / +6 lines)
1	bin/fncaverage	1	bin/fcdump
2	bin/fncdump	2	bin/fcmanager
3	lib/libfnccheck.so	3	lib/libfc.a
4	%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt	4	lib/libfc.la
5	%%PORTDOCS%%%%DOCSDIR%%/README.txt	5	lib/libfc.so
6	%%PORTDOCS%%%%DOCSDIR%%/README1ST.txt	6	lib/libfc.so.0
7	%%PORTDOCS%%%%DOCSDIR%%/fncdump.html
8	%%PORTDOCS%%%%DOCSDIR%%/fncdump.info
9	%%PORTDOCS%%%%DOCSDIR%%/fncdump_toc.html
10	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 170142

Lines 1-23 Link Here

(-)devel/fnccheck/files/patch-aa (-23 lines)
1	--- Makefile.orig Wed Jan 17 12:48:32 2001
2	+++ Makefile Mon Jan 22 17:34:43 2001
3	@@ -2,10 +2,9 @@
4	PACKAGE = fnccheck
5	VERSION = 1.1.4
6
7	-prefix = /usr/local
8	bindir = $(prefix)/bin
9	libdir = $(prefix)/lib
10	-docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
11	+docdir = $(prefix)/doc/$(PACKAGE)
12
13	INSTALL = install
14
15	@@ -24,7 +23,7 @@
16	echo "Use 'make install' to install the lib" ; \
17	echo "Use 'make all' to generate everything"
18
19	-all: fnccheck fncdump fncaverage essai essai_interact
20	+all: fnccheck fncdump_nobfd fncaverage
21
22	fnccheck:
23	-@ cd src/ ; make fnccheck

Lines 1-51 Link Here

(-)devel/fnccheck/files/patch-ab (-51 lines)
1	--- src/Makefile.orig Tue Jan 9 12:09:48 2001
2	+++ src/Makefile Mon Jan 22 17:05:13 2001
3	@@ -1,10 +1,9 @@
4	-CC = gcc
5	-CFLAGS = -Wall -O3 -I/usr/include -I/usr/local/include
6	-LIBS = -L/lib -L/usr/lib -L/usr/local/lib -lm
7	+CC?= gcc
8
9	.c.o:
10	$(CC) $(EXT) $(CFLAGS) $(INCLUDE) -c $<
11
12	+LIBS=-lm
13	LIBFILE=fnccheck.c
14	LIBNAME=libfnccheck.so
15	DUMP=fncdump
16	@@ -14,28 +13,28 @@
17	-@ echo "Please specify a target."
18
19	fnccheck:
20	- $(CC) -Wall -O3 -c $(LIBFILE)
21	- $(CC) -Wall -O3 -fPIC -c $(LIBFILE) -o $(LIBNAME)
22	+ $(CC) $(CFLAGS) -c $(LIBFILE)
23	+ $(CC) $(CFLAGS) -fPIC -c $(LIBFILE) -o $(LIBNAME)
24	mv $(LIBNAME) ../lib/
25
26	dfnccheck:
27	- $(CC) -Wall -O3 -DFNCCHK_DEBUG -c $(LIBFILE)
28	- $(CC) -Wall -O3 -fPIC -DFNCCHK_DEBUG -c $(LIBFILE) -o $(LIBNAME)
29	+ $(CC) $(CFLAGS) -DFNCCHK_DEBUG -c $(LIBFILE)
30	+ $(CC) $(CFLAGS) -fPIC -DFNCCHK_DEBUG -c $(LIBFILE) -o $(LIBNAME)
31	mv $(LIBNAME) ../lib/
32
33	fncdump:
34	-@ export EXT=-DFNCCHK_USE_BFD ; make real_fncdump
35
36	real_fncdump: fncdump.o
37	- $(CC) -O3 $(CFLAGS) $(INCLUDE) -o $(DUMP) fncdump.o $(LIBS) -lbfd -liberty
38	+ $(CC) $(CFLAGS) $(INCLUDE) -o $(DUMP) fncdump.o $(LIBS) -lbfd -liberty
39	mv $(DUMP) ../bin
40
41	fncdump_nobfd: fncdump.o
42	- $(CC) -O3 $(CFLAGS) $(INCLUDE) -o $(DUMP) fncdump.o $(LIBS)
43	+ $(CC) $(CFLAGS) $(INCLUDE) -o $(DUMP) fncdump.o $(LIBS)
44	mv $(DUMP) ../bin
45
46	fncaverage: fnccheck.o fncaverage.o
47	- $(CC) -O3 $(CFLAGS) $(INCLUDE) -o $(AVG) fncaverage.o fnccheck.o $(LIBS)
48	+ $(CC) $(CFLAGS) $(INCLUDE) -o $(AVG) fncaverage.o fnccheck.o $(LIBS)
49	mv $(AVG) ../bin
50
51	clean:

Lines 1-12 Link Here

(-)devel/fnccheck/files/patch-ac (-12 lines)
1	--- test/Makefile.orig Mon Jan 22 17:06:25 2001
2	+++ test/Makefile Mon Jan 22 17:06:52 2001
3	@@ -1,6 +1,6 @@
4	-CC = gcc
5	-CFLAGS = -Wall -I/usr/include -I/usr/local/include
6	-LIBS = -L/lib -L/usr/lib -L/usr/local/lib -lm
7	+CC? = gcc
8	+CFLAGS+= -Wall
9	+LIBS = -lm
10
11	.c.o:
12	$(CC) $(CFLAGS) $(INCLUDE) $(EXTS) -c $<