Sat Oct 5 07:01:06 2013 UTC ()
Unbreak previous.


(jperkin)
diff -r1.180 -r1.181 pkgsrc/security/openssl/Makefile
cvs diff -r1.180 -r1.181 pkgsrc/security/openssl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/openssl/Makefile 2013/10/03 11:15:48 1.180
+++ pkgsrc/security/openssl/Makefile 2013/10/05 07:01:06 1.181
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.180 2013/10/03 11:15:48 joerg Exp $ 1# $NetBSD: Makefile,v 1.181 2013/10/05 07:01:06 jperkin Exp $
2 2
3DISTNAME= openssl-1.0.1e 3DISTNAME= openssl-1.0.1e
4MASTER_SITES= http://ftp.openssl.org/source/ 4MASTER_SITES= http://ftp.openssl.org/source/
5PKGREVISION= 2 5PKGREVISION= 2
6SVR4_PKGNAME= ossl 6SVR4_PKGNAME= ossl
7CATEGORIES= security 7CATEGORIES= security
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.openssl.org/ 10HOMEPAGE= http://www.openssl.org/
11COMMENT= Secure Socket Layer and cryptographic library 11COMMENT= Secure Socket Layer and cryptographic library
12 12
13CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* 13CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]*
14 14
@@ -111,26 +111,27 @@ CONFIGURE_ARGS+= hpux-parisc-${CC} @@ -111,26 +111,27 @@ CONFIGURE_ARGS+= hpux-parisc-${CC}
111. else 111. else
112CONFIGURE_ARGS+= hpux-ia64-${CC} 112CONFIGURE_ARGS+= hpux-ia64-${CC}
113. endif 113. endif
114. endif 114. endif
115.elif ${OPSYS} == "Cygwin" 115.elif ${OPSYS} == "Cygwin"
116USE_PLIST_SHLIB= no 116USE_PLIST_SHLIB= no
117.endif 117.endif
118 118
119.include "../../security/openssl/options.mk" 119.include "../../security/openssl/options.mk"
120 120
121CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} 121CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS}
122CONFIGURE_ENV+= PERL=${PERL5:Q} 122CONFIGURE_ENV+= PERL=${PERL5:Q}
123 123
 124PLIST_SRC+= ${PKGDIR}/PLIST.common
124USE_PLIST_SHLIB?= yes 125USE_PLIST_SHLIB?= yes
125.if ${USE_PLIST_SHLIB} == "yes" 126.if ${USE_PLIST_SHLIB} == "yes"
126PLIST_SRC+= ${PKGDIR}/PLIST.shlib 127PLIST_SRC+= ${PKGDIR}/PLIST.shlib
127.endif 128.endif
128PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//} 129PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//}
129PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//} 130PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//}
130 131
131PKG_SYSCONFSUBDIR= openssl 132PKG_SYSCONFSUBDIR= openssl
132CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ 133CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \
133 ${PKG_SYSCONFDIR}/openssl.cnf 134 ${PKG_SYSCONFDIR}/openssl.cnf
134OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private 135OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
135 136
136INSTALLATION_DIRS+= share/examples/openssl 137INSTALLATION_DIRS+= share/examples/openssl