Index: head/sysutils/torque/Makefile =================================================================== --- head/sysutils/torque/Makefile (revision 369878) +++ head/sysutils/torque/Makefile (revision 369879) @@ -1,42 +1,42 @@ # Created by: trasz # $FreeBSD$ PORTNAME= torque PORTVERSION= 2.5.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils parallel 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 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} USES= gmake perl5 libtool -USE_AUTOTOOLS= libtoolize 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]* OPTIONS_DEFINE= EXAMPLES .include 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 ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MEXAMPLES} ${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${STAGEDIR}${EXAMPLESDIR} .else ${RM} -rf ${STAGEDIR}${EXAMPLESDIR} .endif .include Index: head/sysutils/torque/files/patch-configure =================================================================== --- head/sysutils/torque/files/patch-configure (revision 369878) +++ head/sysutils/torque/files/patch-configure (revision 369879) @@ -1,35 +1,22 @@ --- configure.orig 2012-04-13 23:06:17.000000000 +0200 +++ configure 2013-04-12 13:23:42.785303064 +0200 -@@ -19730,10 +19730,10 @@ - - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS=" %%LOCALBASE%%/share/libtool/config/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) %%LOCALBASE%%/bin/libtool' - - # Prevent multiple expansion - @@ -20294,8 +20294,8 @@ else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:$LINENO: checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror" >&5 -echo $ECHO_N "checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic" >&5 +echo $ECHO_N "checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic... $ECHO_C" >&6 if test "${ac_cv_cflags_gcc_option__W__Wall__Wno_unused_parameter__Wno_long_long__pedantic__Werror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20309,7 +20309,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_save_CFLAGS="$CFLAGS" -for ac_arg in "-pedantic -Werror % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror" "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror %% no, obsolete" # +for ac_arg in "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic" "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic %% no, obsolete" # do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ Index: head/sysutils/torque/pkg-plist =================================================================== --- head/sysutils/torque/pkg-plist (revision 369878) +++ head/sysutils/torque/pkg-plist (revision 369879) @@ -1,182 +1,183 @@ bin/chk_tree bin/hostn bin/nqs2pbs bin/pbs-config bin/pbs_track bin/pbsdsh bin/pbsnodes bin/printjob bin/printserverdb bin/printtracking bin/qalter bin/qchkpt bin/qdel bin/qdisable bin/qenable bin/qgpumode bin/qgpureset bin/qhold bin/qmgr bin/qmove bin/qmsg bin/qnodes bin/qorder bin/qrerun bin/qrls bin/qrun bin/qselect bin/qsig bin/qstart bin/qstat bin/qstop bin/qsub bin/qterm bin/torque-config bin/tracejob include/pbs_error.h include/pbs_error_db.h include/pbs_ifl.h include/rm.h include/rpp.h include/tm.h include/tm_.h lib/libtorque.a lib/libtorque.so lib/libtorque.so.2 +lib/libtorque.so.2.0.0 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 sbin/pbs_mom sbin/pbs_sched sbin/pbs_server sbin/qnoded sbin/qschedd sbin/qserverd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/torque.setup %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/pbs_environment %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/dedicated_time %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/holidays %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/resource_group %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/sched_config %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/server_name %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/server_priv/nodes %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/undelivered %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/spool %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/queues %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/credentials %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_logs %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_logs %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_logs %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/job_logs %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/checkpoint %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/aux %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%