7 files changed, 34 insertions, 46 deletions

diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile
index aad2e5a97e8b..922493ee67b6 100644
--- a/devel/rlwrap/Makefile
+++ b/devel/rlwrap/Makefile
@@ -7,24 +7,23 @@
 #
 
 PORTNAME=	rlwrap
-PORTVERSION=	0.15
+PORTVERSION=	0.18
 CATEGORIES=	devel
 MASTER_SITES=	http://utopia.knoware.nl/~hlub/uck/rlwrap/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Readline wrapper
 
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+MAN1=	rlwrap.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500018
 IGNORE=		"Requires readline 4.2 or newer, only available in recent versions of FreeBSD 5.x"
 .endif
 
-USE_GETOPT_LONG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
-MAN1=	rlwrap.1
-
 .include <bsd.port.post.mk>
diff --git a/devel/rlwrap/distinfo b/devel/rlwrap/distinfo
index 8397107c32da..4832655e52f1 100644
--- a/devel/rlwrap/distinfo
+++ b/devel/rlwrap/distinfo
@@ -1,2 +1,2 @@
-MD5 (rlwrap-0.15.tgz) = b1325380b8d1a9619d26d5a4b6bcacca
-SIZE (rlwrap-0.15.tgz) = 65184
+MD5 (rlwrap-0.18.tar.gz) = 0a1b449aab79376c659684196763de52
+SIZE (rlwrap-0.18.tar.gz) = 102953
diff --git a/devel/rlwrap/files/patch-Makefile.in b/devel/rlwrap/files/patch-Makefile.in
deleted file mode 100644
index ee466d035b20..000000000000
--- a/devel/rlwrap/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Fri Jun 21 18:13:49 2002
-+++ Makefile.in	Thu Jul  4 15:46:48 2002
-@@ -14,6 +14,8 @@
- 
- oldincludedir = /usr/include
- 
-+CPPFLAGS      = @CPPFLAGS@
-+
- LDFLAGS       = @LDFLAGS@ -L$(libdir)
- LIBS          = @LIBS@
- SHELL         = /bin/sh
-@@ -21,7 +23,7 @@
- 
- 
- CC = @CC@
--CFLAGS= @CFLAGS@ -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(sysconfdir)\"  -Wall -I .
-+CFLAGS= @CFLAGS@ $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(sysconfdir)\" -Wall -I .
- SOURCES = main.c signals.c utils.c readline.c pty.c completion.c term.c  
- OBJECTS = main.o signals.o utils.o readline.o pty.o completion.o term.o
- TESTCLIENT=testclient
diff --git a/devel/rlwrap/files/patch-rlwrap.h b/devel/rlwrap/files/patch-rlwrap.h
deleted file mode 100644
index 97d6d8fa7680..000000000000
--- a/devel/rlwrap/files/patch-rlwrap.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- rlwrap.h.orig	Tue Sep 11 06:02:47 2001
-+++ rlwrap.h	Mon Mar  4 07:37:19 2002
-@@ -36,6 +36,10 @@
- #include <stdlib.h>
- #include <time.h>
- 
-+#ifdef HAVE_GETOPT_LONG
-+#include <getopt.h>
-+#endif
-+
- #ifdef HAVE_GETOPT_H
- #include <getopt.h>
- #endif
diff --git a/devel/rlwrap/files/patch-src::Makefile.in b/devel/rlwrap/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..77d0614169d2
--- /dev/null
+++ b/devel/rlwrap/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Sun Feb  1 05:13:59 2004
++++ src/Makefile.in	Fri Feb 20 22:36:34 2004
+@@ -83,7 +83,7 @@
+ install_sh = @install_sh@
+ bin_PROGRAMS = rlwrap
+ rlwrap_SOURCES = main.c signals.c utils.c readline.c pty.c completion.c term.c ptytty.c
+-CFLAGS = -DDATADIR=\"@datadir@\" -g
++CFLAGS = @CFLAGS@ -DDATADIR=\"@datadir@\"
+ subdir = src
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/devel/rlwrap/files/patch-src::ptytty.c b/devel/rlwrap/files/patch-src::ptytty.c
new file mode 100644
index 000000000000..7c3990055f5c
--- /dev/null
+++ b/devel/rlwrap/files/patch-src::ptytty.c
@@ -0,0 +1,11 @@
+--- src/ptytty.c.orig	Thu Jan 22 18:16:16 2004
++++ src/ptytty.c	Mon Feb  2 15:12:59 2004
+@@ -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
+ 
diff --git a/devel/rlwrap/pkg-plist b/devel/rlwrap/pkg-plist
index b10ac918c6c3..01684a85b5ae 100644
--- a/devel/rlwrap/pkg-plist
+++ b/devel/rlwrap/pkg-plist
@@ -1,4 +1,4 @@
 bin/rlwrap
-etc/rlwrap/ftp
-etc/rlwrap/testclient
-@dirrm etc/rlwrap
+%%DATADIR%%/ftp
+%%DATADIR%%/testclient
+@dirrm %%DATADIR%%