ports/143202: [PATCH] devel/rlwrap Update to 0.36

Mon Jan 25 11:40:08 UTC 2010

The following reply was made to PR ports/143202; it has been noted by GNATS.

From: martinko <gamato at users.sf.net>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/143202: [PATCH] devel/rlwrap Update to 0.36
Date: Mon, 25 Jan 2010 12:37:12 +0100

 This is a multi-part message in MIME format.
 --------------060207040001030707030705
 Content-Type: text/plain; charset=ISO-8859-2; format=flowed
 Content-Transfer-Encoding: 7bit

 Edwin Groothuis wrote:
 > Maintainer of devel/rlwrap,
 >
 > Please note that PR ports/143202 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >      http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/143202
 >
 >    

 Attached is a slightly amended patch based on Rob's.
 Rob, thank you for your contribution!

 Regards,

 M.

 --------------060207040001030707030705
 Content-Type: text/plain;
  name="patch-0.30-0.36.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-0.30-0.36.txt"

 diff -urN 0.30/Makefile 0.36/Makefile
 --- 0.30/Makefile	2009-02-24 04:57:27.000000000 +0100
 +++ 0.36/Makefile	2010-01-25 12:02:58.000000000 +0100
 @@ -7,7 +7,7 @@
  #

  PORTNAME=	rlwrap
 -PORTVERSION=	0.30
 +PORTVERSION=	0.36
  CATEGORIES=	devel
  MASTER_SITES=	http://utopia.knoware.nl/~hlub/uck/rlwrap/ \
  		${MASTER_SITE_LOCAL} \
 @@ -21,5 +21,16 @@
  CONFIGURE_ENV+=		ptyttylib_cv_ptys=BSD LDFLAGS=-lutil

  MAN1=	rlwrap.1
 +MAN3=	RlwrapFilter.3pm
 +
 +PORTDOCS=	AUTHORS BUGS NEWS PLEA README TODO
 +
 +post-install:
 +.if !defined(NOPORTDOCS)
 +	@${MKDIR} ${DOCSDIR}
 +.for i in ${PORTDOCS}
 +	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 +.endfor
 +.endif

  .include <bsd.port.mk>
 diff -urN 0.30/distinfo 0.36/distinfo
 --- 0.30/distinfo	2008-01-14 03:27:35.000000000 +0100
 +++ 0.36/distinfo	2010-01-25 10:26:31.000000000 +0100
 @@ -1,3 +1,3 @@
 -MD5 (rlwrap-0.30.tar.gz) = 03d8bd4996945ea32d3c7d5dc38c956e
 -SHA256 (rlwrap-0.30.tar.gz) = 1dea22de58d750ff622dd676ddbacce80d0305d0ec85422e326b6e71c7971671
 -SIZE (rlwrap-0.30.tar.gz) = 184037
 +MD5 (rlwrap-0.36.tar.gz) = f3d687658336789d5155322abcc84a7f
 +SHA256 (rlwrap-0.36.tar.gz) = 87f416dfda0e26d3b59a7d940dd2a871279bc56879f3fe2f0ff5f9bf5369892f
 +SIZE (rlwrap-0.36.tar.gz) = 247198
 diff -urN 0.30/files/patch-src::ptytty.c 0.36/files/patch-src::ptytty.c
 --- 0.30/files/patch-src::ptytty.c	2007-10-07 23:51:57.000000000 +0200
 +++ 0.36/files/patch-src::ptytty.c	2010-01-25 10:26:31.000000000 +0100
 @@ -1,12 +1,12 @@
 ---- src/ptytty.c.orig	2005-10-17 09:36:46.000000000 +0200
 -+++ src/ptytty.c	2007-09-27 14:12:26.000000000 +0200
 +--- src/ptytty.c.orig	2010-01-24 01:05:53.000000000 -0800
 ++++ src/ptytty.c	2010-01-24 01:09:19.000000000 -0800
  @@ -41,7 +41,7 @@
   #ifdef HAVE_SYS_IOCTL_H
   # include <sys/ioctl.h>
   #endif
  -#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
  +#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) && !defined(__FreeBSD__)
 - # include <sys/stropts.h>	/* for I_PUSH */
 + # include <sys/stropts.h>       /* for I_PUSH */
   #endif

  @@ -159,11 +159,19 @@
 @@ -14,10 +14,10 @@
       char tty_name[] = "/dev/tty??";

  -# ifndef PTYCHAR1
 --#  define PTYCHAR1	"pqrstuvwxyz"
 +-#  define PTYCHAR1      "pqrstuvwxyz"
  -# endif
  -# ifndef PTYCHAR2
 --#  define PTYCHAR2	"0123456789abcdef"
 +-#  define PTYCHAR2      "0123456789abcdef"
  +# ifdef __FreeBSD__
  +/* Auto-detected pty names do not work well with devfs! */
  +#  undef  PTYCHAR1
 diff -urN 0.30/pkg-descr 0.36/pkg-descr
 --- 0.30/pkg-descr	2001-08-12 13:07:24.000000000 +0200
 +++ 0.36/pkg-descr	2010-01-25 11:42:01.000000000 +0100
 @@ -1,7 +1,6 @@
 -rlwrap is a 'readline wrapper', i.e. a small utility that uses the GNU
 -readline library to allow the editing of keyboard input for any other
 -command. Input history is remembered separately for each command,
 -!... history completion works as in bash and completion word lists can
 -be specified.
 +rlwrap is a 'readline wrapper' that uses the GNU readline library to allow the
 +editing of keyboard input for any other command.  Input history is remembered
 +across invocations, separately for each command; history completion and search
 +work as in bash and completion word lists can be specified on the command line.

  WWW: http://utopia.knoware.nl/~hlub/uck/rlwrap/
 diff -urN 0.30/pkg-plist 0.36/pkg-plist
 --- 0.30/pkg-plist	2006-12-11 18:54:14.000000000 +0100
 +++ 0.36/pkg-plist	2010-01-25 10:26:31.000000000 +0100
 @@ -1,5 +1,22 @@
  bin/rlwrap
 -%%DATADIR%%/ftp
 -%%DATADIR%%/testclient
 -%%DATADIR%%/coqtop
 +%%DATADIR%%/completions/coqtop
 +%%DATADIR%%/completions/testclient
 +%%DATADIR%%/filters/README
 +%%DATADIR%%/filters/RlwrapFilter.3pm
 +%%DATADIR%%/filters/RlwrapFilter.pm
 +%%DATADIR%%/filters/censor_passwords
 +%%DATADIR%%/filters/count_in_prompt
 +%%DATADIR%%/filters/ftp_filter
 +%%DATADIR%%/filters/listing
 +%%DATADIR%%/filters/logger
 +%%DATADIR%%/filters/null
 +%%DATADIR%%/filters/paint_prompt
 +%%DATADIR%%/filters/pipeline
 +%%DATADIR%%/filters/pipeto
 +%%DATADIR%%/filters/scrub_prompt
 +%%DATADIR%%/filters/simple_macro
 +%%DATADIR%%/filters/template
 +%%DATADIR%%/filters/unbackspace
 + at dirrm %%DATADIR%%/filters
 + at dirrm %%DATADIR%%/completions
  @dirrm %%DATADIR%%

 --------------060207040001030707030705--