Attachment #103314 for bug #143202




#

PORTNAME=	rlwrap
PORTVERSION=	0.36
CATEGORIES=	devel
MASTER_SITES=	http://utopia.knoware.nl/~hlub/uck/rlwrap/ \
		${MASTER_SITE_LOCAL} \

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>

Lines 1-3 Link Here

(-)0.36/distinfo (-3 / +3 lines)
1	MD5 (rlwrap-0.30.tar.gz) = 03d8bd4996945ea32d3c7d5dc38c956e	1	MD5 (rlwrap-0.36.tar.gz) = f3d687658336789d5155322abcc84a7f
2	SHA256 (rlwrap-0.30.tar.gz) = 1dea22de58d750ff622dd676ddbacce80d0305d0ec85422e326b6e71c7971671	2	SHA256 (rlwrap-0.36.tar.gz) = 87f416dfda0e26d3b59a7d940dd2a871279bc56879f3fe2f0ff5f9bf5369892f
3	SIZE (rlwrap-0.30.tar.gz) = 184037	3	SIZE (rlwrap-0.36.tar.gz) = 247198




--- 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 */
 #endif
 
@@ -159,11 +159,19 @@

     char tty_name[] = "/dev/tty??";
 
-# ifndef PTYCHAR1
-#  define PTYCHAR1      "pqrstuvwxyz"
-# endif
-# ifndef PTYCHAR2
-#  define PTYCHAR2      "0123456789abcdef"
+# ifdef __FreeBSD__
+/* Auto-detected pty names do not work well with devfs! */
+#  undef  PTYCHAR1

Lines 1-7 Link Here

(-)0.36/pkg-descr (-5 / +4 lines)
1	rlwrap is a 'readline wrapper', i.e. a small utility that uses the GNU	1	rlwrap is a 'readline wrapper' that uses the GNU readline library to allow the
2	readline library to allow the editing of keyboard input for any other	2	editing of keyboard input for any other command. Input history is remembered
3	command. Input history is remembered separately for each command,	3	across invocations, separately for each command; history completion and search
4	!... history completion works as in bash and completion word lists can	4	work as in bash and completion word lists can be specified on the command line.
5	be specified.
6		5
7	WWW: http://utopia.knoware.nl/~hlub/uck/rlwrap/	6	WWW: http://utopia.knoware.nl/~hlub/uck/rlwrap/




bin/rlwrap
%%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%%

Return to bug 143202

Lines 7-13 Link Here

(-)0.36/Makefile (-1 / +12 lines)
7	#	7	#
8		8
9	PORTNAME= rlwrap	9	PORTNAME= rlwrap
10	PORTVERSION= 0.30	10	PORTVERSION= 0.36
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= http://utopia.knoware.nl/~hlub/uck/rlwrap/ \	12	MASTER_SITES= http://utopia.knoware.nl/~hlub/uck/rlwrap/ \
13	${MASTER_SITE_LOCAL} \	13	${MASTER_SITE_LOCAL} \
Lines 21-25 Link Here
21	CONFIGURE_ENV+= ptyttylib_cv_ptys=BSD LDFLAGS=-lutil	21	CONFIGURE_ENV+= ptyttylib_cv_ptys=BSD LDFLAGS=-lutil
22		22
23	MAN1= rlwrap.1	23	MAN1= rlwrap.1
		24	MAN3= RlwrapFilter.3pm
		25
		26	PORTDOCS= AUTHORS BUGS NEWS PLEA README TODO
		27
		28	post-install:
		29	.if !defined(NOPORTDOCS)
		30	@${MKDIR} ${DOCSDIR}
		31	.for i in ${PORTDOCS}
		32	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
		33	.endfor
		34	.endif
24		35
25	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)0.36/files/patch-src::ptytty.c (-5 / +5 lines)
1	--- src/ptytty.c.orig 2005-10-17 09:36:46.000000000 +0200	1	--- src/ptytty.c.orig 2010-01-24 01:05:53.000000000 -0800
2	+++ src/ptytty.c 2007-09-27 14:12:26.000000000 +0200	2	+++ src/ptytty.c 2010-01-24 01:09:19.000000000 -0800
3	@@ -41,7 +41,7 @@	3	@@ -41,7 +41,7 @@
4	#ifdef HAVE_SYS_IOCTL_H	4	#ifdef HAVE_SYS_IOCTL_H
5	# include <sys/ioctl.h>	5	# include <sys/ioctl.h>
6	#endif	6	#endif
7	-#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)	7	-#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
8	+#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) && !defined(__FreeBSD__)	8	+#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) && !defined(__FreeBSD__)
9	# include <sys/stropts.h> /* for I_PUSH */	9	# include <sys/stropts.h> /* for I_PUSH */
10	#endif	10	#endif
11		11
12	@@ -159,11 +159,19 @@	12	@@ -159,11 +159,19 @@
Lines 14-23 Link Here
14	char tty_name[] = "/dev/tty??";	14	char tty_name[] = "/dev/tty??";
15		15
16	-# ifndef PTYCHAR1	16	-# ifndef PTYCHAR1
17	-# define PTYCHAR1 "pqrstuvwxyz"	17	-# define PTYCHAR1 "pqrstuvwxyz"
18	-# endif	18	-# endif
19	-# ifndef PTYCHAR2	19	-# ifndef PTYCHAR2
20	-# define PTYCHAR2 "0123456789abcdef"	20	-# define PTYCHAR2 "0123456789abcdef"
21	+# ifdef __FreeBSD__	21	+# ifdef __FreeBSD__
22	+/* Auto-detected pty names do not work well with devfs! */	22	+/* Auto-detected pty names do not work well with devfs! */
23	+# undef PTYCHAR1	23	+# undef PTYCHAR1

Lines 1-5 Link Here

(-)0.36/pkg-plist (-3 / +20 lines)
1	bin/rlwrap	1	bin/rlwrap
2	%%DATADIR%%/ftp	2	%%DATADIR%%/completions/coqtop
3	%%DATADIR%%/testclient	3	%%DATADIR%%/completions/testclient
4	%%DATADIR%%/coqtop	4	%%DATADIR%%/filters/README
		5	%%DATADIR%%/filters/RlwrapFilter.3pm
		6	%%DATADIR%%/filters/RlwrapFilter.pm
		7	%%DATADIR%%/filters/censor_passwords
		8	%%DATADIR%%/filters/count_in_prompt
		9	%%DATADIR%%/filters/ftp_filter
		10	%%DATADIR%%/filters/listing
		11	%%DATADIR%%/filters/logger
		12	%%DATADIR%%/filters/null
		13	%%DATADIR%%/filters/paint_prompt
		14	%%DATADIR%%/filters/pipeline
		15	%%DATADIR%%/filters/pipeto
		16	%%DATADIR%%/filters/scrub_prompt
		17	%%DATADIR%%/filters/simple_macro
		18	%%DATADIR%%/filters/template
		19	%%DATADIR%%/filters/unbackspace
		20	@dirrm %%DATADIR%%/filters
		21	@dirrm %%DATADIR%%/completions
5	@dirrm %%DATADIR%%	22	@dirrm %%DATADIR%%