diff options
| author | ijliao <ijliao@FreeBSD.org> | 2001-12-20 19:15:34 +0800 |
|---|---|---|
| committer | ijliao <ijliao@FreeBSD.org> | 2001-12-20 19:15:34 +0800 |
| commit | e2212bf07185a6eeac0eeef18edaacaa327ba97d (patch) | |
| tree | 7f7a5517fa36e76d77c12cd0dd062fca6400c826 | |
| parent | 6a8d616e950c69e5ee52981cb596e115066b294e (diff) | |
| download | freebsd-ports-graphics-e2212bf07185a6eeac0eeef18edaacaa327ba97d.tar.gz freebsd-ports-graphics-e2212bf07185a6eeac0eeef18edaacaa327ba97d.tar.zst freebsd-ports-graphics-e2212bf07185a6eeac0eeef18edaacaa327ba97d.zip | |
fix finding OpenSSL problem
PR: 15123
Submitted by: Matt Behrens <matt@zigg.com>
| -rw-r--r-- | www/apache13-modssl/Makefile | 6 | ||||
| -rw-r--r-- | www/apache13-modssl/files/patch-src::modules::ssl::libssl.module | 65 |
2 files changed, 71 insertions, 0 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index 7754e0cfa87..8c38221454e 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -102,6 +102,12 @@ pre-patch: post-patch: @cd ${WRKSRC} \ && find . -type f -name "*.orig" -print | xargs ${RM} -f + @${SED} 's#@@PREFIX@@#${PREFIX}#g' \ + < ${WRKSRC}/src/modules/ssl/libssl.module \ + > ${WRKSRC}/src/modules/ssl/libssl.module.NEW + @${MV} \ + ${WRKSRC}/src/modules/ssl/libssl.module.NEW \ + ${WRKSRC}/src/modules/ssl/libssl.module post-build: @cd ${WRKSRC} \ diff --git a/www/apache13-modssl/files/patch-src::modules::ssl::libssl.module b/www/apache13-modssl/files/patch-src::modules::ssl::libssl.module new file mode 100644 index 00000000000..973b460463b --- /dev/null +++ b/www/apache13-modssl/files/patch-src::modules::ssl::libssl.module @@ -0,0 +1,65 @@ +--- src/modules/ssl/libssl.module.broken Fri Dec 10 21:18:47 1999 ++++ src/modules/ssl/libssl.module Fri Dec 10 21:20:22 1999 +@@ -260,7 +260,7 @@ + if [ ".$SSL_BASE" = . ]; then + SSL_BASE=`egrep '^SSL_BASE=' $file | tail -1 | awk -F= '{print $2}'` + if [ ".$SSL_BASE" = . ]; then +- SSL_BASE="/usr/local/ssl" ++ SSL_BASE="@@PREFIX@@/ssl" + fi + fi + case $SSL_BASE in +@@ -340,7 +340,7 @@ + # + if [ ".$SSL_BASE" = .SYSTEM ]; then + SSL_INCDIR="" +- for p in . /usr/include /usr/include/ssl/ /usr/local/include /usr/local/include/ssl; do ++ for p in . /usr/include /usr/include/ssl/ /usr/local/include /usr/local/include/ssl @@PREFIX@@/include; do + if [ -f "$p/openssl/ssl.h" ]; then + SSL_INCDIR="$p" + break +@@ -348,7 +348,7 @@ + done + if [ ".$SSL_INCDIR" = . ]; then + echo "Error: Cannot find SSL header files in any of the following dirs:" 1>&2 +- echo "Error: . /usr/include /usr/include/ssl/ /usr/local/include /usr/local/include/ssl" 1>&2 ++ echo "Error: . /usr/include /usr/include/ssl/ /usr/local/include /usr/local/include/ssl @@PREFIX@@/include" 1>&2 + exit 1 + fi + else +@@ -366,7 +366,7 @@ + # + if [ ".$SSL_BASE" = .SYSTEM ]; then + SSL_LIBDIR="" +- for p in . /lib /usr/lib /usr/local/lib; do ++ for p in . /lib /usr/lib /usr/local/lib @@PREFIX@@/lib; do + if [ -f "$p/libssl.a" -o -f "$p/libssl.so" ]; then + SSL_LIBDIR="$p" + my_real_ssl_libdir="$p" +@@ -375,7 +375,7 @@ + done + if [ ".$SSL_LIBDIR" = . ]; then + echo "Error: Cannot find SSL library files in any of the following dirs:" 1>&2 +- echo "Error: . /lib /usr/lib /usr/local/lib" 1>&2 ++ echo "Error: . /lib /usr/lib /usr/local/lib @@PREFIX@@/lib" 1>&2 + exit 1 + fi + else +@@ -449,7 +449,7 @@ + if [ ".$RSA_BASE" != . ]; then + if [ ".$RSA_BASE" = .SYSTEM ]; then + my_found=no +- for p in . /lib /usr/lib /usr/local/lib; do ++ for p in . /lib /usr/lib /usr/local/lib @@PREFIX@@/lib; do + if [ -f "$p/librsaref.a" -o -f "$p/librsaref.so" ]; then + SSL_LDFLAGS="$SSL_LDFLAGS -L$p" + SSL_LIBS="$SSL_LIBS -lrsaref" +@@ -460,7 +460,7 @@ + done + if [ .$my_found = .no ]; then + echo "Error: Cannot find RSAref library in any of the following dirs:" 1>&2 +- echo "Error: . /lib /usr/lib /usr/local/lib" 1>&2 ++ echo "Error: . /lib /usr/lib /usr/local/lib @@PREFIX@@/lib" 1>&2 + exit 1 + fi + else |