Index: head/sysutils/condor/Makefile =================================================================== --- head/sysutils/condor/Makefile (revision 487201) +++ head/sysutils/condor/Makefile (revision 487202) @@ -1,89 +1,90 @@ # Created by: Andy Pavlo # $FreeBSD$ # Note: Make sure there are no other versions of HTCondor installed during # build. The build system may pick up incompatible headers and libs. PORTNAME= condor DISTVERSION= 8.4.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils net MASTER_SITES= http://www.acadix.biz/Ports/distfiles/ DISTNAME= condor_src-${PORTVERSION}-all-all MAINTAINER= jwb@FreeBSD.org COMMENT= High-throughput computing on distributively owned resources LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt LIB_DEPENDS= libkrb5support.so:security/krb5 \ libpcre.so:devel/pcre \ libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ ${PY_BOOST} # Does not work with Python 3 USES= cmake:noninja compiler:c++11-lang cpe perl5 pgsql \ python:2.7 shebangfix ssl USE_LDCONFIG= yes + CPE_VENDOR= condor_project SHEBANG_FILES= src/condor_scripts/condor_qsub \ src/condor_gridmanager/remote_gahp \ src/condor_examples/condor_limits_wrapper.sh \ src/condor_examples/condor_schedd.init \ src/condor_starter.V6.1/condor_ssh_to_job_shell_setup \ src/condor_job_router/condor_router_history WRKSRC= ${WRKDIR}/condor-${PORTVERSION} WANT_PGSQL= server CXXFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}:${LOCALBASE}/lib:/usr/lib:/lib -fPIC CMAKE_ARGS= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \ -DCMAKE_EXE_LINKER_FLAGS:STRING=${LDFLAGS} \ -DPYTHON_BOOST_LIB:STRING=${PY_BOOST_LIB} \ -DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \ -DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so SUB_FILES= condor-config condor_config.local pkg-message -PLIST_SUB+= CONDOR_UVER=${PORTVERSION:S/./_/g} +PLIST_SUB= CONDOR_UVER=${PORTVERSION:S/./_/g} USERS= condor GROUPS= ${USERS} USE_RC_SUBR= condor PORTEXAMPLES= * PORTDOCS= * OPTIONS_DEFINE= DOCS EXAMPLES pre-everything:: @( ${PRINTF} "\nWARNING: Condor needs approximately 3GB to build!"; \ ${PRINTF} " Please make sure your build environment has that much space before continuing.\n" ) -post-patch: +pre-configure: @${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 @${REINPLACE_CMD} \ -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 post-install: ${INSTALL_DATA} \ ${STAGEDIR}${ETCDIR}/examples/condor_config.annotated \ ${STAGEDIR}${PREFIX}/etc/condor_config.sample ${INSTALL_DATA} ${WRKDIR}/condor_config.local \ ${STAGEDIR}${PREFIX}/etc/condor_config.local.sample ${INSTALL_SCRIPT} ${WRKDIR}/condor-config ${STAGEDIR}${PREFIX}/sbin .include Index: head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake =================================================================== --- head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake (revision 487201) +++ head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake (revision 487202) @@ -1,20 +1,29 @@ ---- build/cmake/macros/SystemSpecificInformations.cmake.orig 2016-09-29 11:34:28 UTC +--- build/cmake/macros/SystemSpecificInformations.cmake.orig 2017-07-06 19:22:42 UTC +++ build/cmake/macros/SystemSpecificInformations.cmake -@@ -265,6 +265,7 @@ if(UNIX) +@@ -265,6 +265,8 @@ 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? ++ # FreeBSD 8 and later just use CONDOR_FREEBSD ++ # FreeBSD 9 and later require utmpx 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 ) +@@ -273,16 +275,7 @@ if(UNIX) + set( CONDOR_FREEBSD6 ON ) + elseif(FREEBSD_MAJOR MATCHES "7" ) + 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 ) ++ elseif(FREEBSD_MAJOR GREATER "8" ) set( CONDOR_UTMPX ON ) -+ elseif(FREEBSD_MAJOR MATCHES "12" ) -+ set( CONDOR_FREEBSD11 ON ) -+ set( CONDOR_UTMPX ON ) endif() if( CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" ) - set( SYS_ARCH "x86_64") Index: head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake =================================================================== --- head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake (nonexistent) +++ head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake (revision 487202) @@ -0,0 +1,13 @@ +--- src/condor_includes/config.h.cmake.orig 2018-12-10 14:54:32 UTC ++++ src/condor_includes/config.h.cmake +@@ -49,10 +49,6 @@ + #cmakedefine CONDOR_FREEBSD6 + /* Define if on FreeBSD 7 */ + #cmakedefine CONDOR_FREEBSD7 +-///* Define if on FreeBSD 8 */ +-#cmakedefine CONDOR_FREEBSD8 +-///* Define if on FreeBSD 9 */ +-#cmakedefine CONDOR_FREEBSD9 + ///* Define if on FreeBSD 9 or later, which use utmpx insead of utmp */ + #cmakedefine CONDOR_UTMPX + ///* Define if on FreeBSD */ Property changes on: head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property