Date: Fri, 21 Oct 2016 20:21:15 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424436 - in head/sysutils/condor: . files Message-ID: <201610212021.u9LKLFHR054189@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Fri Oct 21 20:21:15 2016 New Revision: 424436 URL: https://svnweb.freebsd.org/changeset/ports/424436 Log: sysutils/condor: Update to 8.4.9 Release notes: http://research.cs.wisc.edu/htcondor/manual/v8.4.9/10_3Stable_Release.html - remove patches that have been incorporated upstream - add support for FreeBSD 12 PR: 213627 Submitted by: bacon4000@gmail.com Approved by: swills (maintainer) Differential Revision: https://reviews.freebsd.org/D8316 Deleted: head/sysutils/condor/files/patch-build_cmake_CondorPackageConfig.cmake head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake head/sysutils/condor/files/patch-src_condor__power_power__state.cpp head/sysutils/condor/files/patch-src_condor__sysapi_idle__time.cpp head/sysutils/condor/files/patch-src_condor__utils_condor__config.cpp head/sysutils/condor/files/patch-src_python-bindings_dc__tool.cpp head/sysutils/condor/files/patch-src_python-bindings_secman.cpp Modified: head/sysutils/condor/Makefile head/sysutils/condor/distinfo head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake head/sysutils/condor/pkg-plist Modified: head/sysutils/condor/Makefile ============================================================================== --- head/sysutils/condor/Makefile Fri Oct 21 18:59:00 2016 (r424435) +++ head/sysutils/condor/Makefile Fri Oct 21 20:21:15 2016 (r424436) @@ -1,8 +1,11 @@ # Created by: Andy Pavlo # $FreeBSD$ +# +# Note: Make sure there are no older versions of HTCondor installed during +# build. The build system may pick up incompatible headers and libs. PORTNAME= condor -PORTVERSION= 8.2.8 +PORTVERSION= 8.4.9 CATEGORIES= sysutils net MASTER_SITES= http://www.acadix.biz/Ports/distfiles/ DISTNAME= condor_src-${PORTVERSION}-all-all @@ -18,12 +21,13 @@ BROKEN_powerpc64= Does not build LIB_DEPENDS+= libkrb5support.so:security/krb5 \ libpcre.so:devel/pcre \ libcurl.so:ftp/curl \ - libboost_python.so:devel/boost-python-libs + libboost_python.so:devel/boost-python-libs \ + libexpat.so:textproc/expat2 WRKSRC= ${WRKDIR}/condor-${PORTVERSION} USE_LDCONFIG= yes # Does not build with Python 3 -USES= cmake cpe gmake perl5 pgsql python:2 shebangfix +USES= cmake cpe gmake perl5 pgsql python:2 shebangfix ssl CPE_VENDOR= condor_project SHEBANG_FILES= src/condor_scripts/condor_qsub \ src/condor_gridmanager/remote_gahp \ @@ -40,11 +44,8 @@ CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=${ -DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \ -DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so -# This was an issue in previous releases, but I've tested 8.2.8 extensively -# on machines with as many as 16 cores. -# MAKE_JOBS_UNSAFE= yes - SUB_FILES= condor-config condor_config.local pkg-message +PLIST_SUB+= CONDOR_UVER=${PORTVERSION:S/./_/g} USERS= condor GROUPS= ${USERS} @@ -71,6 +72,7 @@ post-patch: -e 's|/usr/local/condor|${PREFIX}|g' \ -e 's|$$(LOCAL_DIR)/condor_config.local|$$(RELEASE_DIR)/etc/condor_config.local|g' \ -e 's|/bin/mail|/usr/bin/mail|g' \ + -e 's|/usr/bin/java|${LOCALBASE}/bin/java|g' \ -e 's|^CONDOR_HOST|## CONDOR_HOST|' \ -e 's|#CONDOR_IDS=x.x|CONDOR_IDS=466.466|' \ ${WRKSRC}/src/condor_examples/condor_config.annotated Modified: head/sysutils/condor/distinfo ============================================================================== --- head/sysutils/condor/distinfo Fri Oct 21 18:59:00 2016 (r424435) +++ head/sysutils/condor/distinfo Fri Oct 21 20:21:15 2016 (r424436) @@ -1,2 +1,3 @@ -SHA256 (condor_src-8.2.8-all-all.tar.gz) = 4a51232f07ecd6648a8dddeebe92e82ee18e3c4819589c83bbd443189c4a7ded -SIZE (condor_src-8.2.8-all-all.tar.gz) = 19137676 +TIMESTAMP = 1475844209 +SHA256 (condor_src-8.4.9-all-all.tar.gz) = 56be45f54c014680dfd5439749b02fb9da4a11fb5645ff36d22dd0ccef1043ce +SIZE (condor_src-8.4.9-all-all.tar.gz) = 17379991 Modified: head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake ============================================================================== --- head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake Fri Oct 21 18:59:00 2016 (r424435) +++ head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake Fri Oct 21 20:21:15 2016 (r424436) @@ -1,30 +1,19 @@ ---- build/cmake/macros/SystemSpecificInformations.cmake.orig 2015-04-07 15:10:11 UTC +--- build/cmake/macros/SystemSpecificInformations.cmake.orig 2016-09-29 11:34:28 UTC +++ build/cmake/macros/SystemSpecificInformations.cmake -@@ -252,7 +252,8 @@ if(UNIX) - endif(EXISTS "/etc/issue") - - elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -- string(REGEX MATCH "(([0-9]+)\\.([0-9]+))-RELEASE" FREEBSD "${CMAKE_SYSTEM_VERSION}") -+ # Match x.x-RELEASE, x.x-BETA1, etc. -+ string(REGEX MATCH "(([0-9]+)\\.([0-9]+))-([A-Z0-9])+" FREEBSD "${CMAKE_SYSTEM_VERSION}") - set( FREEBSD_RELEASE "${CMAKE_MATCH_1}" ) - set( FREEBSD_MAJOR "${CMAKE_MATCH_2}" ) - set( FREEBSD_MINOR "${CMAKE_MATCH_3}" ) -@@ -270,6 +271,18 @@ if(UNIX) - set( CONDOR_FREEBSD7 ON ) - elseif(FREEBSD_MAJOR MATCHES "8" ) - set( CONDOR_FREEBSD8 ON ) -+ elseif(FREEBSD_MAJOR MATCHES "9" ) -+ set( CONDOR_FREEBSD9 ON ) -+ set( CONDOR_UTMPX ON ) -+ elseif(FREEBSD_MAJOR MATCHES "10" ) -+ set( CONDOR_FREEBSD10 ON ) -+ set( CONDOR_UTMPX ON ) -+ elseif(FREEBSD_MAJOR MATCHES "11" ) -+ set( CONDOR_FREEBSD11 ON ) -+ set( CONDOR_UTMPX ON ) +@@ -265,6 +265,7 @@ if(UNIX) + set( SYSTEM_NAME "freebsd_${FREEBSD_RELEASE}" ) + set( CONDOR_FREEBSD ON ) + set( BSD_UNIX ON ) ++ # FIXME: Is there a >= to replace all the MATCHES operators below? + if(FREEBSD_MAJOR MATCHES "4" ) + set( CONDOR_FREEBSD4 ON ) + elseif(FREEBSD_MAJOR MATCHES "5" ) +@@ -284,6 +285,9 @@ if(UNIX) + elseif(FREEBSD_MAJOR MATCHES "11" ) + set( CONDOR_FREEBSD11 ON ) + set( CONDOR_UTMPX ON ) + elseif(FREEBSD_MAJOR MATCHES "12" ) -+ set( CONDOR_FREEBSD12 ON ) ++ set( CONDOR_FREEBSD11 ON ) + set( CONDOR_UTMPX ON ) endif() if( CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" ) Modified: head/sysutils/condor/pkg-plist ============================================================================== --- head/sysutils/condor/pkg-plist Fri Oct 21 18:59:00 2016 (r424435) +++ head/sysutils/condor/pkg-plist Fri Oct 21 20:21:15 2016 (r424436) @@ -34,6 +34,7 @@ bin/condor_suspend bin/condor_tail bin/condor_test_match bin/condor_transfer_data +bin/condor_update_machine_ad bin/condor_userlog bin/condor_userlog_job_counter bin/condor_userprio @@ -42,15 +43,15 @@ bin/condor_vacate_job bin/condor_version bin/condor_wait bin/condor_who -@sample etc/condor_config.sample -@sample etc/condor_config.local.sample %%ETCDIR%%/condor %%ETCDIR%%/condor_config %%ETCDIR%%/examples/README +%%ETCDIR%%/examples/condor-tmpfiles.conf %%ETCDIR%%/examples/condor.boot.generic %%ETCDIR%%/examples/condor.boot.rpm %%ETCDIR%%/examples/condor.init %%ETCDIR%%/examples/condor.plist +%%ETCDIR%%/examples/condor.service %%ETCDIR%%/examples/condor.sysconfig %%ETCDIR%%/examples/condor_config.annotated %%ETCDIR%%/examples/condor_config.generic @@ -68,6 +69,8 @@ bin/condor_who %%ETCDIR%%/examples/mp2script %%ETCDIR%%/examples/openmpiscript %%ETCDIR%%/sysconfig/condor +@sample etc/condor_config.local.sample +@sample etc/condor_config.sample include/MyString.h include/chirp_client.h include/classad/attrrefs.h @@ -127,7 +130,7 @@ lib/condor_ssh_to_job_sshd_config_templa lib/libchirp_client.a lib/libclassad.a lib/libcondorapi.a -lib/libpyclassad%%PYTHON_VER%%_8_2_8.a +lib/libpyclassad%%PYTHON_VER%%_%%CONDOR_UVER%%.a lib/python/classad.so lib/python/htcondor.so lib/scimark2lib.jar @@ -144,14 +147,17 @@ libexec/condor_power_state libexec/condor_rooster libexec/condor_schedd.init libexec/condor_shared_port +libexec/condor_sinful libexec/condor_ssh libexec/condor_ssh_to_job_shell_setup libexec/condor_ssh_to_job_sshd_setup +libexec/condor_testingd libexec/condor_transferer libexec/condor_urlfetch libexec/curl_plugin libexec/data_plugin libexec/interactive.sub +libexec/libclassad_python_user.so libexec/libvirt_simple_script.awk libexec/sshd.sh man/man1/bosco_cluster.1.gz @@ -180,6 +186,7 @@ man/man1/condor_gpu_discovery.1.gz man/man1/condor_history.1.gz man/man1/condor_hold.1.gz man/man1/condor_install.1.gz +man/man1/condor_job_router_info.1.gz man/man1/condor_master.1.gz man/man1/condor_off.1.gz man/man1/condor_on.1.gz @@ -213,6 +220,7 @@ man/man1/condor_submit_dag.1.gz man/man1/condor_suspend.1.gz man/man1/condor_tail.1.gz man/man1/condor_transfer_data.1.gz +man/man1/condor_update_machine_ad.1.gz man/man1/condor_updates_stats.1.gz man/man1/condor_urlfetch.1.gz man/man1/condor_userlog.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610212021.u9LKLFHR054189>