aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--misc/patchutils/Makefile7
-rw-r--r--misc/patchutils/distinfo2
-rw-r--r--misc/patchutils/files/patch-filterdiff.c22
-rw-r--r--misc/patchutils/pkg-descr2
-rw-r--r--misc/patchutils/pkg-plist7
5 files changed, 30 insertions, 10 deletions
diff --git a/misc/patchutils/Makefile b/misc/patchutils/Makefile
index 89a395393cdc..58162e001034 100644
--- a/misc/patchutils/Makefile
+++ b/misc/patchutils/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= patchutils
-PORTVERSION= 0.1.1
+PORTVERSION= 0.2.8
CATEGORIES= misc
-MASTER_SITES= http://people.redhat.com/twaugh/ftp/patchutils/devel/
+MASTER_SITES= http://cyberelk.net/tim/data/patchutils/stable/
MAINTAINER= ports@FreeBSD.org
@@ -19,6 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-MAN1= filterdiff.1 interdiff.1
+MAN1= combinediff.1 filterdiff.1 fixcvsdiff.1 grepdiff.1 interdiff.1 \
+ lsdiff.1 rediff.1 splitdiff.1
.include <bsd.port.mk>
diff --git a/misc/patchutils/distinfo b/misc/patchutils/distinfo
index 073c3bcc41ca..2cf2a2131559 100644
--- a/misc/patchutils/distinfo
+++ b/misc/patchutils/distinfo
@@ -1 +1 @@
-MD5 (patchutils-0.1.1.tar.gz) = eba6d8aff6f7918a62bd8be700842838
+MD5 (patchutils-0.2.8.tar.gz) = 602ca05faacdb99500ff633f072cce77
diff --git a/misc/patchutils/files/patch-filterdiff.c b/misc/patchutils/files/patch-filterdiff.c
index 3fde5cbc2ef5..f347fae59a44 100644
--- a/misc/patchutils/files/patch-filterdiff.c
+++ b/misc/patchutils/files/patch-filterdiff.c
@@ -1,10 +1,22 @@
---- filterdiff.c.orig Mon Jul 23 17:52:37 2001
-+++ filterdiff.c Mon Jul 23 17:52:53 2001
-@@ -22,6 +22,7 @@
+--- filterdiff.c.orig Fri Feb 1 19:21:43 2002
++++ filterdiff.c Fri Feb 1 19:21:55 2002
+@@ -24,6 +24,9 @@
#include "config.h"
#endif
-+#include <sys/types.h>
- #include <fnmatch.h>
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h> // for ssize_t
++#endif /* HAVE_SYS_TYPES_H */
+ #ifdef HAVE_ERROR_H
+ # include <error.h>
+ #endif /* HAVE_ERROR_H */
+@@ -34,9 +37,6 @@
#include <stdio.h>
#include <stdlib.h>
+ #include <string.h>
+-#ifdef HAVE_SYS_TYPES_H
+-# include <sys/types.h> // for ssize_t
+-#endif /* HAVE_SYS_TYPES_H */
+ #include <time.h>
+
+ #include "util.h"
diff --git a/misc/patchutils/pkg-descr b/misc/patchutils/pkg-descr
index 6f013b5b6e7f..02139c436821 100644
--- a/misc/patchutils/pkg-descr
+++ b/misc/patchutils/pkg-descr
@@ -10,4 +10,4 @@ You can also use this to review changes between two pre-patches.
Filterdiff will select the portions of a patch file that apply to files
matching (or, alternatively, not matching) a shell wildcard.
-WWW: http://people.redhat.com/twaugh/patchutils/
+WWW: http://cyberelk.net/tim/patchutils/
diff --git a/misc/patchutils/pkg-plist b/misc/patchutils/pkg-plist
index 094df3c41a17..a0aaa9e6c25c 100644
--- a/misc/patchutils/pkg-plist
+++ b/misc/patchutils/pkg-plist
@@ -1,2 +1,9 @@
+bin/combinediff
+bin/editdiff
bin/filterdiff
+bin/fixcvsdiff
+bin/grepdiff
bin/interdiff
+bin/lsdiff
+bin/rediff
+bin/splitdiff