ports/151181: [patch] remove dependency of security/tor on security/openssl for > 8.1

[Pascal Stumpf]

>Number:         151181
>Category:       ports
>Synopsis:       [patch] remove dependency of security/tor on security/openssl for > 8.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 03 22:40:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Pascal Stumpf
>Release:        8-STABLE
>Organization:
>Environment:
>Description:
With the import of OpenSSL 0.9.8n into 8.1-RELEASE and subsequent 8-STABLE, it is no longer necessary to install the security/openssl port for versions >= 8.1.

Note that I had to set --with-openssl-dir="" manually in the patch because I need the OSVERSION variable from <bsd.port.pre.mk> in the conditional, which also assigns OPENSSLBASE based on the stuff that comes before the .include <bsd.port.pre.mk>, so I cannot use that.
>How-To-Repeat:

>Fix:
--- Makefile.orig       2010-10-03 23:32:50.000000000 +0200
+++ Makefile    2010-10-04 00:27:11.000000000 +0200
@@ -24,8 +24,6 @@
 CPPFLAGS+=     -I${LOCALBASE}/include
 CONFIGURE_ENV+=        CPPFLAGS="${CPPFLAGS}"
 USE_OPENSSL=   yes
-WITH_OPENSSL_PORT=     yes
-CONFIGURE_ARGS+=       --with-openssl-dir="${OPENSSLBASE}"
 
 OPTIONS=       BUFFREELISTS "freelists for buffer RAM" on \
                GEOIP "track country data" off \
@@ -47,6 +45,13 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} <= 800505
+WITH_OPENSSL_PORT=     yes
+CONFIGURE_ARGS+=       --with-openssl-dir="${LOCALBASE}"
+.else
+CONFIGURE_ARGS+=       --with-openssl-dir="/usr"
+.endif
+
 .if defined(WITH_BUFFREELISTS)
 CONFIGURE_ARGS+=       --enable-buf-freelists
 .else


>Release-Note:
>Audit-Trail:
>Unformatted: