[pkgsrc/trunk]: pkgsrc/security/sslwrap Fix problems seen in latest bulk-buil...

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/35f737b45766
branches:  trunk
changeset: 463497:35f737b45766
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Fri Nov 14 00:42:18 2003 +0000

description:
Fix problems seen in latest bulk-build by:
- using PKGNAME_NOREV as the basis for the DISTFILE
- correcting/updating the MASTER_SITES and HOMEPAGE
- patching instead of using -DOPENSSL="\"openssl\"", since
  apparently #include "openssl/""foo.h" is no good (gcc-3 issue?)

diffstat:

 security/sslwrap/Makefile         |  14 ++++++++++----
 security/sslwrap/distinfo         |   4 ++--
 security/sslwrap/patches/patch-aa |   5 ++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r a9a08f0b7983 -r 35f737b45766 security/sslwrap/Makefile
--- a/security/sslwrap/Makefile Thu Nov 13 22:35:44 2003 +0000
+++ b/security/sslwrap/Makefile Fri Nov 14 00:42:18 2003 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2003/11/12 03:39:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/11/14 00:42:18 jschauma Exp $
 #
 
-DISTNAME=      ${PKGNAME:S/-//}
+DISTNAME=      ${PKGNAME_NOREV:S/-//}
 PKGNAME=       sslwrap-206
 PKGREVISION=   1
 CATEGORIES=    security net
-MASTER_SITES=  http://www.rickk.com/sslwrap/
+MASTER_SITES=  http://www.quiltaholic.com/rickk/sslwrap/
 
 MAINTAINER=    rh%NetBSD.org@localhost
-HOMEPAGE=      http://www.rickk.com/sslwrap/
+HOMEPAGE=      http://www.quiltaholic.com/rickk/sslwrap/
 COMMENT=       Simple SSL wrapper
 
 USE_BUILDLINK2=        YES
@@ -19,4 +19,10 @@
 CFLAGS+=       -DFLAT_INC
 .endif
 
+do-configure:
+.for f in apps.h s_cb.c s_server.c s_socket.c
+       sed -e 's|OPENSSL"|"openssl/|' ${WRKSRC}/$f > ${WRKSRC}/$f.not && \
+               mv ${WRKSRC}/$f.not ${WRKSRC}/$f
+.endfor
+
 .include "../../mk/bsd.pkg.mk"
diff -r a9a08f0b7983 -r 35f737b45766 security/sslwrap/distinfo
--- a/security/sslwrap/distinfo Thu Nov 13 22:35:44 2003 +0000
+++ b/security/sslwrap/distinfo Fri Nov 14 00:42:18 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/09/18 04:09:18 jmc Exp $
+$NetBSD: distinfo,v 1.4 2003/11/14 00:42:18 jschauma Exp $
 
 SHA1 (sslwrap206.tar.gz) = fc8a4a4134d2668705f9fc4ac92a45a847c3edf9
 Size (sslwrap206.tar.gz) = 21170 bytes
-SHA1 (patch-aa) = 9a8e868a64ea7439f1a2c46f5295c552bf3060df
+SHA1 (patch-aa) = d036726db779562eea96c4909c6f2c790610928a
 SHA1 (patch-ab) = 7f28cb5eca2a004408cb20aa365edad0d4f7d45a
 SHA1 (patch-ac) = 7ffb5a45843d8d4d99867967547663ef7656bd32
diff -r a9a08f0b7983 -r 35f737b45766 security/sslwrap/patches/patch-aa
--- a/security/sslwrap/patches/patch-aa Thu Nov 13 22:35:44 2003 +0000
+++ b/security/sslwrap/patches/patch-aa Fri Nov 14 00:42:18 2003 +0000
@@ -1,11 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2003/09/18 04:09:19 jmc Exp $
+$NetBSD: patch-aa,v 1.4 2003/11/14 00:42:18 jschauma Exp $
 
 --- Makefile.orig      2000-11-11 22:01:25.000000000 +0000
 +++ Makefile   2003-09-17 23:03:22.000000000 +0000
-@@ -1,28 +1,16 @@
+@@ -1,28 +1,15 @@
 +PROG= sslwrap
 +SRCS= s_server.c s_socket.c s_cb.c
-+COPTS+=       -DOPENSSL="\"openssl/\""
 +LDADD=        -lssl -lcrypto
 +MAN=
 +