From 62e76e61f5522fb1fc85d2444cf5a5cb16ddbb6b Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Wed, 6 Oct 2010 03:40:46 +0000 Subject: [PATCH] - update to 0.37 - remove -lutil cruft from before AC_CHECK_LIB() was added - either use openpty() or search manually (not sure)[1] [1] PTYS_ARE_PTMX ifdef patch was incorrect, anyway. According to configure.ac there can be only one of PTYS_ARE_XXX be defined at a time because the check uses `else if'. PR: ports/150694 Submitted by: swell.k@gmail.com Approved by: maintainer timeout (gamato@users.sf.net ; 14 days) --- devel/rlwrap/Makefile | 6 ++++-- devel/rlwrap/distinfo | 6 +++--- devel/rlwrap/files/patch-src::ptytty.c | 9 --------- devel/rlwrap/pkg-plist | 1 + 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile index b83c10bdcd7d..a4f413be19fe 100644 --- a/devel/rlwrap/Makefile +++ b/devel/rlwrap/Makefile @@ -7,7 +7,7 @@ # PORTNAME= rlwrap -PORTVERSION= 0.36 +PORTVERSION= 0.37 CATEGORIES= devel MASTER_SITES= http://utopia.knoware.nl/~hlub/uck/rlwrap/ \ ${MASTER_SITE_LOCAL} \ @@ -18,13 +18,15 @@ MAINTAINER= gamato@users.sf.net COMMENT= Readline wrapper 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-patch: .SILENT + ${REINPLACE_CMD} 's|/dev/ptmx|${NONEXISTENT}|' ${WRKSRC}/configure + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/devel/rlwrap/distinfo b/devel/rlwrap/distinfo index a6062096dfc4..220946db822b 100644 --- a/devel/rlwrap/distinfo +++ b/devel/rlwrap/distinfo @@ -1,3 +1,3 @@ -MD5 (rlwrap-0.36.tar.gz) = f3d687658336789d5155322abcc84a7f -SHA256 (rlwrap-0.36.tar.gz) = 87f416dfda0e26d3b59a7d940dd2a871279bc56879f3fe2f0ff5f9bf5369892f -SIZE (rlwrap-0.36.tar.gz) = 247198 +MD5 (rlwrap-0.37.tar.gz) = 04cd6e2c257eb5a86b297f2ebf91dbbf +SHA256 (rlwrap-0.37.tar.gz) = 8403a2c184a33ee293a30637afd1362e7dbe0ee642c33b54b2fca68162498bbd +SIZE (rlwrap-0.37.tar.gz) = 251438 diff --git a/devel/rlwrap/files/patch-src::ptytty.c b/devel/rlwrap/files/patch-src::ptytty.c index adc2ed43cd46..23598bc0c116 100644 --- a/devel/rlwrap/files/patch-src::ptytty.c +++ b/devel/rlwrap/files/patch-src::ptytty.c @@ -1,14 +1,5 @@ --- 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 - #endif --#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) -+#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) && !defined(__FreeBSD__) - # include /* for I_PUSH */ - #endif - @@ -159,11 +159,19 @@ char pty_name[] = "/dev/pty??"; char tty_name[] = "/dev/tty??"; diff --git a/devel/rlwrap/pkg-plist b/devel/rlwrap/pkg-plist index d0f721d5e433..d09b19a62ec0 100644 --- a/devel/rlwrap/pkg-plist +++ b/devel/rlwrap/pkg-plist @@ -7,6 +7,7 @@ bin/rlwrap %%DATADIR%%/filters/censor_passwords %%DATADIR%%/filters/count_in_prompt %%DATADIR%%/filters/ftp_filter +%%DATADIR%%/filters/history_format %%DATADIR%%/filters/listing %%DATADIR%%/filters/logger %%DATADIR%%/filters/null