- update rlwrap to 0.36

from Alexandr Shadchin, maintained timed-out

misc/rlwrap/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2008/08/20 00:07:04 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2010/04/02 08:15:21 jasper Exp $
 
 COMMENT=		generic readline wrapper for various programs
 
-DISTNAME=		rlwrap-0.28
+DISTNAME=		rlwrap-0.36
 CATEGORIES=		misc
 MASTER_SITES=		http://utopia.knoware.nl/~hlub/uck/rlwrap/
 
@@ -10,19 +10,19 @@ HOMEPAGE=		http://utopia.knoware.nl/~hlub/uck/rlwrap/
 
 MAINTAINER=		Deanna Phillips <deanna@openbsd.org>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+
 WANTLIB=		c curses readline util
 
 CONFIGURE_STYLE=	gnu
 
-REGRESS_IS_INTERACTIVE=	yes
-REGRESS_DEPENDS=	:${PKGNAME}:misc/rlwrap
+REGRESS_IS_INTERACTIVE=	Yes
 
 do-regress:
-	cd ${WRKSRC} && rlwrap perl test/testclient
+	cd ${WRKSRC} && src/rlwrap perl test/testclient
 
 .include <bsd.port.mk>

misc/rlwrap/distinfo

@@ -1,5 +1,5 @@
-MD5 (rlwrap-0.28.tar.gz) = BXhxywTZ3sI3rFZa/1qT1w==
-RMD160 (rlwrap-0.28.tar.gz) = CWZsNwbE0P0KzRljyiEqsmTa0CI=
-SHA1 (rlwrap-0.28.tar.gz) = tIu2GQLpx26yLGOs2MIKQKiKmoI=
-SHA256 (rlwrap-0.28.tar.gz) = d3hi1wzKyMb7dSUqv4eFluvTKpkNCca0rlqi9TGDXx4=
-SIZE (rlwrap-0.28.tar.gz) = 163374
+MD5 (rlwrap-0.36.tar.gz) = 89aHZYM2eJ1RVTIqvMhKfw==
+RMD160 (rlwrap-0.36.tar.gz) = /1n3/WhFweUzCU/2/Pxwi3BlqTI=
+SHA1 (rlwrap-0.36.tar.gz) = nMIAcSe6LjaMKkvg8vMKgY7ms5o=
+SHA256 (rlwrap-0.36.tar.gz) = h/QW39oOJtO1mn2UDdKocSebxWh58/4vD/X5v1NpiS8=
+SIZE (rlwrap-0.36.tar.gz) = 247198

misc/rlwrap/patches/patch-Makefile_in

@@ -1,12 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/01/13 22:15:39 deanna Exp $
---- Makefile.in.orig	Sat Nov 25 10:48:34 2006
-+++ Makefile.in	Fri Jan 12 10:27:32 2007
-@@ -92,7 +92,7 @@ EXTRA_DIST = BUGS COPYING TODO INSTALL R
+$OpenBSD: patch-Makefile_in,v 1.2 2010/04/02 08:15:21 jasper Exp $
+--- Makefile.in.orig	Mon Jan 18 01:08:16 2010
++++ Makefile.in	Sat Mar  6 02:11:05 2010
+@@ -188,8 +188,8 @@ EXTRA_DIST = BUGS COPYING TODO INSTALL README PLEA src
  
  TESTS = test/testit
- SUBDIRS = doc src
--pkgdata_DATA = completions/ftp completions/testclient completions/coqtop
-+pkgdata_DATA = completions/ftp completions/coqtop
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/tools/mkinstalldirs
+ SUBDIRS = doc src filters
+-nobase_pkgdata_DATA = completions/testclient completions/coqtop\
+-		       filters/README filters/RlwrapFilter.pm filters/RlwrapFilter.3pm filters/count_in_prompt filters/pipeto\
++nobase_pkgdata_DATA =  completions/coqtop\
++		       filters/README filters/RlwrapFilter.pm filters/count_in_prompt filters/pipeto\
+                        filters/logger filters/null filters/unbackspace filters/pipeline filters/ftp_filter\
+                        filters/simple_macro filters/template filters/scrub_prompt filters/paint_prompt filters/censor_passwords filters/listing
+ 

misc/rlwrap/patches/patch-filters_Makefile_in

@@ -0,0 +1,21 @@
+$OpenBSD: patch-filters_Makefile_in,v 1.1 2010/04/02 08:15:21 jasper Exp $
+--- filters/Makefile.in.orig	Sun Jan  3 04:54:52 2010
++++ filters/Makefile.in	Sun Jan 10 21:16:26 2010
+@@ -42,7 +42,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-man3dir = $(mandir)/man3
++man3dir = $(mandir)/man3p
+ am__installdirs = "$(DESTDIR)$(man3dir)"
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -193,7 +193,7 @@ install-man3: $(man3_MANS) $(man_MANS)
+ 	  else file=$(srcdir)/$$i; fi; \
+ 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ 	  case "$$ext" in \
+-	    3*) ;; \
++	    3*)ext='3p' ;; \
+ 	    *) ext='3' ;; \
+ 	  esac; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

misc/rlwrap/pkg/PLIST

@@ -1,6 +1,23 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/01/13 22:15:39 deanna Exp $
-bin/rlwrap
+@comment $OpenBSD: PLIST,v 1.2 2010/04/02 08:15:21 jasper Exp $
+@bin bin/rlwrap
 @man man/man1/rlwrap.1
+@man man/man3p/RlwrapFilter.3p
 share/rlwrap/
-share/rlwrap/coqtop
-share/rlwrap/ftp
+share/rlwrap/completions/
+share/rlwrap/completions/coqtop
+share/rlwrap/filters/
+share/rlwrap/filters/README
+share/rlwrap/filters/RlwrapFilter.pm
+share/rlwrap/filters/censor_passwords
+share/rlwrap/filters/count_in_prompt
+share/rlwrap/filters/ftp_filter
+share/rlwrap/filters/listing
+share/rlwrap/filters/logger
+share/rlwrap/filters/null
+share/rlwrap/filters/paint_prompt
+share/rlwrap/filters/pipeline
+share/rlwrap/filters/pipeto
+share/rlwrap/filters/scrub_prompt
+share/rlwrap/filters/simple_macro
+share/rlwrap/filters/template
+share/rlwrap/filters/unbackspace