Date: Thu, 29 Dec 2016 07:11:51 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429872 - in head/sysutils: . cfengine cfengine-masterfiles cfengine-masterfiles310 cfengine-masterfiles36 cfengine-masterfiles37 cfengine-masterfiles38 cfengine-masterfiles39 cfengine3... Message-ID: <201612290711.uBT7BpGj058014@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Dec 29 07:11:50 2016 New Revision: 429872 URL: https://svnweb.freebsd.org/changeset/ports/429872 Log: Welcome the new cfengine and cfengine-masterfiles 3.10. Adjust the other cfengine and cfengine-masterfiles ports CONFLICTS to recognize the new cfengine sister ports. Add cfengine and cfengine-masterfiles 310 to their respective metaports. Added: head/sysutils/cfengine-masterfiles310/ - copied from r428906, head/sysutils/cfengine-masterfiles39/ head/sysutils/cfengine310/ - copied from r428906, head/sysutils/cfengine39/ Deleted: head/sysutils/cfengine310/files/patch-configure.ac Modified: head/sysutils/Makefile head/sysutils/cfengine-masterfiles/Makefile head/sysutils/cfengine-masterfiles310/Makefile head/sysutils/cfengine-masterfiles310/distinfo head/sysutils/cfengine-masterfiles310/pkg-plist head/sysutils/cfengine-masterfiles36/Makefile head/sysutils/cfengine-masterfiles37/Makefile head/sysutils/cfengine-masterfiles38/Makefile head/sysutils/cfengine-masterfiles39/Makefile head/sysutils/cfengine/Makefile head/sysutils/cfengine310/Makefile head/sysutils/cfengine310/distinfo head/sysutils/cfengine310/pkg-plist head/sysutils/cfengine32/Makefile head/sysutils/cfengine33/Makefile head/sysutils/cfengine34/Makefile head/sysutils/cfengine35/Makefile head/sysutils/cfengine36/Makefile head/sysutils/cfengine37/Makefile head/sysutils/cfengine38/Makefile head/sysutils/cfengine39/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -138,6 +138,7 @@ SUBDIR += cfengine-masterfiles37 SUBDIR += cfengine-masterfiles38 SUBDIR += cfengine-masterfiles39 + SUBDIR += cfengine-masterfiles310 SUBDIR += cfengine22 SUBDIR += cfengine32 SUBDIR += cfengine33 @@ -147,6 +148,7 @@ SUBDIR += cfengine37 SUBDIR += cfengine38 SUBDIR += cfengine39 + SUBDIR += cfengine310 SUBDIR += chgrep SUBDIR += chyves SUBDIR += cinnamon-control-center Modified: head/sysutils/cfengine-masterfiles/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine-masterfiles/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -1,6 +1,6 @@ # $FreeBSD$ -VERSIONS= 36 37 38 39 +VERSIONS= 36 37 38 39 310 CFENGINE_VERSION?= 39 MASTERDIR= ${.CURDIR}/../cfengine-masterfiles${CFENGINE_VERSION} Modified: head/sysutils/cfengine-masterfiles310/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles39/Makefile Mon Dec 19 04:34:49 2016 (r428906) +++ head/sysutils/cfengine-masterfiles310/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cfengine-masterfiles -PORTVERSION= 3.9.1 +PORTVERSION= 3.10.0 CATEGORIES= sysutils MASTER_SITES= https://cfengine-package-repos.s3.amazonaws.com/tarballs/ @@ -16,17 +16,17 @@ LICENSE= GPLv3 CPE_VENDOR= gnu .if !defined(MASTERDIR) -PKGNAMESUFFIX= 39 +PKGNAMESUFFIX= 310 .endif RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX} FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-masterfiles[679]* +CONFLICTS= cfengine-masterfiles[6-9]* MAKE_JOBS_UNSAFE= yes -USES= cpe +USES= cpe gmake HAS_CONFIGURE= yes EXAMPLESDIR= ${PREFIX}/share/examples/cfengine-masterfiles CONFIGURE_ARGS= --prefix=${EXAMPLESDIR} Modified: head/sysutils/cfengine-masterfiles310/distinfo ============================================================================== --- head/sysutils/cfengine-masterfiles39/distinfo Mon Dec 19 04:34:49 2016 (r428906) +++ head/sysutils/cfengine-masterfiles310/distinfo Thu Dec 29 07:11:50 2016 (r429872) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470432585 -SHA256 (cfengine-masterfiles-3.9.1.tar.gz) = 99d59ea4229253ef2e35fc30c33d5e2605fab1144af7b16562affcceabddb03a -SIZE (cfengine-masterfiles-3.9.1.tar.gz) = 426996 +TIMESTAMP = 1482954176 +SHA256 (cfengine-masterfiles-3.10.0.tar.gz) = 64c086c91f10e4b72d45915033006e0bdce33ec247cd5bec67989e24e02eeb51 +SIZE (cfengine-masterfiles-3.10.0.tar.gz) = 453672 Modified: head/sysutils/cfengine-masterfiles310/pkg-plist ============================================================================== --- head/sysutils/cfengine-masterfiles39/pkg-plist Mon Dec 19 04:34:49 2016 (r428906) +++ head/sysutils/cfengine-masterfiles310/pkg-plist Thu Dec 29 07:11:50 2016 (r429872) @@ -1,4 +1,3 @@ - %%EXAMPLESDIR%%/masterfiles/cfe_internal/CFE_cfengine.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/core/deprecated/cfengine_processes.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/core/host_info_report.cf @@ -15,9 +14,13 @@ %%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/main.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/mission_portal.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/httpd.conf.mustache +%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.php.mustache +%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.sh.mustache %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_dc_workflow.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_local_git_remote.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_update_from_repository.cf +%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/lib.cf +%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/systemd_units.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_bins.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_policy.cf %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_processes.cf @@ -98,12 +101,23 @@ %%EXAMPLESDIR%%/masterfiles/lib/services.cf %%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf %%EXAMPLESDIR%%/masterfiles/lib/storage.cf +%%EXAMPLESDIR%%/masterfiles/lib/testing.cf %%EXAMPLESDIR%%/masterfiles/lib/users.cf %%EXAMPLESDIR%%/masterfiles/lib/vcs.cf %%EXAMPLESDIR%%/masterfiles/promises.cf %%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf %%EXAMPLESDIR%%/masterfiles/services/main.cf %%EXAMPLESDIR%%/masterfiles/sketches/meta/api-runfile.cf +%%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cf-consumer.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cf-hub.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cf-monitord.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cf-postgres.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cf-redis-server.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cf-runalerts.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cf-serverd.service.mustache +%%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache %%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache %%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache %%EXAMPLESDIR%%/masterfiles/update.cf Modified: head/sysutils/cfengine-masterfiles36/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles36/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine-masterfiles36/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -23,7 +23,7 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine$ FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-masterfiles[7-9]* +CONFLICTS= cfengine-masterfiles[17-9]* MAKE_JOBS_UNSAFE= yes USES= cpe Modified: head/sysutils/cfengine-masterfiles37/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles37/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine-masterfiles37/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -23,7 +23,7 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine$ FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-masterfiles[689]* +CONFLICTS= cfengine-masterfiles[1689]* MAKE_JOBS_UNSAFE= yes USES= cpe Modified: head/sysutils/cfengine-masterfiles38/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles38/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine-masterfiles38/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -23,7 +23,7 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine$ FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-masterfiles[679]* +CONFLICTS= cfengine-masterfiles[1679]* MAKE_JOBS_UNSAFE= yes USES= cpe Modified: head/sysutils/cfengine-masterfiles39/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles39/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine-masterfiles39/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -23,7 +23,7 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine$ FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-masterfiles[679]* +CONFLICTS= cfengine-masterfiles[1678]* MAKE_JOBS_UNSAFE= yes USES= cpe Modified: head/sysutils/cfengine/Makefile ============================================================================== --- head/sysutils/cfengine/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -1,6 +1,6 @@ # $FreeBSD$ -VERSIONS= 22 32 33 34 35 36 37 38 39 +VERSIONS= 22 32 33 34 35 36 37 38 39 310 CFENGINE_VERSION?= 39 MASTERDIR= ${.CURDIR}/../cfengine${CFENGINE_VERSION} Modified: head/sysutils/cfengine310/Makefile ============================================================================== --- head/sysutils/cfengine39/Makefile Mon Dec 19 04:34:49 2016 (r428906) +++ head/sysutils/cfengine310/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= cfengine -PORTVERSION= 3.9.1 -PORTREVISION= 5 -# XXX Remember to update files/patch-configure.am with any new version number. +PORTVERSION= 3.10.0 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/ @@ -18,19 +16,19 @@ LICENSE= GPLv3 CPE_VENDOR= gnu .if !defined(MASTERDIR) -PKGNAMESUFFIX= 39 +PKGNAMESUFFIX= 310 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[2-79]* +CONFLICTS= cfengine-[12-9]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -USES= autoreconf:build \ +USES= autoreconf \ cpe gmake libtool shebangfix ssl USE_GNOME= libxml2 SHEBANG_FILES= examples/remake_outputs.pl @@ -63,6 +61,7 @@ PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= --with-postgresql=${LOCALBASE} MYSQL_USES= mysql +MYSQL_BROKEN= configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL. MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE} MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT} MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql Modified: head/sysutils/cfengine310/distinfo ============================================================================== --- head/sysutils/cfengine39/distinfo Mon Dec 19 04:34:49 2016 (r428906) +++ head/sysutils/cfengine310/distinfo Thu Dec 29 07:11:50 2016 (r429872) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470238660 -SHA256 (cfengine-3.9.1.tar.gz) = 19bf900741efe3da4266591985dc1103243cb751888047694fce6f407ef2d225 -SIZE (cfengine-3.9.1.tar.gz) = 2278474 +TIMESTAMP = 1482913171 +SHA256 (cfengine-3.10.0.tar.gz) = 8bf344eb6e9c06c0e12c1b23f5c793f43d43007826652e563cb9b2516742ecd5 +SIZE (cfengine-3.10.0.tar.gz) = 2352509 Modified: head/sysutils/cfengine310/pkg-plist ============================================================================== --- head/sysutils/cfengine39/pkg-plist Mon Dec 19 04:34:49 2016 (r428906) +++ head/sysutils/cfengine310/pkg-plist Thu Dec 29 07:11:50 2016 (r429872) @@ -1,4 +1,5 @@ libexec/cfengine/libpromises.so +libexec/cfengine/libpromises.so.3 libexec/cfengine/libpromises.so.3.0.6 sbin/cf-agent sbin/cf-execd @@ -127,6 +128,7 @@ sbin/rpmvercmp %%DOCSDIR%%/examples/getmacaddress.cf %%DOCSDIR%%/examples/getregistry.cf %%DOCSDIR%%/examples/getuid.cf +%%DOCSDIR%%/examples/getuserinfo.cf %%DOCSDIR%%/examples/getusers.cf %%DOCSDIR%%/examples/getvalues.cf %%DOCSDIR%%/examples/getvariablemetatags.cf @@ -160,6 +162,7 @@ sbin/rpmvercmp %%DOCSDIR%%/examples/islessthan.cf %%DOCSDIR%%/examples/islink.cf %%DOCSDIR%%/examples/isnewerthan.cf +%%DOCSDIR%%/examples/isipinsubnet.cf %%DOCSDIR%%/examples/isplain.cf %%DOCSDIR%%/examples/isvariable.cf %%DOCSDIR%%/examples/iteration.cf @@ -259,6 +262,7 @@ sbin/rpmvercmp %%DOCSDIR%%/examples/product.cf %%DOCSDIR%%/examples/promise_knowledge.cf %%DOCSDIR%%/examples/promises.cf +%%DOCSDIR%%/examples/quoting.cf %%DOCSDIR%%/examples/randomint.cf %%DOCSDIR%%/examples/readcsv.cf %%DOCSDIR%%/examples/readdata.cf @@ -310,6 +314,7 @@ sbin/rpmvercmp %%DOCSDIR%%/examples/service_start.cf %%DOCSDIR%%/examples/services.cf %%DOCSDIR%%/examples/services_concept.cf +%%DOCSDIR%%/examples/services_default_service_bundle.cf %%DOCSDIR%%/examples/services_win.cf %%DOCSDIR%%/examples/setuidlog.cf %%DOCSDIR%%/examples/setvar.cf @@ -355,6 +360,7 @@ sbin/rpmvercmp %%DOCSDIR%%/examples/varclass.cf %%DOCSDIR%%/examples/varexpansion.cf %%DOCSDIR%%/examples/variablesmatching.cf +%%DOCSDIR%%/examples/variablesmatching_as_data.cf %%DOCSDIR%%/examples/varnet.cf %%DOCSDIR%%/examples/vars.cf %%DOCSDIR%%/examples/warnifline.cf @@ -367,5 +373,6 @@ sbin/rpmvercmp @dir /var/cfengine/inputs @dir /var/cfengine/modules @dir /var/cfengine/outputs +@dir /var/cfengine/plugins @dir(root,wheel,700) /var/cfengine/ppkeys @dir /var/cfengine Modified: head/sysutils/cfengine32/Makefile ============================================================================== --- head/sysutils/cfengine32/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine32/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -17,7 +17,7 @@ CPE_VENDOR= gnu FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[2]* cfengine-3.[3-9]* cfengine-devel-* +CONFLICTS= cfengine-[2]* cfengine-3.[13-9]* cfengine-devel-* USE_RC_SUBR= cf-execd cf-serverd Modified: head/sysutils/cfengine33/Makefile ============================================================================== --- head/sysutils/cfengine33/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine33/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -16,7 +16,7 @@ CPE_VENDOR= gnu FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-2* cfengine-3.[24-9]* cfengine-devel-* +CONFLICTS= cfengine-2* cfengine-3.[124-9]* cfengine-devel-* USE_RC_SUBR= cf-execd cf-serverd Modified: head/sysutils/cfengine34/Makefile ============================================================================== --- head/sysutils/cfengine34/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine34/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -19,7 +19,7 @@ PKGNAMESUFFIX= 34 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-2* cfengine-3.[235-9]* cfengine-devel-* +CONFLICTS= cfengine-2* cfengine-3.[1235-9]* cfengine-devel-* USE_RC_SUBR= cf-execd cf-serverd Modified: head/sysutils/cfengine35/Makefile ============================================================================== --- head/sysutils/cfengine35/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine35/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -24,7 +24,7 @@ PKGNAMESUFFIX= 35 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[2346-9]* +CONFLICTS= cfengine-[12346-9]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord Modified: head/sysutils/cfengine36/Makefile ============================================================================== --- head/sysutils/cfengine36/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine36/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -23,7 +23,7 @@ CPE_VENDOR= gnu FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[2-57-9]* +CONFLICTS= cfengine-[12-57-9]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord Modified: head/sysutils/cfengine37/Makefile ============================================================================== --- head/sysutils/cfengine37/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine37/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -22,7 +22,7 @@ PKGNAMESUFFIX= 37 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[2-689]* +CONFLICTS= cfengine-[12-689]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord Modified: head/sysutils/cfengine38/Makefile ============================================================================== --- head/sysutils/cfengine38/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine38/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -22,7 +22,7 @@ PKGNAMESUFFIX= 38 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[2-79]* +CONFLICTS= cfengine-[12-79]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord Modified: head/sysutils/cfengine39/Makefile ============================================================================== --- head/sysutils/cfengine39/Makefile Thu Dec 29 07:04:19 2016 (r429871) +++ head/sysutils/cfengine39/Makefile Thu Dec 29 07:11:50 2016 (r429872) @@ -22,7 +22,7 @@ PKGNAMESUFFIX= 39 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[2-79]* +CONFLICTS= cfengine-[12-78]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612290711.uBT7BpGj058014>