Date: Fri, 7 Feb 2014 14:50:49 +0000 (UTC) From: Bernhard Froehlich <decke@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343252 - in head/sysutils/condor: . files Message-ID: <201402071450.s17EonNJ063976@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: decke Date: Fri Feb 7 14:50:49 2014 New Revision: 343252 URL: http://svnweb.freebsd.org/changeset/ports/343252 QAT: https://qat.redports.org/buildarchive/r343252/ Log: - Update to 8.0.3 - Stagify - Convert dependencies to new shlib format - Add USE_GCC=any for FreeBSD 10 - Add LICENSE=APACHE20 PR: ports/184738 Submitted by: Jason Bacon <jwbacon@tds.net> (maintainer) Deleted: head/sysutils/condor/files/patch-src-condor_scripts-CMakeLists.txt Modified: head/sysutils/condor/Makefile head/sysutils/condor/distinfo head/sysutils/condor/files/patch-build-cmake-CondorPackageConfig.cmake head/sysutils/condor/files/patch-build-cmake-macros-SystemSpecificInformations.cmake head/sysutils/condor/files/patch-src-condor_includes-config.h.cmake head/sysutils/condor/pkg-descr head/sysutils/condor/pkg-install head/sysutils/condor/pkg-plist Modified: head/sysutils/condor/Makefile ============================================================================== --- head/sysutils/condor/Makefile Fri Feb 7 14:47:22 2014 (r343251) +++ head/sysutils/condor/Makefile Fri Feb 7 14:50:49 2014 (r343252) @@ -2,23 +2,24 @@ # $FreeBSD$ PORTNAME= condor -PORTVERSION= 7.8.7 -PORTREVISION= 1 +PORTVERSION= 8.0.3 CATEGORIES= sysutils net -MASTER_SITES= # empty +MASTER_SITES= http://www.acadix.biz/Ports/distfiles/ DISTNAME= condor_src-${PORTVERSION}-all-all MAINTAINER= jwbacon@tds.net -COMMENT= High-throughput distributed batch system +COMMENT= High-throughput computing on distributively owned resources -LIB_DEPENDS+= krb5support:${PORTSDIR}/security/krb5 \ - pcre:${PORTSDIR}/devel/pcre \ - curl:${PORTSDIR}/ftp/curl +LICENSE= APACHE20 + +LIB_DEPENDS+= libkrb5support.so:${PORTSDIR}/security/krb5 \ + libpcre.so:${PORTSDIR}/devel/pcre \ + libcurl.so:${PORTSDIR}/ftp/curl -RESTRICTED= Requires manual distfile fetch WRKSRC= ${WRKDIR}/condor-${PORTVERSION} USE_LDCONFIG= yes USES= cmake gmake perl5 +USE_GCC= any USE_PGSQL= server CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -rpath=${LOCALBASE}/lib:/usr/lib:/lib @@ -35,79 +36,8 @@ USE_RC_SUBR= condor PORTEXAMPLES= * PORTDOCS= * -MANCOMPRESSED= yes - -MAN1= \ - cleanup_release.1 \ - condor_advertise.1 \ - condor_check_userlogs.1 \ - condor_checkpoint.1 \ - condor_chirp.1 \ - condor_cod.1 \ - condor_cold_start.1 \ - condor_cold_stop.1 \ - condor_compile.1 \ - condor_config_bind.1 \ - condor_config_val.1 \ - condor_configure.1 \ - condor_continue.1 \ - condor_dagman.1 \ - condor_fetchlog.1 \ - condor_findhost.1 \ - condor_gather_info.1 \ - condor_glidein.1 \ - condor_history.1 \ - condor_hold.1 \ - condor_load_history.1 \ - condor_master.1 \ - condor_off.1 \ - condor_on.1 \ - condor_power.1 \ - condor_preen.1 \ - condor_prio.1 \ - condor_procd.1 \ - condor_q.1 \ - condor_qedit.1 \ - condor_reconfig.1 \ - condor_release.1 \ - condor_reschedule.1 \ - condor_restart.1 \ - condor_rm.1 \ - condor_router_history.1 \ - condor_router_q.1 \ - condor_router_rm.1 \ - condor_run.1 \ - condor_set_shutdown.1 \ - condor_ssh_to_job.1 \ - condor_stats.1 \ - condor_status.1 \ - condor_store_cred.1 \ - condor_submit.1 \ - condor_submit_dag.1 \ - condor_suspend.1 \ - condor_transfer_data.1 \ - condor_updates_stats.1 \ - condor_userlog.1 \ - condor_userprio.1 \ - condor_vacate.1 \ - condor_vacate_job.1 \ - condor_version.1 \ - condor_wait.1 \ - filelock_midwife.1 \ - filelock_undertaker.1 \ - gidd_alloc.1 \ - install_release.1 \ - procd_ctl.1 \ - uniq_pid_midwife.1 \ - uniq_pid_undertaker.1 - -NO_STAGE= yes .include <bsd.port.pre.mk> -.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE= requires that you go to http://research.cs.wisc.edu/condor/ to register and manually download the source distribution ${DISTNAME}${EXTRACT_SUFX}, place it in ${DISTDIR}, and then run make again -.endif - pre-everything:: @( ${PRINTF} "\nWARNING: Condor needs approximately 3GB to build!"; \ ${PRINTF} " Please make sure your build environment has that much before continuing.\n" ) @@ -116,11 +46,16 @@ post-patch: @${REINPLACE_CMD} \ -e 's,\(set( C_SHARE_EXAMPLES \)share/condor,\1${EXAMPLESDIR_REL},' \ ${WRKSRC}/build/cmake/CondorPackageConfig.cmake + @${REINPLACE_CMD} \ + -e '/create_symlink/d' ${WRKSRC}/src/condor_scripts/CMakeLists.txt post-install: - ${INSTALL_DATA} ${WRKDIR}/condor_config ${ETCDIR} - ${INSTALL_DATA} ${WRKDIR}/condor_config.local ${ETCDIR} + ${INSTALL_DATA} ${WRKDIR}/condor_config ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKDIR}/condor_config.local ${STAGEDIR}${ETCDIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if defined(NOPORTEXAMPLES) + ${RM} -rf ${STAGEDIR}${EXAMPLESDIR} +.endif @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> Modified: head/sysutils/condor/distinfo ============================================================================== --- head/sysutils/condor/distinfo Fri Feb 7 14:47:22 2014 (r343251) +++ head/sysutils/condor/distinfo Fri Feb 7 14:50:49 2014 (r343252) @@ -1,2 +1,2 @@ -SHA256 (condor_src-7.8.7-all-all.tar.gz) = 876dbb3c1135ba4a31c4c25d5db2b072e0de4be1927245cd37a23252bf853d78 -SIZE (condor_src-7.8.7-all-all.tar.gz) = 17325973 +SHA256 (condor_src-8.0.3-all-all.tar.gz) = 8220ae05b50e189a7b9e8018c88a6ebe6316f0affb3f99d3301788f514bd9b1e +SIZE (condor_src-8.0.3-all-all.tar.gz) = 18678759 Modified: head/sysutils/condor/files/patch-build-cmake-CondorPackageConfig.cmake ============================================================================== --- head/sysutils/condor/files/patch-build-cmake-CondorPackageConfig.cmake Fri Feb 7 14:47:22 2014 (r343251) +++ head/sysutils/condor/files/patch-build-cmake-CondorPackageConfig.cmake Fri Feb 7 14:50:49 2014 (r343252) @@ -1,11 +1,11 @@ ---- build/cmake/CondorPackageConfig.cmake.orig 2012-01-17 10:53:14.000000000 -0600 -+++ build/cmake/CondorPackageConfig.cmake 2012-04-07 14:37:17.000000000 -0500 +--- build/cmake/CondorPackageConfig.cmake.orig 2013-09-19 15:12:10.000000000 -0500 ++++ build/cmake/CondorPackageConfig.cmake 2013-10-20 12:04:52.000000000 -0500 @@ -1,3 +1,4 @@ + ############################################################### # # Copyright 2011 Red Hat, Inc. -@@ -144,6 +145,23 @@ +@@ -170,6 +171,23 @@ # enable if we desire native packaging. # set ( CPACK_GENERATOR "${CPACK_GENERATOR};PackageMaker" ) ; # set (CPACK_OSX_PACKAGE_VERSION) Modified: head/sysutils/condor/files/patch-build-cmake-macros-SystemSpecificInformations.cmake ============================================================================== --- head/sysutils/condor/files/patch-build-cmake-macros-SystemSpecificInformations.cmake Fri Feb 7 14:47:22 2014 (r343251) +++ head/sysutils/condor/files/patch-build-cmake-macros-SystemSpecificInformations.cmake Fri Feb 7 14:50:49 2014 (r343252) @@ -1,6 +1,6 @@ ---- build/cmake/macros/SystemSpecificInformations.cmake.orig 2012-01-17 16:53:14.000000000 +0000 -+++ build/cmake/macros/SystemSpecificInformations.cmake 2012-05-06 17:29:25.053492551 +0100 -@@ -230,7 +230,8 @@ +--- build/cmake/macros/SystemSpecificInformations.cmake.orig 2013-09-19 15:12:10.000000000 -0500 ++++ build/cmake/macros/SystemSpecificInformations.cmake 2013-10-20 12:04:52.000000000 -0500 +@@ -241,7 +241,8 @@ endif(EXISTS "/etc/issue") elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") @@ -10,7 +10,7 @@ set( FREEBSD_RELEASE "${CMAKE_MATCH_1}" ) set( FREEBSD_MAJOR "${CMAKE_MATCH_2}" ) set( FREEBSD_MINOR "${CMAKE_MATCH_3}" ) -@@ -248,6 +249,11 @@ +@@ -259,6 +260,11 @@ set( CONDOR_FREEBSD7 ON ) elseif(FREEBSD_MAJOR MATCHES "8" ) set( CONDOR_FREEBSD8 ON ) Modified: head/sysutils/condor/files/patch-src-condor_includes-config.h.cmake ============================================================================== --- head/sysutils/condor/files/patch-src-condor_includes-config.h.cmake Fri Feb 7 14:47:22 2014 (r343251) +++ head/sysutils/condor/files/patch-src-condor_includes-config.h.cmake Fri Feb 7 14:50:49 2014 (r343252) @@ -1,5 +1,5 @@ ---- src/condor_includes/config.h.cmake.orig 2012-01-17 10:53:14.000000000 -0600 -+++ src/condor_includes/config.h.cmake 2012-04-07 14:37:17.000000000 -0500 +--- src/condor_includes/config.h.cmake.orig 2013-09-19 15:12:10.000000000 -0500 ++++ src/condor_includes/config.h.cmake 2013-10-20 12:04:52.000000000 -0500 @@ -47,6 +47,8 @@ #cmakedefine CONDOR_FREEBSD7 ///* Define if on FreeBSD 8 */ Modified: head/sysutils/condor/pkg-descr ============================================================================== --- head/sysutils/condor/pkg-descr Fri Feb 7 14:47:22 2014 (r343251) +++ head/sysutils/condor/pkg-descr Fri Feb 7 14:50:49 2014 (r343252) @@ -1,6 +1,6 @@ Condor is a open-source, specialized workload management system for compute-intensive jobs. Like other full-featured batch systems, Condor -provides a job queueing mechanism, scheduling policy, priority scheme, +provides a job queuing mechanism, scheduling policy, priority scheme, resource monitoring, and resource management. Users submit their serial or parallel jobs to Condor, Condor places them into a queue, chooses when and where to run the jobs based upon a policy, carefully monitors Modified: head/sysutils/condor/pkg-install ============================================================================== --- head/sysutils/condor/pkg-install Fri Feb 7 14:47:22 2014 (r343251) +++ head/sysutils/condor/pkg-install Fri Feb 7 14:50:49 2014 (r343252) @@ -25,6 +25,8 @@ g=condor homedir=/home/condor case $2 in +PRE-INSTALL) + ;; POST-INSTALL) for dir in log spool config execute; do mkdir -p $homedir/$dir Modified: head/sysutils/condor/pkg-plist ============================================================================== --- head/sysutils/condor/pkg-plist Fri Feb 7 14:47:22 2014 (r343251) +++ head/sysutils/condor/pkg-plist Fri Feb 7 14:50:49 2014 (r343252) @@ -1,3 +1,4 @@ +@comment Generated by sysutils/genplist bin/classad_functional_tester bin/classad_version bin/condor_check_userlogs @@ -10,10 +11,12 @@ bin/condor_findhost bin/condor_gather_info bin/condor_history bin/condor_hold +bin/condor_ping bin/condor_power bin/condor_prio bin/condor_q bin/condor_qedit +bin/condor_qsub bin/condor_release bin/condor_reschedule bin/condor_rm @@ -27,6 +30,7 @@ bin/condor_status bin/condor_submit bin/condor_submit_dag bin/condor_suspend +bin/condor_tail bin/condor_test_match bin/condor_transfer_data bin/condor_userlog @@ -36,6 +40,7 @@ bin/condor_vacate bin/condor_vacate_job bin/condor_version bin/condor_wait +bin/condor_who %%ETCDIR%%/condor %%ETCDIR%%/condor_config %%ETCDIR%%/condor_config.local @@ -65,6 +70,7 @@ include/chirp_client.h include/classad/attrrefs.h include/classad/cclassad.h include/classad/classad.h +include/classad/classadCache.h include/classad/classadErrno.h include/classad/classadItor.h include/classad/classad_distribution.h @@ -108,12 +114,8 @@ include/user_log.README include/user_log.c++.h include/write_user_log.h lib/Chirp.jar -lib/Condor.pm lib/CondorJavaInfo.class lib/CondorJavaWrapper.class -lib/CondorPersonal.pm -lib/CondorTest.pm -lib/CondorUtils.pm lib/condor_ssh_to_job_sshd_config_template lib/libchirp_client.a lib/libclassad.a @@ -136,8 +138,77 @@ libexec/condor_ssh_to_job_sshd_setup libexec/condor_transferer libexec/curl_plugin libexec/data_plugin +libexec/interactive.sub libexec/libvirt_simple_script.awk libexec/sshd.sh +man/man1/bosco_cluster.1.gz +man/man1/bosco_findplatform.1.gz +man/man1/bosco_install.1.gz +man/man1/bosco_ssh_start.1.gz +man/man1/bosco_start.1.gz +man/man1/bosco_stop.1.gz +man/man1/bosco_uninstall.1.gz +man/man1/condor_advertise.1.gz +man/man1/condor_check_userlogs.1.gz +man/man1/condor_checkpoint.1.gz +man/man1/condor_chirp.1.gz +man/man1/condor_cod.1.gz +man/man1/condor_compile.1.gz +man/man1/condor_config_val.1.gz +man/man1/condor_configure.1.gz +man/man1/condor_continue.1.gz +man/man1/condor_dagman.1.gz +man/man1/condor_drain.1.gz +man/man1/condor_fetchlog.1.gz +man/man1/condor_findhost.1.gz +man/man1/condor_gather_info.1.gz +man/man1/condor_glidein.1.gz +man/man1/condor_history.1.gz +man/man1/condor_hold.1.gz +man/man1/condor_install.1.gz +man/man1/condor_load_history.1.gz +man/man1/condor_master.1.gz +man/man1/condor_off.1.gz +man/man1/condor_on.1.gz +man/man1/condor_ping.1.gz +man/man1/condor_power.1.gz +man/man1/condor_preen.1.gz +man/man1/condor_prio.1.gz +man/man1/condor_procd.1.gz +man/man1/condor_q.1.gz +man/man1/condor_qedit.1.gz +man/man1/condor_qsub.1.gz +man/man1/condor_reconfig.1.gz +man/man1/condor_release.1.gz +man/man1/condor_reschedule.1.gz +man/man1/condor_restart.1.gz +man/man1/condor_rm.1.gz +man/man1/condor_rmdir.1.gz +man/man1/condor_router_history.1.gz +man/man1/condor_router_q.1.gz +man/man1/condor_router_rm.1.gz +man/man1/condor_run.1.gz +man/man1/condor_set_shutdown.1.gz +man/man1/condor_ssh_to_job.1.gz +man/man1/condor_stats.1.gz +man/man1/condor_status.1.gz +man/man1/condor_store_cred.1.gz +man/man1/condor_submit.1.gz +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_updates_stats.1.gz +man/man1/condor_userlog.1.gz +man/man1/condor_userprio.1.gz +man/man1/condor_vacate.1.gz +man/man1/condor_vacate_job.1.gz +man/man1/condor_version.1.gz +man/man1/condor_wait.1.gz +man/man1/condor_who.1.gz +man/man1/gidd_alloc.1.gz +man/man1/procd_ctl.1.gz +sbin/bosco_install sbin/condor_advertise sbin/condor_c-gahp sbin/condor_c-gahp_worker_thread @@ -145,6 +216,7 @@ sbin/condor_collector sbin/condor_configure sbin/condor_credd sbin/condor_fetchlog +sbin/condor_ft-gahp sbin/condor_gridmanager sbin/condor_had sbin/condor_init @@ -178,10 +250,3 @@ src/chirp/chirp_protocol.h @dirrm %%ETCDIR%%/sysconfig @dirrm %%ETCDIR%%/examples @dirrm %%ETCDIR%% -@cwd / -@dirrmtry home/condor/config -@dirrmtry home/condor/execute -@dirrmtry home/condor/log -@dirrmtry home/condor/spool -@dirrmtry home/condor -@dirrmtry home
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402071450.s17EonNJ063976>