5 files changed, 44 insertions, 17 deletions

diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile
index 0bbf251b2f64..b83c10bdcd7d 100644
--- a/devel/rlwrap/Makefile
+++ b/devel/rlwrap/Makefile
@@ -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 @@ GNU_CONFIGURE=		yes
 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 --git a/devel/rlwrap/distinfo b/devel/rlwrap/distinfo
index 43ca0ac0536d..a6062096dfc4 100644
--- a/devel/rlwrap/distinfo
+++ b/devel/rlwrap/distinfo
@@ -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 --git a/devel/rlwrap/files/patch-src::ptytty.c b/devel/rlwrap/files/patch-src::ptytty.c
index f8b1c0d69474..adc2ed43cd46 100644
--- a/devel/rlwrap/files/patch-src::ptytty.c
+++ b/devel/rlwrap/files/patch-src::ptytty.c
@@ -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 --git a/devel/rlwrap/pkg-descr b/devel/rlwrap/pkg-descr
index c269523f3feb..cc02d2dc6899 100644
--- a/devel/rlwrap/pkg-descr
+++ b/devel/rlwrap/pkg-descr
@@ -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 --git a/devel/rlwrap/pkg-plist b/devel/rlwrap/pkg-plist
index c57f33332a78..d0f721d5e433 100644
--- a/devel/rlwrap/pkg-plist
+++ b/devel/rlwrap/pkg-plist
@@ -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
+@dirrm %%DATADIR%%/filters
+@dirrm %%DATADIR%%/completions
 @dirrm %%DATADIR%%