From owner-svn-ports-head@freebsd.org Wed Oct 31 05:10:53 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D8271079469; Wed, 31 Oct 2018 05:10:53 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E34D48BCF7; Wed, 31 Oct 2018 05:10:52 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 865FB27CB0; Wed, 31 Oct 2018 05:10:52 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9V5Aqoo040831; Wed, 31 Oct 2018 05:10:52 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9V5AoBE040822; Wed, 31 Oct 2018 05:10:50 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201810310510.w9V5AoBE040822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 31 Oct 2018 05:10:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483549 - in head/sysutils: cfengine310 cfengine311 cfengine32 cfengine33 cfengine34 cfengine35 cfengine36 cfengine37 cfengine38 cfengine39 X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/sysutils: cfengine310 cfengine311 cfengine32 cfengine33 cfengine34 cfengine35 cfengine36 cfengine37 cfengine38 cfengine39 X-SVN-Commit-Revision: 483549 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2018 05:10:53 -0000 Author: cy Date: Wed Oct 31 05:10:50 2018 New Revision: 483549 URL: https://svnweb.freebsd.org/changeset/ports/483549 Log: Rather than flag cfengine ports that do not support openssl111 unconditionally BROKEN under FreeBSD 12 & 13, only flag BROKEN when security/openssl is not installed on systems after openssl111 was committed to 12-CURRENT. PR: 232709 Reported by: linimon Modified: head/sysutils/cfengine310/Makefile (contents, props changed) head/sysutils/cfengine311/Makefile (contents, props changed) head/sysutils/cfengine32/Makefile (contents, props changed) head/sysutils/cfengine33/Makefile (contents, props changed) head/sysutils/cfengine34/Makefile (contents, props changed) head/sysutils/cfengine35/Makefile (contents, props changed) head/sysutils/cfengine36/Makefile (contents, props changed) head/sysutils/cfengine37/Makefile (contents, props changed) head/sysutils/cfengine38/Makefile (contents, props changed) head/sysutils/cfengine39/Makefile (contents, props changed) Modified: head/sysutils/cfengine310/Makefile ============================================================================== --- head/sysutils/cfengine310/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine310/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -17,8 +17,6 @@ CPE_VENDOR= gnu DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[1-9]-* .if !defined(MASTERDIR) @@ -72,4 +70,13 @@ MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine311/Makefile ============================================================================== --- head/sysutils/cfengine311/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine311/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -18,8 +18,6 @@ CPE_VENDOR= gnu DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[02-9]-* .if !defined(MASTERDIR) @@ -75,4 +73,13 @@ MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine32/Makefile ============================================================================== --- head/sysutils/cfengine32/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine32/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -17,8 +17,6 @@ CPE_VENDOR= gnu DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} @@ -48,4 +46,13 @@ post-patch: @${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\ ${WRKSRC}/docs/Makefile.in -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine33/Makefile ============================================================================== --- head/sysutils/cfengine33/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine33/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -16,8 +16,6 @@ CPE_VENDOR= gnu DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} @@ -85,4 +83,13 @@ CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE} LIB_DEPENDS+= libvirt.so:devel/libvirt .endif -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine34/Makefile ============================================================================== --- head/sysutils/cfengine34/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine34/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -15,8 +15,6 @@ CPE_VENDOR= gnu DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported CONFLICTS= cfengine-2* cfengine3[0-35-9]-* cfengine31[0-9]-* .if !defined(MASTERDIR) @@ -93,4 +91,13 @@ post-patch: @${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\ ${WRKSRC}/docs/Makefile.in -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine35/Makefile ============================================================================== --- head/sysutils/cfengine35/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine35/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -14,8 +14,6 @@ COMMENT= Systems administration tool for networks DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported LICENSE= GPLv3 @@ -90,4 +88,13 @@ CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE} LIB_DEPENDS+= libvirt.so:devel/libvirt .endif -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine36/Makefile ============================================================================== --- head/sysutils/cfengine36/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine36/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -15,8 +15,6 @@ COMMENT= Systems administration tool for networks DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported CONFLICTS= cfengine-2* cfengine3[0-57-9]-* cfengine31[0-9]-* .if !defined(MASTERDIR) @@ -71,4 +69,13 @@ MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine37/Makefile ============================================================================== --- head/sysutils/cfengine37/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine37/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -13,8 +13,6 @@ COMMENT= Systems administration tool for networks DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported LICENSE= GPLv3 @@ -70,4 +68,13 @@ MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS= libvirt.so:devel/libvirt -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine38/Makefile ============================================================================== --- head/sysutils/cfengine38/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine38/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -14,8 +14,6 @@ COMMENT= Systems administration tool for networks DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported LICENSE= GPLv3 @@ -72,4 +70,13 @@ MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS= libvirt.so:devel/libvirt -.include +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include Modified: head/sysutils/cfengine39/Makefile ============================================================================== --- head/sysutils/cfengine39/Makefile Wed Oct 31 05:10:44 2018 (r483548) +++ head/sysutils/cfengine39/Makefile Wed Oct 31 05:10:50 2018 (r483549) @@ -13,8 +13,6 @@ COMMENT= Systems administration tool for networks DEPRECATED= OpenSSL 1.1.X is not supported. EXPIRATION_DATE= 2021-09-30 -BROKEN_FreeBSD_12= openssl111 is not supported -BROKEN_FreeBSD_13= openssl111 is not supported LICENSE= GPLv3 @@ -74,4 +72,20 @@ MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt -.include +.include + +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif + +.include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif + +.include