Mon Mar 3 06:56:36 2014 UTC ()
adapt to Haiku R1alpha4


(obache)
diff -r1.37 -r1.38 pkgsrc/security/openssl/builtin.mk
cvs diff -r1.37 -r1.38 pkgsrc/security/openssl/builtin.mk (expand / switch to unified diff)

--- pkgsrc/security/openssl/builtin.mk 2014/02/22 09:45:36 1.37
+++ pkgsrc/security/openssl/builtin.mk 2014/03/03 06:56:35 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.37 2014/02/22 09:45:36 obache Exp $ 1# $NetBSD: builtin.mk,v 1.38 2014/03/03 06:56:35 obache Exp $
2 2
3BUILTIN_PKG:= openssl 3BUILTIN_PKG:= openssl
4 4
5BUILTIN_FIND_LIBS:= crypto des ssl 5BUILTIN_FIND_LIBS:= crypto des ssl
6BUILTIN_FIND_HEADERS_VAR:= H_OPENSSLCONF H_OPENSSLV 6BUILTIN_FIND_HEADERS_VAR:= H_OPENSSLCONF H_OPENSSLV
7BUILTIN_FIND_HEADERS.H_OPENSSLCONF= openssl/opensslconf.h 7BUILTIN_FIND_HEADERS.H_OPENSSLCONF= openssl/opensslconf.h
8BUILTIN_FIND_HEADERS.H_OPENSSLV= openssl/opensslv.h  8BUILTIN_FIND_HEADERS.H_OPENSSLV= openssl/opensslv.h
9 9
10.include "../../mk/buildlink3/bsd.builtin.mk" 10.include "../../mk/buildlink3/bsd.builtin.mk"
11 11
12### 12###
13### Determine if there is a built-in implementation of the package and 13### Determine if there is a built-in implementation of the package and
14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
@@ -239,27 +239,27 @@ buildlink-openssl-des-h: @@ -239,27 +239,27 @@ buildlink-openssl-des-h:
239 else \ 239 else \
240 ${ECHO} "Unable to find headers for old DES API."; \ 240 ${ECHO} "Unable to find headers for old DES API."; \
241 exit 1; \ 241 exit 1; \
242 fi 242 fi
243. endif 243. endif
244. endif # USE_OLD_DES_API == yes 244. endif # USE_OLD_DES_API == yes
245 245
246. if defined(PKG_SYSCONFDIR.openssl) 246. if defined(PKG_SYSCONFDIR.openssl)
247SSLDIR= ${PKG_SYSCONFDIR.openssl} 247SSLDIR= ${PKG_SYSCONFDIR.openssl}
248. elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) 248. elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
249. if ${OPSYS} == "NetBSD" 249. if ${OPSYS} == "NetBSD"
250SSLDIR= /etc/openssl 250SSLDIR= /etc/openssl
251. elif ${OPSYS} == "Haiku" 251. elif ${OPSYS} == "Haiku"
252SSLDIR= /boot/common/ssl 252SSLDIR= /boot/common/data/ssl
253. else 253. else
254SSLDIR= /etc/ssl # most likely place 254SSLDIR= /etc/ssl # most likely place
255. endif 255. endif
256. else 256. else
257SSLDIR= ${PKG_SYSCONFBASEDIR}/openssl 257SSLDIR= ${PKG_SYSCONFBASEDIR}/openssl
258. endif 258. endif
259 259
260SSLCERTS= ${SSLDIR}/certs 260SSLCERTS= ${SSLDIR}/certs
261SSLKEYS= ${SSLDIR}/private 261SSLKEYS= ${SSLDIR}/private
262 262
263BUILD_DEFS+= SSLDIR SSLCERTS SSLKEYS 263BUILD_DEFS+= SSLDIR SSLCERTS SSLKEYS
264 264
265# create pc files for builtin version; other versions assumed to contain them 265# create pc files for builtin version; other versions assumed to contain them