ports/158695: Fix port: irc/inspircd uses deprecated .include <bsd.openssl.mk>

[Chris Rees]

>Number:         158695
>Category:       ports
>Synopsis:       Fix port: irc/inspircd uses deprecated .include <bsd.openssl.mk>
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 06 21:20:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Chris Rees
>Release:        FreeBSD 8.2-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD zeus.bayofrum.net 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #0: Sat Apr 30 15:09:06 BST 2011 root at zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386


	
>Description:
	Before the introduction of bsd.options.mk there was no way to use USE variables with options.

	Now there is, and we can take advantage of that here!
>How-To-Repeat:
	
>Fix:

	

--- inspircd-openssl-fix.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/inspircd/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	6 Jul 2011 17:51:24 -0000	1.17
+++ Makefile	6 Jul 2011 17:56:06 -0000
@@ -52,7 +52,7 @@
 		GNUTLS	    "Build m_ssl_gnutls module"        off \
 		OPENSSL     "Build m_ssl_openssl module"       off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-extract:
 	@(cd ${WRKDIR} && ${MV} ${PORTNAME} ${DISTNAME})
@@ -98,13 +98,15 @@
 .endif
 
 .if defined(WITH_OPENSSL) && !defined(WITHOUT_OPENSSL)
-.include <${PORTSDIR}/Mk/bsd.openssl.mk>
+USE_OPENSSL=yes
 CONFIGURE_ARGS+=	--enable-openssl
 PLIST_SUB+=	OPENSSL=""
 .else
 PLIST_SUB+=	OPENSSL="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 CONFIGURE_ARGS+=	--enable-extras=${EXTRAS}
 
 post-install:
--- inspircd-openssl-fix.diff ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

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