ports/51613: [patch] ftp/wget uses USE_OPENSSL and can not be built with openssl from ports

[Oleg Sharoiko]

>Number:         51613
>Category:       ports
>Synopsis:       [patch] ftp/wget uses USE_OPENSSL and can not be built with openssl from ports
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 30 00:50:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Oleg Sharoiko
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
System: FreeBSD brain.cc.rsu.ru 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Mon Apr 28 11:38:32 GMT 2003 os at make.cc.rsu.ru:/usr/src/sys/compile/brain.k7.RELENG_4.2003-04-25 i386


	
>Description:
	ftp/wget uses USE_OPENSSL from bsd.port.mk but starting from the
	moment when openssl was added to the base system bsd.port.mk
	disallows the usage of openssl from ports. A new approach seem
	to exist: security/openssl provides bsd.openssl.mk which gives much
	more flexibility and allows to use any version of openssl.
	The required version can be specified at the build time by adding one
	of the options supported by bsd.openssl.mk
	If no preference was given bsd.openssl.mk has a resonable default
	behaviour to use openssl from base system when it is up to date and
	give preference to version from ports if it's already installed.

>How-To-Repeat:
	

>Fix:
	The following patch will switch from bsd.port.mk to
	bsd.port.pre.mk/bsd.port.post.mk/bsd.openssl.mk
	Unfortunately I can not currently test it with the
	up to date openssl in base system but I believe it
	will be ok.

--- Makefile	25 Apr 2003 11:11:26 -0000	1.62
+++ Makefile	30 Apr 2003 07:25:38 -0000
@@ -20,6 +20,10 @@
 MAINTAINER=	sf at FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP and FTP
 
+#
+# SSL support can be disabled by specifying WITHOUT_SSL=yes
+#
+
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_REINPLACE=	yes
@@ -27,11 +31,6 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS=	--with-ssl=no
-.else
-USE_OPENSSL=	yes
-.endif
 CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib
 
@@ -48,4 +47,11 @@
 post-install:
 	install-info ${PREFIX}/info/wget.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if defined(WITHOUT_SSL)
+CONFIGURE_ARGS=	--with-ssl=no
+.else
+.include "${PORTSDIR}/security/openssl/bsd.openssl.mk"
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
+.endif
+.include <bsd.port.post.mk>

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