View | Details | Raw Unified | Return to bug 80320
Collapse All | Expand All

(-)./Makefile (-1 / +4 lines)
Lines 18-23 Link Here
18 
HAS_CONFIGURE=		yes
 18 
HAS_CONFIGURE=		yes
19 
USE_PYTHON=		yes
 19 
USE_PYTHON=		yes
20 
USE_REINPLACE=		yes
 20 
USE_REINPLACE=		yes
21 
USE_OPENSSL=		yes
21 

          22
          

        

        

          22
          
# Customizable settings

          23
          
# Customizable settings

        

        

          23
          
RUNASUSER?=		www

          24
          
RUNASUSER?=		www

        

  

    
      
            Lines 55-61
          
      
      
        Link Here
      
    
  

        

          55
          
.include <bsd.port.pre.mk>

          56
          
.include <bsd.port.pre.mk>

        

        

          56
          

          57
          

        

        

          57
          
# Pass JAVA_HOME as determined by bsd.java.mk

          58
          
# Pass JAVA_HOME as determined by bsd.java.mk

        

          
            

              58
              
CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME}


              59
              
CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \

            

            

              
              

              60
              
			--with-openssl-lib=${OPENSSLLIB} \

            

            


              61
              
			--with-openssl-include=${OPENSSLINC}

            

        

          59
          

          62
          

        

        

          60
          
# Install the Apache plugin if needed

          63
          
# Install the Apache plugin if needed

        

        

          61
          
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)

          64
          
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)

        



(-)./files/patch-configure
      (-5 / +23 lines)




  

    
      
            Lines 1-8
          
      
      
        Link Here
      
    
  

          
            

              1
              
$FreeBSD: ports/www/resin3/files/patch-configure,v 1.2 2005/02/24 22:50:29 hq Exp $


              1
              
--- configure.orig	Wed Jan 12 00:00:26 2005

            

            

              2
              


              2
              
+++ configure	Mon Apr 25 11:21:46 2005

            

            

              3
              
--- configure.orig	Tue Oct 12 18:34:32 2004


              3
              
@@ -8669,20 +8669,6 @@

            

            

              4
              
+++ configure	Tue Oct 12 18:34:48 2004


              
              
            

            

              5
              
@@ -8487,20 +8487,6 @@


            

        

          6
          
 # Using Perl if it's available.

          4
          
 # Using Perl if it's available.

        

        

          7
          
 #

          5
          
 #

        

        

          8
          
 PERL=`which perl`

          6
          
 PERL=`which perl`

        

  

    
      
            Lines 23-25
          
      
      
        Link Here
      
    
  

        

          23
          
 

          21
          
 

        

        

          24
          
 #if test -z "${LD_SHLIB}"; then

          22
          
 #if test -z "${LD_SHLIB}"; then

        

        

          25
          
 #  AC_MSG_ERROR([Can't determine compilation flags.]);

          23
          
 #  AC_MSG_ERROR([Can't determine compilation flags.]);

        

            

              
              
              24
              
@@ -8947,8 +8933,8 @@

            

            

              25
              
 

            

            

              26
              
 if test -z "${OPENSSL_LIB}"; then

            

            

              27
              
   foo=bar

            

            

              28
              
-elif test -r "${OPENSSL_LIB}/libcrypt.so"; then

            

            

              29
              
-  SSL_LIBS="${SSL_LIBS} -lcrypt"

            

            

              30
              
+elif test -r "${OPENSSL_LIB}/libcrypto.so"; then

            

            

              31
              
+  SSL_LIBS="${SSL_LIBS} -lcrypto"

            

            

              32
              
 elif test -r "${OPENSSL_LIB}/libcrypt.dylib"; then

            

            

              33
              
   SSL_LIBS="${SSL_LIBS} -lcrypt"

            

            

              34
              
 elif test -r "${OPENSSL_LIB}/libcrypt.a"; then

            

            

              35
              
@@ -8983,7 +8969,7 @@

            

            

              36
              
   foo=bar

            

            

              37
              
 elif test -z "${OPENSSL_LIB}"; then

            

            

              38
              
   foo=bar

            

            

              39
              
-elif test ! -r "${OPENSSL_LIB}/libcrypt.so" -a \

            

            

              40
              
+elif test ! -r "${OPENSSL_LIB}/libcrypto.so" -a \

            

            

              41
              
           ! -r "${OPENSSL_LIB}/libcrypt.dylib" -a \

            

            

              42
              
           ! -r "${OPENSSL_LIB}/libcrypt.a" ; then

            

            

              43
              
   { { echo "$as_me:$LINENO: error: Can't find valid OpenSSL library in ${OPENSSL_LIB}" >&5

            






  

  Return to bug 80320