Index: devel/apr1/Makefile =================================================================== --- devel/apr1/Makefile (revision 306560) +++ devel/apr1/Makefile (working copy) @@ -23,11 +23,13 @@ # apr OPTIONS_DEFINE= THREADS IPV6 DEVRANDOM # apr-util -OPTIONS_DEFINE+=BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE -OPTIONS_DEFAULT=THREADS IPV6 DEVRANDOM BDB GDBM +OPTIONS_DEFINE+=BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE SSL +OPTIONS_DEFAULT=THREADS IPV6 DEVRANDOM BDB GDBM SSL DEVRANDOM_DESC= Use /dev/random or compatible NDBM_DESC= NDBM support +SSL_DESC= Crypto OpenSSL driver +NSS_DESC= Crypto NSS driver .include @@ -150,6 +152,34 @@ PLIST_SUB+= SQLITE3="@comment " .endif +# crypto (apache24) +.if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS} +APU_CONF_ARGS+= --with-crypto +.endif + +.if ${PORT_OPTIONS:MSSL} +USE_OPENSSL= yes +PLIST_SUB+= SSL="" +CFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} +APU_CONF_ARGS+= --with-openssl=${OPENSSLBASE} +.else +PLIST_SUB+= SSL="@comment " +APU_CONF_ARGS+= --without-openssl +.endif + +# TODO figure out why nss flag is ignored if ssl is set +# this works on other OS as expected +.if ${PORT_OPTIONS:MNSS} +PLIST_SUB+= NSS="" +LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss +CFLAGS+= -I${LOCALBASE}/include/nss +LDFLAGS+= -L${LOCALBASE}/lib/nss +APU_CONF_ARGS+= --with-nss=${LOCALBASE} +.else +PLIST_SUB+= NSS="@comment " +.endif + .if defined(APU_EXTRAS) PLIST_SUB+= APU_EXTRAS="" .else Index: devel/apr1/pkg-plist =================================================================== --- devel/apr1/pkg-plist (revision 306560) +++ devel/apr1/pkg-plist (working copy) @@ -69,6 +69,14 @@ include/apr-1/apu_errno.h include/apr-1/apu_version.h include/apr-1/apu_want.h +%%NSS%%lib/apr-util-1/apr_crypto_nss-1.so +%%NSS%%lib/apr-util-1/apr_crypto_nss.so +%%NSS%%lib/apr-util-1/apr_crypto_nss.la +%%NSS%%lib/apr-util-1/apr_crypto_nss.a +%%SSL%%lib/apr-util-1/apr_crypto_openssl-1.so +%%SSL%%lib/apr-util-1/apr_crypto_openssl.a +%%SSL%%lib/apr-util-1/apr_crypto_openssl.la +%%SSL%%lib/apr-util-1/apr_crypto_openssl.so %%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so %%MYSQL%%lib/apr-util-1/apr_dbd_mysql.a %%MYSQL%%lib/apr-util-1/apr_dbd_mysql.la