- Add LICENSE

- Switch to options helpers
- Cleanup pkg-descr

3 files changed, 20 insertions, 17 deletions

diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile
index 5e5c758f882d..dbcad28223db 100644
--- a/security/sslwrap/Makefile
+++ b/security/sslwrap/Makefile
@@ -11,6 +11,11 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another SSL Wrapper application, which uses SSLEay/OpenSSL
 
+# 4th clause is actually different here and does not really apply
+# to FreeBSD, but the license still contains advertising clause
+# making it identical to classic BSD4CLAUSE
+LICENSE=	BSD4CLAUSE
+
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g}
 
 USE_OPENSSL=	yes
@@ -20,8 +25,6 @@ PLIST_FILES=	bin/sslwrap
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|SSL_OP_NON_EXPORT_FIRST|SSL_OP_CIPHER_SERVER_PREFERENCE|g ; \
@@ -29,9 +32,11 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sslwrap ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/security/sslwrap/files/patch-Makefile b/security/sslwrap/files/patch-Makefile
index ec6ed8ba6ab5..aefd65bfe223 100644
--- a/security/sslwrap/files/patch-Makefile
+++ b/security/sslwrap/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Sep 28 05:49:54 1999
-+++ Makefile	Thu Jan 27 23:09:09 2000
-@@ -6,16 +6,19 @@
+--- Makefile.orig	2000-11-11 22:01:25 UTC
++++ Makefile
+@@ -6,16 +6,19 @@ SRC = s_server.c s_socket.c s_cb.c
  
  # Debug/Optimizations
  #OPT = -g
diff --git a/security/sslwrap/pkg-descr b/security/sslwrap/pkg-descr
index ca5213e6e1dd..c584f2d4b6da 100644
--- a/security/sslwrap/pkg-descr
+++ b/security/sslwrap/pkg-descr
@@ -1,14 +1,12 @@
-   This is a port of sslwrap.
+"... sslwrap is a simple Unix service that sits over any simple TCP service
+such as POP3, IMAP, SMTP, and encrypts all of the data on the
+connection using TLS/SSL. It uses ssleay to support SSL version 2 and
+3. It can run out of inetd. It can also encrypt data for services
+located on another computer.
 
-   "... sslwrap is a simple Unix service that sits over any simple TCP service
-   such as POP3, IMAP, SMTP, and encrypts all of the data on the
-   connection using TLS/SSL. It uses ssleay to support SSL version 2 and
-   3. It can run out of inetd. It can also encrypt data for services
-   located on another computer.
+It works with the servers you already have, and does not require any
+modifications to your existing servers. ..."
 
-   It works with the servers you already have, and does not require any
-   modifications to your existing servers. ..."
-
-   Of course, it works with OpenSSL, too.
+Of course, it works with OpenSSL, too.
 
 WWW: http://www.rickk.com/sslwrap/