Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Aug 1999 02:40:54 +0100 (BST)
From:      Adrian Wontroba <aw1@stade.co.uk>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/13315: upgrade GNU textutils port to version 2.0
Message-ID:  <199908220140.CAA07487@titus.stade.co.uk>

next in thread | raw e-mail | index | archive | help

>Number:         13315
>Category:       ports
>Synopsis:       upgrade GNU textutils port to version 2.0
>Confidential:   yes
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 21 20:30:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Adrian Wontroba
>Release:        FreeBSD 3.2-STABLE i386
>Organization:
Yes, some would be nice!
>Environment:

	FreeBSD 3.2-STABLE #0: Sat Aug 14 19:22:52 BST 1999

>Description:

	textutils version 2.0 is available

>How-To-Repeat:

>Fix:

Apply following diffs

Note:	patches/patch-aa removed
	patches/patch-ab new
	

diff -ruN --exclude CVS ../../textproc/textutils/Makefile ./Makefile
--- ../../textproc/textutils/Makefile	Wed Jun  9 00:03:59 1999
+++ ./Makefile	Sat Aug 21 22:45:03 1999
@@ -1,30 +1,34 @@
 # 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>
 #
 # $Id: Makefile,v 1.5 1999/06/05 22:32:06 mharo Exp $
 #
 
-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
 
 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
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+	install-info ${PREFIX}/info/textutils.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff -ruN --exclude CVS ../../textproc/textutils/files/md5 ./files/md5
--- ../../textproc/textutils/files/md5	Tue Jun 16 20:16:16 1998
+++ ./files/md5	Sat Aug 21 21:01:33 1999
@@ -1 +1 @@
-MD5 (textutils-1.22.tar.gz) = 190ef88a00368c7f7cb4c3095bfc80c8
+MD5 (textutils-2.0.tar.gz) = 61e0eeb09be094069182632335f71b1b
diff -ruN --exclude CVS ../../textproc/textutils/patches/patch-aa ./patches/patch-aa
--- ../../textproc/textutils/patches/patch-aa	Sun Feb 14 09:30:13 1999
+++ ./patches/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,69 +0,0 @@
---- ./doc/textutils.texi.org	Mon Jun 15 02:28:23 1998
-+++ ./doc/textutils.texi	Mon Jun 15 02:29:38 1998
-@@ -17,6 +17,7 @@
- @syncodeindex vr cp
- 
- @ifinfo
-+@dircategory Text utilities
- @format
- START-INFO-DIR-ENTRY
- * Text utilities: (textutils).          GNU text utilities.
-@@ -2820,10 +2821,10 @@
- @menu
- * Toolbox introduction::
- * I/O redirection::
--* The @code{who} command::
--* The @code{cut} command::
--* The @code{sort} command::
--* The @code{uniq} command::
-+* The who command::
-+* The cut command::
-+* The sort command::
-+* The uniq command::
- * Putting the tools together::
- @end menu
- 
-@@ -2938,8 +2939,8 @@
- us.  As you should always do, double check your system documentation
- for the full story.
- 
--@node The @code{who} command
--@unnumberedsec The @code{who} command
-+@node The who command
-+@unnumberedsec The who command
- 
- The first program is the @code{who} command.  By itself, it generates a
- list of the users who are currently logged in.  Although I'm writing
-@@ -2960,8 +2961,8 @@
- little bit of trivia will be useful later.  The output of @code{who} is nice,
- but the data is not all that exciting.
- 
--@node The @code{cut} command
--@unnumberedsec The @code{cut} command
-+@node The cut command
-+@unnumberedsec The cut command
- 
- The next program we'll look at is the @code{cut} command.  This program
- cuts out columns or fields of input data.  For example, we can tell it
-@@ -2989,8 +2990,8 @@
- useful for data filtering.
- 
- 
--@node The @code{sort} command
--@unnumberedsec The @code{sort} command
-+@node The sort command
-+@unnumberedsec The sort command
- 
- Next we'll look at the @code{sort} command.  This is one of the most
- powerful commands on a Unix-style system; one that you will often find
-@@ -3002,8 +3003,8 @@
- sequence (@sc{ASCII}) or based on  user-supplied ordering criteria.
- 
- 
--@node The @code{uniq} command
--@unnumberedsec The @code{uniq} command
-+@node The uniq command
-+@unnumberedsec The uniq command
- 
- Finally (at least for now), we'll look at the @code{uniq} program.  When
- sorting data, you will often end up with duplicate lines, lines that
diff -ruN --exclude CVS ../../textproc/textutils/patches/patch-ab ./patches/patch-ab
--- ../../textproc/textutils/patches/patch-ab	Thu Jan  1 01:00:00 1970
+++ ./patches/patch-ab	Sat Aug 21 22:22:36 1999
@@ -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 -ruN --exclude CVS ../../textproc/textutils/pkg/PLIST ./pkg/PLIST
--- ../../textproc/textutils/pkg/PLIST	Wed Jun  9 00:04:00 1999
+++ ./pkg/PLIST	Sat Aug 21 23:32:04 1999
@@ -13,21 +13,58 @@
 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

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199908220140.CAA07487>