Thu Jun 5 03:14:05 2014 UTC ()
Fixes missing override of pc files.
PR pkg/48871.

Bump PKGREVISION.


(obache)
diff -r1.191 -r1.192 pkgsrc/security/openssl/Makefile
cvs diff -r1.191 -r1.192 pkgsrc/security/openssl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/openssl/Makefile 2014/06/05 02:53:18 1.191
+++ pkgsrc/security/openssl/Makefile 2014/06/05 03:14:05 1.192
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.191 2014/06/05 02:53:18 obache Exp $ 1# $NetBSD: Makefile,v 1.192 2014/06/05 03:14:05 obache Exp $
2 2
3DISTNAME= openssl-1.0.1g 3DISTNAME= openssl-1.0.1g
4MASTER_SITES= http://ftp.openssl.org/source/ 4MASTER_SITES= http://ftp.openssl.org/source/
5PKGREVISION= 1 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
12LICENSE= openssl 12LICENSE= openssl
13 13
14CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* 14CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]*
15 15
16CRYPTO= yes 16CRYPTO= yes
17 17
18PKG_INSTALLATION_TYPES= overwrite pkgviews 18PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -116,26 +116,29 @@ CONFIGURE_ARGS+= hpux-ia64-${CC} @@ -116,26 +116,29 @@ CONFIGURE_ARGS+= hpux-ia64-${CC}
116. endif 116. endif
117.elif ${OPSYS} == "Linux" 117.elif ${OPSYS} == "Linux"
118. if ${MACHINE_ARCH} == "powerpc64" 118. if ${MACHINE_ARCH} == "powerpc64"
119CONFIGURE_SCRIPT= ./Configure 119CONFIGURE_SCRIPT= ./Configure
120CONFIGURE_ARGS+= linux-ppc64 120CONFIGURE_ARGS+= linux-ppc64
121. endif 121. endif
122.endif 122.endif
123 123
124.include "../../security/openssl/options.mk" 124.include "../../security/openssl/options.mk"
125 125
126CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} 126CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS}
127CONFIGURE_ENV+= PERL=${PERL5:Q} 127CONFIGURE_ENV+= PERL=${PERL5:Q}
128 128
 129PKGCONFIG_OVERRIDE+= libcrypto.pc libssl.pc openssl.pc
 130PKGCONFIG_OVERRIDE_STAGE= post-build
 131
129PLIST_SRC+= ${PKGDIR}/PLIST.common 132PLIST_SRC+= ${PKGDIR}/PLIST.common
130USE_PLIST_SHLIB?= yes 133USE_PLIST_SHLIB?= yes
131.if ${USE_PLIST_SHLIB} == "yes" 134.if ${USE_PLIST_SHLIB} == "yes"
132PLIST_SRC+= ${PKGDIR}/PLIST.shlib 135PLIST_SRC+= ${PKGDIR}/PLIST.shlib
133.endif 136.endif
134PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//} 137PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//}
135PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//} 138PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//}
136 139
137PKG_SYSCONFSUBDIR= openssl 140PKG_SYSCONFSUBDIR= openssl
138CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ 141CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \
139 ${PKG_SYSCONFDIR}/openssl.cnf 142 ${PKG_SYSCONFDIR}/openssl.cnf
140OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private 143OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
141 144