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! Fix: -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--tSgF7F3BFkg7n6EWbZjYA7k3s3bz5HwxCjLNo7FH8uhYpYID Content-Type: text/plain; name="inspircd-openssl-fix.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="inspircd-openssl-fix.diff" 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:
Responsible Changed From-To: freebsd-ports-bugs->dinoex bsd.openssl.mk is dinoex territory (via the GNATS Auto Assign Tool)
Responsible Changed From-To: dinoex->crees Patch is not for bsd.openssl.mk
Maintainer of irc/inspircd, Please note that PR ports/158695 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/158695 <http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/157607> -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
State Changed From-To: open->feedback Ask for maintainer approval.
crees 2011-07-24 18:24:47 UTC FreeBSD ports repository Modified files: irc/inspircd Makefile Log: - Reset maintainership (5 simultaneous timeouts since Sep/2009) - Use USE_OPENSSL PR: ports/158695 Submitted by: crees Approved by: rene (mentor, implicit) Revision Changes Path 1.18 +4 -4 ports/irc/inspircd/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed