5 files changed, 31 insertions, 27 deletions

diff --git a/security/Makefile b/security/Makefile
index ac07d6804533..1618f99a796c 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -83,7 +83,7 @@
     SUBDIR += radiusniff
     SUBDIR += rid
     SUBDIR += rsaref
-    SUBDIR += ruby-libwrap
+    SUBDIR += ruby-tcpwrap
     SUBDIR += saint
     SUBDIR += seahorse
     SUBDIR += siphon
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index b56220b9c98f..13fde84eee96 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:	Ruby-libwrap
+# New ports collection makefile for:	Ruby-tcpwrap
 # Date created:		15 Aug 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libwrap
+PORTNAME=	tcpwrap
 PORTVERSION=	0.1
 CATEGORIES=	security ruby
-MASTER_SITES=	http://www.ruby-lang.org/~shugo/libwrap-ruby/
+MASTER_SITES=	http://www.ruby-lang.org/~shugo/ruby-tcpwrap/
 PKGNAMEPREFIX=	ruby-
-DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -23,31 +23,37 @@ LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
 INSTALL_TARGET=	site-install
+CONFIGURE_ARGS=	--with-ident-dir="${LOCALBASE}"
+.if !exists(/usr/include/tcpd.h)
+CONFIGURE_ARGS+=	--with-libwrap-dir="/usr"
+.else
+CONFIGURE_ARGS+=	--with-libwrap-dir="${LOCALBASE}"
+.endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-ruby
+WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
 RUBY?=		${LOCALBASE}/bin/ruby
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
-DOCS_EN=	README.en	doc/en/tcpd.html
-DOCS_JA=	README.ja	doc/ja/tcpd.html
+DOCS_EN=	README.en	doc/tcpwrap.html.en
+DOCS_JA=	README.ja	doc/tcpwrap.html.ja
 
 do-configure:
 	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
+	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/tcpd
-	${INSTALL_DATA} ${WRKSRC}/sample/echod.rb ${PREFIX}/share/examples/ruby/tcpd/
-	${MKDIR} ${PREFIX}/share/doc/ruby/tcpd/ja
+	${MKDIR} ${PREFIX}/share/examples/ruby/tcpwrap
+	${INSTALL_DATA} ${WRKSRC}/sample/echod.rb ${PREFIX}/share/examples/ruby/tcpwrap/
+	${MKDIR} ${PREFIX}/share/doc/ruby/tcpwrap/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/tcpd/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/tcpwrap/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/tcpd/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/tcpwrap/ja/
 .endfor
 .endif
 
diff --git a/security/ruby-tcpwrap/distinfo b/security/ruby-tcpwrap/distinfo
index 51f21992d301..bbc56c4b1815 100644
--- a/security/ruby-tcpwrap/distinfo
+++ b/security/ruby-tcpwrap/distinfo
@@ -1 +1 @@
-MD5 (ruby/libwrap-ruby-0.1.tar.gz) = 0600c880da9c06dbf35bad1907eebee3
+MD5 (ruby/ruby-tcpwrap-0.1.tar.gz) = 978daf330d7268b2bf3aff67cd1e0a66
diff --git a/security/ruby-tcpwrap/pkg-descr b/security/ruby-tcpwrap/pkg-descr
index 4c1c10a409fd..b35329c511c2 100644
--- a/security/ruby-tcpwrap/pkg-descr
+++ b/security/ruby-tcpwrap/pkg-descr
@@ -1,6 +1,4 @@
-libwrap-ruby -- TCP wrappers library for Ruby.
-
-Note that the actual module name for this library is `tcpd'.
+ruby-tcpwrap -- TCP wrappers library for Ruby.
 
 
 Author:	Shugo Maeda <shugo@ruby-lang.org>
diff --git a/security/ruby-tcpwrap/pkg-plist b/security/ruby-tcpwrap/pkg-plist
index 98dc1a0fe0b8..e248781c92a2 100644
--- a/security/ruby-tcpwrap/pkg-plist
+++ b/security/ruby-tcpwrap/pkg-plist
@@ -1,9 +1,9 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcpd.so
-share/examples/ruby/tcpd/echod.rb
-@dirrm share/examples/ruby/tcpd
-share/doc/ruby/tcpd/README.en
-share/doc/ruby/tcpd/tcpd.html
-share/doc/ruby/tcpd/ja/README.ja
-share/doc/ruby/tcpd/ja/tcpd.html
-@dirrm share/doc/ruby/tcpd/ja
-@dirrm share/doc/ruby/tcpd
+lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcpwrap.so
+share/examples/ruby/tcpwrap/echod.rb
+@dirrm share/examples/ruby/tcpwrap
+share/doc/ruby/tcpwrap/README.en
+share/doc/ruby/tcpwrap/tcpwrap.html.en
+share/doc/ruby/tcpwrap/ja/README.ja
+share/doc/ruby/tcpwrap/ja/tcpwrap.html.ja
+@dirrm share/doc/ruby/tcpwrap/ja
+@dirrm share/doc/ruby/tcpwrap