summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/ssleay/Makefile10
-rw-r--r--security/ssleay/patches/patch-aa13
-rw-r--r--security/ssleay/patches/patch-ab4
-rw-r--r--security/ssleay/pkg/PLIST6
4 files changed, 13 insertions, 20 deletions
diff --git a/security/ssleay/Makefile b/security/ssleay/Makefile
index d90cc54952d..e96c03a3028 100644
--- a/security/ssleay/Makefile
+++ b/security/ssleay/Makefile
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile,v 1.8 1998/09/30 20:08:21 cjs Exp $
+# $NetBSD: Makefile,v 1.9 1998/10/02 03:22:57 cjs Exp $
# FreeBSD: Makefile,v 1.20 1998/08/27 16:38:02 markm Exp
#
+# Note that the config file goes in ${PREFIX}/lib; this cannot easily
+# be changed to etc without modifing a bunch of code on the software
+# itself, due to certain assumptions it makes. [cjs]
+#
DISTNAME= SSLeay-0.9.0b
CATEGORIES= devel security
@@ -20,7 +24,7 @@ HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= util/NetBSD.sh
CONFIGURE_ARGS= ${MACHINE_ARCH}
-PLIST_SRC= ${PKGDIR}/PLIST
+PLIST_SRC= ${WRKSRC}/PLIST
.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
PLIST_SRC+= ${PKGDIR}/PLIST.rsaref2
.endif
@@ -50,6 +54,8 @@ post-extract:
${SED} -e 's|@@@PREFIX@@@|${PREFIX}|g' < ${FILESDIR}/NetBSD.sh \
> ${WRKSRC}/util/NetBSD.sh
chmod 755 ${WRKSRC}/util/NetBSD.sh
+ ${SED} -e 's|@@@PREFIX@@@|${PREFIX}|g' < ${PKGDIR}/PLIST \
+ > ${WRKSRC}/PLIST
post-patch:
@${CP} ${WRKSRC}/Configure ${WRKSRC}/foo
diff --git a/security/ssleay/patches/patch-aa b/security/ssleay/patches/patch-aa
deleted file mode 100644
index 6dd2c49e841..00000000000
--- a/security/ssleay/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1998/09/30 20:08:22 cjs Exp $
-
-diff -udr ../SSLeay-0.8.1.ORIG/apps/ca.c ./apps/ca.c
---- ../SSLeay-0.8.1.ORIG/apps/ca.c Fri Jul 18 20:15:56 1997
-+++ ./apps/ca.c Tue Feb 17 20:27:52 1998
-@@ -82,7 +82,7 @@
- #define PROG ca_main
-
- #define BASE_SECTION "ca"
--#define CONFIG_FILE "lib/ssleay.cnf"
-+#define CONFIG_FILE "etc/ssleay.cnf"
-
- #define ENV_DEFAULT_CA "default_ca"
diff --git a/security/ssleay/patches/patch-ab b/security/ssleay/patches/patch-ab
index 005234bcc2c..afc382ce799 100644
--- a/security/ssleay/patches/patch-ab
+++ b/security/ssleay/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 1998/10/01 21:09:39 frueauf Exp $
+$NetBSD: patch-ab,v 1.6 1998/10/02 03:22:57 cjs Exp $
--- Makefile.ssl.orig Fri Jun 26 01:25:25 1998
+++ Makefile.ssl Wed Sep 16 14:33:49 1998
@@ -62,7 +62,7 @@
@@ -14,6 +14,6 @@ $NetBSD: patch-ab,v 1.5 1998/10/01 21:09:39 frueauf Exp $
sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
chmod 644 $(INSTALLTOP)/lib/$$i ); \
done
-+ cp apps/ssleay.cnf $(INSTALLTOP)/etc/ssleay.cnf.sample
++ cp apps/ssleay.cnf $(INSTALLTOP)/lib/ssleay.cnf.eg
# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/security/ssleay/pkg/PLIST b/security/ssleay/pkg/PLIST
index fb3db2aca6b..4a4de1dc4b9 100644
--- a/security/ssleay/pkg/PLIST
+++ b/security/ssleay/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1998/09/30 20:08:22 cjs Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/10/02 03:22:57 cjs Exp $
bin/ssleay
bin/asn1parse
bin/base64
@@ -79,7 +79,6 @@ bin/c_info
bin/c_issuer
bin/c_name
bin/c_rehash
-etc/ssleay.cnf.sample
include/crypto.h
include/cryptall.h
include/md2.h
@@ -121,7 +120,7 @@ include/ssl2.h
include/ssl3.h
include/ssl23.h
include/tls1.h
-lib/ssleay.cnf
+lib/ssleay.cnf.eg
lib/libcrypto.a
lib/libssl.a
share/doc/SSLeay/API.doc
@@ -172,4 +171,5 @@ share/doc/SSLeay/threads.doc
share/doc/SSLeay/txt_db.doc
share/doc/SSLeay/verify
share/doc/SSLeay/why.doc
+@exec if [ ! -f @@@PREFIX@@@/lib/ssleay.cnf ]; then echo "Installing ssleay.cnf in @@@PREFIX@@@/lib." ; cp -p @@@PREFIX@@@/lib/ssleay.cnf.eg @@@PREFIX@@@/lib/ssleay.cnf; fi
@dirrm share/doc/SSLeay