4 files changed, 65 insertions, 10 deletions

diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
index 6fdef8a34a88..e10749264200 100644
--- a/textproc/textutils/Makefile
+++ b/textproc/textutils/Makefile
@@ -1,30 +1,31 @@
 # New ports collection makefile for:	textutils
-# Version required:	1.22
+# Version required:	2.0
 # Date created:		14 May 1998
 # Whom:			Adrian Wontroba <aw1@stade.co.uk>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	textutils-1.22
+DISTNAME=	textutils-2.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	textutils
 
 MAINTAINER=	aw1@stade.co.uk
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS= --program-prefix=g
+CONFIGURE_ARGS=	--program-prefix=g
 
 USE_GMAKE=	yes
 
-MAN1=	gcat.1 gcksum.1 gcomm.1 gcsplit.1 gcut.1 gexpand.1\
-		gfmt.1 gfold.1 ghead.1 gjoin.1 gmd5sum.1 gnl.1\
-		god.1 gpaste.1 gpr.1 gsort.1 gsplit.1 gsum.1 gtac.1\
-		gtail.1 gtr.1 gunexpand.1 guniq.1 gwc.1
+MAN1=		gcomm.1 gcsplit.1 gcut.1 gexpand.1 gfmt.1 ghead.1 \
+		gjoin.1 gmd5sum.1 gnl.1 gpaste.1 gpr.1 gsort.1 \
+		gptx.1 gsum.1 gtac.1 gtail.1 gtr.1 guniq.1 \
+		gtsort.1 gwc.1 gcat.1 gcksum.1 gfold.1 god.1 \
+		gsplit.1 gunexpand.1
 
 post-install:
-	@install-info ${PREFIX}/info/textutils.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/textutils.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/textproc/textutils/distinfo b/textproc/textutils/distinfo
index df64a513fde9..45db3852befb 100644
--- a/textproc/textutils/distinfo
+++ b/textproc/textutils/distinfo
@@ -1 +1 @@
-MD5 (textutils-1.22.tar.gz) = 190ef88a00368c7f7cb4c3095bfc80c8
+MD5 (textutils-2.0.tar.gz) = 61e0eeb09be094069182632335f71b1b
diff --git a/textproc/textutils/files/patch-ab b/textproc/textutils/files/patch-ab
new file mode 100644
index 000000000000..32f1ae34bf3e
--- /dev/null
+++ b/textproc/textutils/files/patch-ab
@@ -0,0 +1,17 @@
+--- doc/Makefile.in.orig	Fri Aug  6 21:56:34 1999
++++ doc/Makefile.in	Sat Aug 21 22:22:12 1999
+@@ -218,14 +218,6 @@
+ 	    else : ; fi; \
+ 	  done; \
+ 	done
+-	@$(POST_INSTALL)
+-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+-	  list='$(INFO_DEPS)'; \
+-	  for file in $$list; do \
+-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+-	  done; \
+-	else : ; fi
+ 
+ uninstall-info:
+ 	$(PRE_UNINSTALL)
diff --git a/textproc/textutils/pkg-plist b/textproc/textutils/pkg-plist
index e47136a9c0b2..2579384645f7 100644
--- a/textproc/textutils/pkg-plist
+++ b/textproc/textutils/pkg-plist
@@ -13,21 +13,58 @@ bin/gnl
 bin/god
 bin/gpaste
 bin/gpr
+bin/gptx
 bin/gsort
 bin/gsplit
 bin/gsum
 bin/gtac
 bin/gtail
 bin/gtr
+bin/gtsort
 bin/gunexpand
 bin/guniq
 bin/gwc
 @unexec install-info --delete %D/info/textutils.info %D/info/dir
 info/textutils.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/textutils.info %D/info/dir
+share/locale/cs/LC_MESSAGES/textutils.mo
 share/locale/de/LC_MESSAGES/textutils.mo
+share/locale/el/LC_MESSAGES/textutils.mo
 share/locale/es/LC_MESSAGES/textutils.mo
 share/locale/fr/LC_MESSAGES/textutils.mo
 share/locale/ko/LC_MESSAGES/textutils.mo
 share/locale/nl/LC_MESSAGES/textutils.mo
+share/locale/no/LC_MESSAGES/textutils.mo
 share/locale/pl/LC_MESSAGES/textutils.mo
+share/locale/ru/LC_MESSAGES/textutils.mo
+share/locale/sk/LC_MESSAGES/textutils.mo
+share/locale/sv/LC_MESSAGES/textutils.mo
+share/locale/zh/LC_MESSAGES/textutils.mo
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true