- simplify, krb5 handling is not needed.

prompted by brad

2 files changed, 8 insertions, 27 deletions

diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile
index 26acb4751ad..e01d3060d8d 100644
--- a/lib/libssl/Makefile
+++ b/lib/libssl/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/12/28 20:07:47 jasper Exp $
-
-.include <bsd.own.mk> # for KERBEROS5
+# $OpenBSD: Makefile,v 1.17 2011/01/21 09:24:45 jasper Exp $
 
 SUBDIR=crypto ssl man
 PC_FILES=openssl.pc libssl.pc libcrypto.pc
@@ -16,11 +14,7 @@ distribution:
 	   ${.CURDIR}/x509v3.cnf ${DESTDIR}/etc/ssl/x509v3.cnf
 
 beforeinstall:
-.if (${KERBEROS5:L} == "yes")
-	/bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR} -k
-.else
 	/bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR}
-.endif
 	[ -d ${DESTDIR}/usr/lib/pkgconfig/ ] || \
 		${INSTALL} -o root -g ${SHAREGRP} -d ${DESTDIR}/usr/lib/pkgconfig/
 .for p in ${PC_FILES}
diff --git a/lib/libssl/generate_pkgconfig.sh b/lib/libssl/generate_pkgconfig.sh
index 6ae875cc0b2..32332a46372 100644
--- a/lib/libssl/generate_pkgconfig.sh
+++ b/lib/libssl/generate_pkgconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: generate_pkgconfig.sh,v 1.2 2011/01/03 09:32:01 jasper Exp $
+# $OpenBSD: generate_pkgconfig.sh,v 1.3 2011/01/21 09:24:46 jasper Exp $
 #
 # Generate pkg-config files for OpenSSL.
 
@@ -9,7 +9,6 @@ usage() {
 	exit 1
 }
 
-enable_krb5=false
 curdir=
 objdir=
 while getopts "c:ko:" flag; do
@@ -17,9 +16,6 @@ while getopts "c:ko:" flag; do
 		c)
 			curdir=$OPTARG
 			;;
-		k)
-			enable_krb5=true
-			;;
 		o)
 			objdir=$OPTARG
 			;;
@@ -54,12 +50,9 @@ Name: OpenSSL-libcrypto
 Description: OpenSSL cryptography library
 Version: ${ssl_version}
 Requires: 
+Libs: -lcrypto
+Cflags: 
 __EOF__
-echo -n 'Libs: -L${libdir} -lcrypto ' >> ${pc_file}
-echo '-lz' >> ${pc_file}
-echo -n 'Cflags: -I${includedir} ' >> ${pc_file}
-${enable_krb5} && echo -n '-I/usr/include/kerberosV' >> ${pc_file}
-echo '' >> ${pc_file}
 
 
 pc_file="${objdir}/libssl.pc"
@@ -73,12 +66,9 @@ Name: OpenSSL
 Description: Secure Sockets Layer and cryptography libraries
 Version: ${ssl_version}
 Requires: 
+Libs: -lssl -lcrypto
+Cflags: 
 __EOF__
-echo -n 'Libs: -L${libdir} -lssl -lcrypto ' >> ${pc_file}
-echo '-lz' >> ${pc_file}
-echo -n 'Cflags: -I${includedir} ' >> ${pc_file}
-${enable_krb5} && echo -n '-I/usr/include/kerberosV' >> ${pc_file}
-echo '' >> ${pc_file}
 
 
 pc_file="${objdir}/openssl.pc"
@@ -92,9 +82,6 @@ Name: OpenSSL
 Description: Secure Sockets Layer and cryptography libraries and tools
 Version: ${ssl_version}
 Requires: 
+Libs: -lssl -lcrypto
+Cflags: 
 __EOF__
-echo -n 'Libs: -L${libdir} -lssl -lcrypto ' >> ${pc_file}
-echo '-lz' >> ${pc_file}
-echo -n 'Cflags: -I${includedir} ' >> ${pc_file}
-${enable_krb5} && echo -n '-I/usr/include/kerberosV' >> ${pc_file}
-echo '' >> ${pc_file}