Date: Mon, 21 Jul 2014 21:19:01 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362492 - in head/sysutils/torque: . files Message-ID: <201407212119.s6LLJ1St048615@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Mon Jul 21 21:19:01 2014 New Revision: 362492 URL: http://svnweb.freebsd.org/changeset/ports/362492 QAT: https://qat.redports.org/buildarchive/r362492/ Log: - Stagify - Upgrade to 2.5.13. Modified: head/sysutils/torque/Makefile head/sysutils/torque/distinfo head/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in head/sysutils/torque/pkg-plist Modified: head/sysutils/torque/Makefile ============================================================================== --- head/sysutils/torque/Makefile Mon Jul 21 21:14:38 2014 (r362491) +++ head/sysutils/torque/Makefile Mon Jul 21 21:19:01 2014 (r362492) @@ -2,77 +2,40 @@ # $FreeBSD$ PORTNAME= torque -PORTVERSION= 2.5.12 +PORTVERSION= 2.5.13 PORTEPOCH= 1 CATEGORIES= sysutils parallel -MASTER_SITES= http://www.adaptivecomputing.com/index.php?wpfb_dl=77/ \ - http://acadix.biz/Ports/distfiles/ +MASTER_SITES= http://www.adaptivecomputing.com/index.php?wpfb_dl=1643/ MAINTAINER= ports@FreeBSD.org COMMENT= Open source distributed computing resource manager based on PBS -USES= gmake perl5 -USE_AUTOTOOLS= libtool +FETCH_AFTER_ARGS= -o ${DISTDIR}/${DISTFILES} +USES= gmake perl5 libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-syslog \ --disable-spool +MAKE_ENV= DESTDIR=${STAGEDIR}/${PREFIX} USE_RC_SUBR= pbs_server pbs_sched pbs_mom SUB_FILES= pkg-message torque-config USE_LDCONFIG= yes CONFLICTS_INSTALL= qstat-[0-9]* zh-qterm-[0-9]* -MAN1= qalter.1 qdel.1 qhold.1 qmove.1 qmsg.1 qorder.1 qrerun.1 \ - qrls.1 qselect.1 qsig.1 qstat.1 qsub.1 pbs.1 pbsdsh.1 \ - nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1 qchkpt.1 \ - qgpumode.1 qgpureset.1 - -MAN3= rpp.3 tm.3 pbs_alterjob.3 pbs_connect.3 pbs_default.3 \ - pbs_deljob.3 pbs_disconnect.3 pbs_geterrmsg.3 pbs_holdjob.3 \ - pbs_locate.3 pbs_manager.3 pbs_movejob.3 pbs_msgjob.3 \ - pbs_orderjob.3 pbs_rerunjob.3 pbs_rescquery.3 \ - pbs_rescreserve.3 pbs_rlsjob.3 pbs_runjob.3 pbs_selectjob.3 \ - pbs_selstat.3 pbs_sigjob.3 pbs_stagein.3 pbs_statjob.3 \ - pbs_statnode.3 pbs_statque.3 pbs_statserver.3 pbs_submit.3 \ - pbs_terminate.3 pbs_checkpointjob.3 pbs_fbserver.3 \ - pbs_get_server_list.3 pbs_gpumode.3 pbs_gpureset.3 - -MAN7= pbs_job_attributes.7 pbs_queue_attributes.7 \ - pbs_server_attributes.7 pbs_resources_aix4.7 \ - pbs_resources_digitalunix.7 pbs_resources_aix5.7 \ - pbs_resources_darwin.7 pbs_resources_freebsd.7 \ - pbs_resources_fujitsu.7 pbs_resources_hpux10.7 \ - pbs_resources_hpux11.7 pbs_resources_irix5.7 \ - pbs_resources_irix6.7 pbs_resources_irix6array.7 \ - pbs_resources_linux.7 pbs_resources_netbsd.7 \ - pbs_resources_solaris5.7 pbs_resources_solaris7.7 \ - pbs_resources_sp2.7 pbs_resources_sunos4.7 \ - pbs_resources_unicos8.7 pbs_resources_unicosmk2.7 - -MAN8= pbs_mom.8 pbsnodes.8 pbs_sched_basl.8 pbs_sched_cc.8 \ - pbs_sched_tcl.8 pbs_server.8 qdisable.8 qenable.8 \ - qrun.8 qstart.8 qstop.8 qterm.8 - -MLINKS= pbs_sched_cc.8 pbs_sched.8 \ - pbs_resources_freebsd.7 pbs_resources.7 - -NO_STAGE= yes - OPTIONS_DEFINE= EXAMPLES .include <bsd.port.options.mk> -post-patch: - @${REINPLACE_CMD} -E 's|ps[ \t]+-ef|ps -ax|g' ${WRKSRC}/torque.setup - @${REINPLACE_CMD} -E 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure +pre-configure: + ${REINPLACE_CMD} -E 's|ps[ \t]+-ef|ps -ax|g' ${WRKSRC}/torque.setup + ${REINPLACE_CMD} -E 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/torque-config ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/torque-config ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MEXAMPLES} - ${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${STAGEDIR}${EXAMPLESDIR} .else - ${RM} -rf ${EXAMPLESDIR} + ${RM} -rf ${STAGEDIR}${EXAMPLESDIR} .endif - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/sysutils/torque/distinfo ============================================================================== --- head/sysutils/torque/distinfo Mon Jul 21 21:14:38 2014 (r362491) +++ head/sysutils/torque/distinfo Mon Jul 21 21:19:01 2014 (r362492) @@ -1,2 +1,2 @@ -SHA256 (torque-2.5.12.tar.gz) = 436b4d84464e3be0538a4dc0a657b5ae113da6b429d449261e95e13a2a96316b -SIZE (torque-2.5.12.tar.gz) = 5862988 +SHA256 (torque-2.5.13.tar.gz) = ab59d4c8e8b45383ddd8202fa83956816175e348bb955a4ad5f7e3cd4dde5ff9 +SIZE (torque-2.5.13.tar.gz) = 5854910 Modified: head/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in ============================================================================== --- head/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in Mon Jul 21 21:14:38 2014 (r362491) +++ head/sysutils/torque/files/patch-buildutils-pbs_mkdirs.in Mon Jul 21 21:19:01 2014 (r362492) @@ -1,19 +1,11 @@ ---- buildutils/dpbs_mkdirs.in.orig Tue Jun 20 02:22:46 2006 -+++ buildutils/pbs_mkdirs.in Thu Sep 14 15:06:48 2006 -@@ -105,6 +105,7 @@ - # - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+DESTDIR=@prefix@ - CHK_TREE=${DESTDIR}@bindir@/chk_tree - - PBS_DEFAULT_SERVER=@PBS_DEFAULT_SERVER@ -@@ -112,7 +113,7 @@ +--- ./buildutils/pbs_mkdirs.in.orig 2013-08-01 18:10:01.000000000 +0200 ++++ ./buildutils/pbs_mkdirs.in 2014-07-21 22:35:50.000000000 +0200 +@@ -113,7 +113,7 @@ # PBS_SERVER_HOME is defined without DESTDIR so that DEFAULT_FILE and EVIRON # can be based on SERVER_HOME. SERVER_HOME is defined a second time to pick # up DESTDIR -test -n "$PBS_SERVER_HOME" || PBS_SERVER_HOME=@PBS_SERVER_HOME@ -+test -n "$PBS_SERVER_HOME" || PBS_SERVER_HOME=/share/examples/torque/var/spool/torque/ ++test -n "$PBS_SERVER_HOME" || PBS_SERVER_HOME=${prefix}/share/examples/torque/var/spool/torque/ test -n "$PBS_DEFAULT_FILE" || PBS_DEFAULT_FILE=${DESTDIR}@PBS_DEFAULT_FILE@ test -n "$PBS_ENVIRON" || PBS_ENVIRON=${DESTDIR}@PBS_ENVIRON@ Modified: head/sysutils/torque/pkg-plist ============================================================================== --- head/sysutils/torque/pkg-plist Mon Jul 21 21:14:38 2014 (r362491) +++ head/sysutils/torque/pkg-plist Mon Jul 21 21:19:01 2014 (r362492) @@ -41,9 +41,100 @@ include/rpp.h include/tm.h include/tm_.h lib/libtorque.a -lib/libtorque.la lib/libtorque.so lib/libtorque.so.2 +man/man1/basl2c.1.gz +man/man1/nqs2pbs.1.gz +man/man1/pbs.1.gz +man/man1/pbsdsh.1.gz +man/man1/qalter.1.gz +man/man1/qchkpt.1.gz +man/man1/qdel.1.gz +man/man1/qgpumode.1.gz +man/man1/qgpureset.1.gz +man/man1/qhold.1.gz +man/man1/qmgr.1.gz +man/man1/qmove.1.gz +man/man1/qmsg.1.gz +man/man1/qorder.1.gz +man/man1/qrerun.1.gz +man/man1/qrls.1.gz +man/man1/qselect.1.gz +man/man1/qsig.1.gz +man/man1/qstat.1.gz +man/man1/qsub.1.gz +man/man1/xpbs.1.gz +man/man1/xpbsmon.1.gz +man/man3/pbs_alterjob.3.gz +man/man3/pbs_checkpointjob.3.gz +man/man3/pbs_connect.3.gz +man/man3/pbs_default.3.gz +man/man3/pbs_deljob.3.gz +man/man3/pbs_disconnect.3.gz +man/man3/pbs_fbserver.3.gz +man/man3/pbs_get_server_list.3.gz +man/man3/pbs_geterrmsg.3.gz +man/man3/pbs_gpumode.3.gz +man/man3/pbs_gpureset.3.gz +man/man3/pbs_holdjob.3.gz +man/man3/pbs_locate.3.gz +man/man3/pbs_manager.3.gz +man/man3/pbs_movejob.3.gz +man/man3/pbs_msgjob.3.gz +man/man3/pbs_orderjob.3.gz +man/man3/pbs_rerunjob.3.gz +man/man3/pbs_rescquery.3.gz +man/man3/pbs_rescreserve.3.gz +man/man3/pbs_rlsjob.3.gz +man/man3/pbs_runjob.3.gz +man/man3/pbs_selectjob.3.gz +man/man3/pbs_selstat.3.gz +man/man3/pbs_sigjob.3.gz +man/man3/pbs_stagein.3.gz +man/man3/pbs_statjob.3.gz +man/man3/pbs_statnode.3.gz +man/man3/pbs_statque.3.gz +man/man3/pbs_statserver.3.gz +man/man3/pbs_submit.3.gz +man/man3/pbs_terminate.3.gz +man/man3/rpp.3.gz +man/man3/tm.3.gz +man/man7/pbs_job_attributes.7.gz +man/man7/pbs_queue_attributes.7.gz +man/man7/pbs_resources.7.gz +man/man7/pbs_resources_aix4.7.gz +man/man7/pbs_resources_aix5.7.gz +man/man7/pbs_resources_darwin.7.gz +man/man7/pbs_resources_digitalunix.7.gz +man/man7/pbs_resources_freebsd.7.gz +man/man7/pbs_resources_fujitsu.7.gz +man/man7/pbs_resources_hpux10.7.gz +man/man7/pbs_resources_hpux11.7.gz +man/man7/pbs_resources_irix5.7.gz +man/man7/pbs_resources_irix6.7.gz +man/man7/pbs_resources_irix6array.7.gz +man/man7/pbs_resources_linux.7.gz +man/man7/pbs_resources_netbsd.7.gz +man/man7/pbs_resources_solaris5.7.gz +man/man7/pbs_resources_solaris7.7.gz +man/man7/pbs_resources_sp2.7.gz +man/man7/pbs_resources_sunos4.7.gz +man/man7/pbs_resources_unicos8.7.gz +man/man7/pbs_resources_unicosmk2.7.gz +man/man7/pbs_server_attributes.7.gz +man/man8/pbs_mom.8.gz +man/man8/pbs_sched.8.gz +man/man8/pbs_sched_basl.8.gz +man/man8/pbs_sched_cc.8.gz +man/man8/pbs_sched_tcl.8.gz +man/man8/pbs_server.8.gz +man/man8/pbsnodes.8.gz +man/man8/qdisable.8.gz +man/man8/qenable.8.gz +man/man8/qrun.8.gz +man/man8/qstart.8.gz +man/man8/qstop.8.gz +man/man8/qterm.8.gz sbin/momctl sbin/pbs_demux sbin/pbs_iff @@ -89,24 +180,3 @@ sbin/qserverd %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/undelivered -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/spool -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/queues -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/credentials -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_logs -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_logs -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_logs -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/job_logs -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/checkpoint -%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/aux
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407212119.s6LLJ1St048615>