diff options
| author | dinoex <dinoex@FreeBSD.org> | 2007-10-24 04:39:31 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2007-10-24 04:39:31 +0800 |
| commit | 365a8c954f89c298c2c5215e886f9cb1cd0757fe (patch) | |
| tree | 7476d96d0a2cd41764b558d79641faa69b97781c /security | |
| parent | f633160b4a9e81d8f39943fa6327ebadc1386331 (diff) | |
| download | freebsd-ports-graphics-365a8c954f89c298c2c5215e886f9cb1cd0757fe.tar.gz freebsd-ports-graphics-365a8c954f89c298c2c5215e886f9cb1cd0757fe.tar.zst freebsd-ports-graphics-365a8c954f89c298c2c5215e886f9cb1cd0757fe.zip | |
- remove option OPENSSL_OVERWRITE_BASE
it was only supported for FreeBSD 4.x
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 31 | ||||
| -rw-r--r-- | security/openssl/pkg-plist | 27 |
2 files changed, 11 insertions, 47 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 358ace46932..69342a373ba 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -926,34 +926,6 @@ USE_LDCONFIG= yes EXTRACONFIGURE+= zlib .endif -.if defined(OPENSSL_OVERWRITE_BASE) -.if exists(/lib/libcrypto.so) || exists(/lib/libcrypto.so.3) -pre-everything:: - @${ECHO_CMD} "#" - @${ECHO_CMD} "# this ports does not support the dynamic root" - @${ECHO_CMD} "# please undefine OPENSSL_OVERWRITE_BASE" - @${ECHO_CMD} "# and use WITH_OPENSSL_PORT=yes instead." - @${ECHO_CMD} "#" - @${FALSE} - -.endif -.if exists(${DESTDIR}/usr/lib/libcrypto.so.3) && ${OPENSSL_SHLIBVER} != 3 -pre-everything:: - @${ECHO_CMD} "#" - @${ECHO_CMD} "# this ports conflicts with your base system" - @${ECHO_CMD} "# please undefine OPENSSL_OVERWRITE_BASE" - @${ECHO_CMD} "# and use WITH_OPENSSL_PORT=yes instead." - @${ECHO_CMD} "#" - @${FALSE} - -.endif -BASE_SUFFIX= -overwrite-base -PREFIX= /usr -OPENSSLDIR= /etc/ssl -MANPREFIX= ${PREFIX}/openssl -PLIST_SUB+= MANDIR="" -PLIST_SUB+= NOBASE="@comment " -.else .if ${OPENSSL_SHLIBVER_BASE} > ${OPENSSL_SHLIBVER} pre-everything:: @${ECHO_CMD} "#" @@ -966,9 +938,6 @@ pre-everything:: .endif OPENSSLDIR= ${PREFIX}/openssl MANPREFIX= ${PREFIX} -PLIST_SUB+= MANDIR="@comment " -PLIST_SUB+= NOBASE="" -.endif .if defined(BATCH) || defined(OPENSSL_WITH_386) .if ${ARCH} == "i386" diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist index 7ac9b660540..94465400491 100644 --- a/security/openssl/pkg-plist +++ b/security/openssl/pkg-plist @@ -91,22 +91,17 @@ lib/libssl.a libdata/pkgconfig/openssl.pc %%OPENSSL_BETA%%libdata/pkgconfig/libssl.pc %%OPENSSL_BETA%%@dirrm lib/engines -%%NOBASE%%openssl/misc/CA.pl -%%NOBASE%%openssl/misc/CA.sh -%%NOBASE%%openssl/misc/c_hash -%%NOBASE%%openssl/misc/c_info -%%NOBASE%%openssl/misc/c_issuer -%%NOBASE%%openssl/misc/c_name -%%NOBASE%%openssl/openssl.cnf.sample +openssl/misc/CA.pl +openssl/misc/CA.sh +openssl/misc/c_hash +openssl/misc/c_info +openssl/misc/c_issuer +openssl/misc/c_name +openssl/openssl.cnf.sample %%PORTDOCS%%%%DOCSDIR%%/openssl.txt @dirrm include/openssl -%%NOBASE%%@dirrm openssl/certs -%%MANDIR%%@dirrm openssl/man/man1 -%%MANDIR%%@dirrm openssl/man/man3 -%%MANDIR%%@dirrm openssl/man/man5 -%%MANDIR%%@dirrm openssl/man/man7 -%%MANDIR%%@dirrm openssl/man -%%NOBASE%%@dirrm openssl/misc -%%NOBASE%%@dirrm openssl/private -%%NOBASE%%@dirrm openssl +@dirrm openssl/certs +@dirrm openssl/misc +@dirrm openssl/private +@dirrm openssl %%PORTDOCS%%@dirrm %%DOCSDIR%% |