Date: Sat, 10 Sep 2016 01:37:40 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421646 - head/dns/ldns Message-ID: <201609100137.u8A1beq4072022@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Sep 10 01:37:39 2016 New Revision: 421646 URL: https://svnweb.freebsd.org/changeset/ports/421646 Log: dns/ldns: Fix SSL library support, tidy options The makefile for the ldns was very hard to follow due to preprocessor- like hunks changing the logic flow even across targets. As part of the SSL fix, I felt compelled to convert much of the options logic to the modern options framework to make it simpler to follow the makefile logic (as a side benefit the port is a bit more tidy). I also reworked the FreeBSD 9 + GOST option logic to set the new IGNORE_FreeBSD_9 variable if GOST was requested on FreeBSD 9 with the base SSL library. I believe the previous logic using the WITH_OPENSSL_PORT knob and CONFLICTS setting was incorrect. Approvd by: SSL blanket Modified: head/dns/ldns/Makefile Modified: head/dns/ldns/Makefile ============================================================================== --- head/dns/ldns/Makefile Sat Sep 10 00:36:26 2016 (r421645) +++ head/dns/ldns/Makefile Sat Sep 10 01:37:39 2016 (r421646) @@ -15,16 +15,21 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes -USES= cpe gmake libtool +USES= cpe gmake libtool ssl CPE_VENDOR= nlnetlabs -USE_OPENSSL= yes USE_LDCONFIG= yes +CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} + .if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL)) OPTIONS_DEFINE= DOXYGEN EXAMPLES DRILL OPTIONS_DEFAULT= DRILL DRILL_DESC= With drill program + +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen +DOXYGEN_ALL_TARGET= doc +DOXYGEN_INSTALL_TARGET= install-manpages .endif OPTIONS_DEFINE+= GOST \ @@ -39,6 +44,13 @@ RRTYPETA_DESC= Enable draft RR type ta. OPTIONS_SUB= yes +GOST_CONFIGURE_ENABLE= gost +RRTYPENINFO_CONFIGURE_ENABLE= rrtype-ninfo +RRTYPERKEY_CONFIGURE_ENABLE= rrtype-rkey +RRTYPECDS_CONFIGURE_ENABLE= rrtype-cds +RRTYPEURI_CONFIGURE_ENABLE= rrtype-uri +RRTYPETA_CONFIGURE_ENABLE= rrtype-ta + .include <bsd.port.options.mk> .if defined(BUILD_PYLDNS) @@ -52,7 +64,9 @@ LIB_DEPENDS+= libldns.so:dns/ldns BUILD_DEPENDS+= ${LOCALBASE}/bin/swig:devel/swig13 post-patch: - @${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} \ + -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' \ + ${WRKSRC}/Makefile.in .elif defined(BUILD_P5PERL) USES+= perl5 USE_PERL5= build run @@ -70,46 +84,22 @@ post-patch: ALL_TARGET= all INSTALL_TARGET= install-lib install-h install-config -.if ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS+= doxygen:devel/doxygen -ALL_TARGET+= doc -INSTALL_TARGET+=install-manpages -.endif - .endif # BUILD_PYLDNS || BUILD_P5PERL .if ${PORT_OPTIONS:MGOST} -. if ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes -CONFLICTS+= libressl-* +. if !defined(SSL_DEFAULT) || ${SSL_DEFAULT} == "base" +IGNORE_FreeBSD_9= Requires openssl version >= 1.0.0 . endif .else NO_GOST= --disable-gost -CONFIGURE_ARGS+=${NO_GOST} -.endif - -.if ${PORT_OPTIONS:MRRTYPENINFO} -CONFIGURE_ARGS+= --enable-rrtype-ninfo -.endif - -.if ${PORT_OPTIONS:MRRTYPERKEY} -CONFIGURE_ARGS+= --enable-rrtype-rkey -.endif - -.if ${PORT_OPTIONS:MRRTYPECDS} -CONFIGURE_ARGS+= --enable-rrtype-cds -.endif - -.if ${PORT_OPTIONS:MRRTYPEURI} -CONFIGURE_ARGS+= --enable-rrtype-uri -.endif - -.if ${PORT_OPTIONS:MRRTYPETA} -CONFIGURE_ARGS+= --enable-rrtype-ta .endif .if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL)) +post-patch: +# fix list CPPFLAGS in examples/configure for ssl in LOCALBASE case + @${REINPLACE_CMD} -e '/tmp_CPPFLAGS/d' ${WRKSRC}/examples/configure + post-configure: # ac_cv_prog_libtool=../libtool => Always use bundled libtool .if ${PORT_OPTIONS:MEXAMPLES}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609100137.u8A1beq4072022>