6 files changed, 67 insertions, 24 deletions

diff --git a/sysutils/ftrace/Makefile b/sysutils/ftrace/Makefile
index 79713b2e8ac1..af0c57e391ca 100644
--- a/sysutils/ftrace/Makefile
+++ b/sysutils/ftrace/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ftrace
-PORTVERSION=	0.9
+PORTVERSION=	0.9a
 CATEGORIES=	sysutils
 MASTER_SITES=	http://software.senko.net/pub/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -15,4 +15,6 @@ MAINTAINER=	greid@ukug.uk.freebsd.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 
+GNU_CONFIGURE=	yes
+
 .include <bsd.port.mk>
diff --git a/sysutils/ftrace/distinfo b/sysutils/ftrace/distinfo
index 471230eeee4f..409d431d6972 100644
--- a/sysutils/ftrace/distinfo
+++ b/sysutils/ftrace/distinfo
@@ -1 +1 @@
-MD5 (ftrace_0.9.tar.gz) = b2a479f2eec86ec24fd02a6723afe303
+MD5 (ftrace_0.9a.tar.gz) = 850a9344b87d94a3d52c46479591b9c8
diff --git a/sysutils/ftrace/files/patch-aa b/sysutils/ftrace/files/patch-aa
index fac013c89704..89a58b951fb2 100644
--- a/sysutils/ftrace/files/patch-aa
+++ b/sysutils/ftrace/files/patch-aa
@@ -1,16 +1,15 @@
---- Makefile.orig	Fri Jan  5 18:40:20 2001
-+++ Makefile	Sat Jan  6 14:11:10 2001
-@@ -1,11 +1,10 @@
--PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
- LIBDIR = $(PREFIX)/lib
+--- configure.orig	Wed Jan 10 17:34:44 2001
++++ configure	Wed Jan 10 17:35:26 2001
+@@ -632,6 +632,12 @@
+   program_prefix=${target_alias}-
  
- CC = gcc
- LD = ld
--CFLAGS = -Wall -O3 -DPIC -fPIC -D_REENTRANT
--LDFLAGS = -shared -ldl
-+CFLAGS += -Wall -O3 -DPIC -fPIC -D_REENTRANT
-+LDFLAGS = -shared
- OBJS = ftrace.o
- 
- .PHONY:	all clean install
+ case "$host" in
++	*-freebsd*)
++		cat >> confdefs.h <<\EOF
++#define LINUX_GLIBC 1
++EOF
++		LDSHARED=-shared
++	;;
+ 	*-linux*)
+ 		cat >> confdefs.h <<\EOF
+ #define LINUX_GLIBC 1
diff --git a/sysutils/ftrace/files/patch-ab b/sysutils/ftrace/files/patch-ab
index 39ce06b0fba6..bc7ca2b3e1f5 100644
--- a/sysutils/ftrace/files/patch-ab
+++ b/sysutils/ftrace/files/patch-ab
@@ -1,8 +1,13 @@
---- ftrace.orig	Sat Jan  6 14:11:37 2001
-+++ ftrace	Sat Jan  6 14:11:24 2001
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
+--- ftrace.c.orig	Wed Jan 10 17:38:16 2001
++++ ftrace.c	Wed Jan 10 17:36:28 2001
+@@ -10,9 +10,10 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <sys/types.h>
  
- if [ "$1" = "-i" ]; then
- 	export FTRACEIGNOREME=1
+ #ifdef LINUX_GLIBC
+-typedef __off64_t off64_t;
++typedef off_t off64_t;
+ #define _GNU_SOURCE
+ #endif /* LINUX_GLIBC */
diff --git a/sysutils/ftrace/files/patch-ac b/sysutils/ftrace/files/patch-ac
new file mode 100644
index 000000000000..222833d0d4ee
--- /dev/null
+++ b/sysutils/ftrace/files/patch-ac
@@ -0,0 +1,32 @@
+--- Makefile.in.orig	Wed Jan 10 09:10:45 2001
++++ Makefile.in	Mon Jan 29 13:18:13 2001
+@@ -1,12 +1,12 @@
+ BINDIR = @prefix@/bin
+ LIBDIR = @prefix@/lib
+-DOCDIR = @prefix@/doc/ftrace
++DOCDIR = @prefix@/share/doc/ftrace
+ 
+ CC = @CC@
+ LD = @LD@
+ INSTALL = @INSTALL@
+-CFLAGS = -Wall -O2 -DPIC -fPIC -D_REENTRANT -I.
+-LDFLAGS = @LDSHARED@ -ldl
++CFLAGS += -Wall -DPIC -fPIC -D_REENTRANT -I.
++LDFLAGS = @LDSHARED@
+ OBJS = ftrace.o
+ 
+ .PHONY:	all clean install distclean
+@@ -20,10 +20,10 @@
+ 	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ install:	libftrace.so
+-		$(INSTALL) -m 755 ftrace $(BINDIR)
+-		$(INSTALL) -m 755 libftrace.so $(LIBDIR)
++		$(INSTALL) -m 555 ftrace $(BINDIR)
++		$(INSTALL) -m 555 libftrace.so $(LIBDIR)
+ 		$(INSTALL) -d $(DOCDIR)
+-		$(INSTALL) COPYING README TODO ChangeLog $(DOCDIR)
++		$(INSTALL) -m 444 COPYING README TODO ChangeLog $(DOCDIR)
+ 
+ clean:
+ 	rm -f *.o *.so *.bak *~
diff --git a/sysutils/ftrace/pkg-plist b/sysutils/ftrace/pkg-plist
index a5ae407a19ae..7e9acdf80fea 100644
--- a/sysutils/ftrace/pkg-plist
+++ b/sysutils/ftrace/pkg-plist
@@ -1,2 +1,7 @@
 bin/ftrace
 lib/libftrace.so
+share/doc/ftrace/COPYING
+share/doc/ftrace/README
+share/doc/ftrace/TODO
+share/doc/ftrace/ChangeLog
+@dirrm share/doc/ftrace