- USES=libtool tar:bzip2

- Use @sample

2 files changed, 7 insertions, 80 deletions

diff --git a/sysutils/slurm-hpc/Makefile b/sysutils/slurm-hpc/Makefile
index 0de207034a4..396687b30d3 100644
--- a/sysutils/slurm-hpc/Makefile
+++ b/sysutils/slurm-hpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	slurm
 PORTVERSION=	2.6.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.schedmd.com/download/archive/ \
 		http://www.schedmd.com/download/latest/ \
@@ -21,11 +21,10 @@ LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo \
 		librrd.so:${PORTSDIR}/databases/rrdtool \
 		libhdf5.so:${PORTSDIR}/science/hdf5
 
-USE_BZIP2=	yes
-USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+USES=		gmake libtool perl5 tar:bzip2
+USE_LDCONFIG=	yes
 USE_PYTHON=	yes
-USES=		perl5 gmake
 
 OPTIONS_DEFINE=	DOCS MYSQL PGSQL GTK2
 
diff --git a/sysutils/slurm-hpc/pkg-plist b/sysutils/slurm-hpc/pkg-plist
index 1cc04d5184a..c500c2afa64 100644
--- a/sysutils/slurm-hpc/pkg-plist
+++ b/sysutils/slurm-hpc/pkg-plist
@@ -17,237 +17,165 @@ bin/srun
 bin/sshare
 bin/sstat
 bin/strigger
-@unexec if cmp -s %D/etc/slurm.conf.sample %D/etc/slurm.conf; then rm -f %D/etc/slurm.conf; fi
-etc/slurm.conf.sample
-@exec if [ ! -f %D/etc/slurm.conf ] ; then cp -p %D/%F %B/slurm.conf; fi
+@sample etc/slurm.conf.sample
 include/slurm/pmi.h
 include/slurm/slurm.h
 include/slurm/slurm_errno.h
 include/slurm/slurmdb.h
 include/slurm/spank.h
 lib/libpmi.a
-lib/libpmi.la
 lib/libpmi.so
 lib/libpmi.so.0
+lib/libpmi.so.0.0.0
 lib/libslurm.a
-lib/libslurm.la
 lib/libslurm.so
 lib/libslurm.so.26
+lib/libslurm.so.26.0.0
 lib/libslurmdb.a
-lib/libslurmdb.la
 lib/libslurmdb.so
 lib/libslurmdb.so.26
+lib/libslurmdb.so.26.0.0
 lib/slurm/accounting_storage_filetxt.a
-lib/slurm/accounting_storage_filetxt.la
 lib/slurm/accounting_storage_filetxt.so
 lib/slurm/accounting_storage_none.a
-lib/slurm/accounting_storage_none.la
 lib/slurm/accounting_storage_none.so
 lib/slurm/accounting_storage_slurmdbd.a
-lib/slurm/accounting_storage_slurmdbd.la
 lib/slurm/accounting_storage_slurmdbd.so
 lib/slurm/acct_gather_energy_none.a
-lib/slurm/acct_gather_energy_none.la
 lib/slurm/acct_gather_energy_none.so
 lib/slurm/acct_gather_energy_rapl.a
-lib/slurm/acct_gather_energy_rapl.la
 lib/slurm/acct_gather_energy_rapl.so
 lib/slurm/acct_gather_filesystem_lustre.a
-lib/slurm/acct_gather_filesystem_lustre.la
 lib/slurm/acct_gather_filesystem_lustre.so
 lib/slurm/acct_gather_filesystem_none.a
-lib/slurm/acct_gather_filesystem_none.la
 lib/slurm/acct_gather_filesystem_none.so
 lib/slurm/acct_gather_infiniband_none.a
-lib/slurm/acct_gather_infiniband_none.la
 lib/slurm/acct_gather_infiniband_none.so
 lib/slurm/acct_gather_profile_hdf5.a
-lib/slurm/acct_gather_profile_hdf5.la
 lib/slurm/acct_gather_profile_hdf5.so
 lib/slurm/acct_gather_profile_none.a
-lib/slurm/acct_gather_profile_none.la
 lib/slurm/acct_gather_profile_none.so
 lib/slurm/auth_munge.a
-lib/slurm/auth_munge.la
 lib/slurm/auth_munge.so
 lib/slurm/auth_none.a
-lib/slurm/auth_none.la
 lib/slurm/auth_none.so
 lib/slurm/checkpoint_none.a
-lib/slurm/checkpoint_none.la
 lib/slurm/checkpoint_none.so
 lib/slurm/checkpoint_ompi.a
-lib/slurm/checkpoint_ompi.la
 lib/slurm/checkpoint_ompi.so
 lib/slurm/crypto_munge.a
-lib/slurm/crypto_munge.la
 lib/slurm/crypto_munge.so
 lib/slurm/crypto_openssl.a
-lib/slurm/crypto_openssl.la
 lib/slurm/crypto_openssl.so
 lib/slurm/ext_sensors_none.a
-lib/slurm/ext_sensors_none.la
 lib/slurm/ext_sensors_none.so
 lib/slurm/ext_sensors_rrd.a
-lib/slurm/ext_sensors_rrd.la
 lib/slurm/ext_sensors_rrd.so
 lib/slurm/gres_gpu.a
-lib/slurm/gres_gpu.la
 lib/slurm/gres_gpu.so
 lib/slurm/gres_mic.a
-lib/slurm/gres_mic.la
 lib/slurm/gres_mic.so
 lib/slurm/gres_nic.a
-lib/slurm/gres_nic.la
 lib/slurm/gres_nic.so
 lib/slurm/job_submit_all_partitions.a
-lib/slurm/job_submit_all_partitions.la
 lib/slurm/job_submit_all_partitions.so
 lib/slurm/job_submit_cnode.a
-lib/slurm/job_submit_cnode.la
 lib/slurm/job_submit_cnode.so
 lib/slurm/job_submit_defaults.a
-lib/slurm/job_submit_defaults.la
 lib/slurm/job_submit_defaults.so
 lib/slurm/job_submit_logging.a
-lib/slurm/job_submit_logging.la
 lib/slurm/job_submit_logging.so
 lib/slurm/job_submit_partition.a
-lib/slurm/job_submit_partition.la
 lib/slurm/job_submit_partition.so
 lib/slurm/job_submit_pbs.a
-lib/slurm/job_submit_pbs.la
 lib/slurm/job_submit_pbs.so
 lib/slurm/job_submit_require_timelimit.a
-lib/slurm/job_submit_require_timelimit.la
 lib/slurm/job_submit_require_timelimit.so
 lib/slurm/jobacct_gather_aix.a
-lib/slurm/jobacct_gather_aix.la
 lib/slurm/jobacct_gather_aix.so
 lib/slurm/jobacct_gather_cgroup.a
-lib/slurm/jobacct_gather_cgroup.la
 lib/slurm/jobacct_gather_cgroup.so
 lib/slurm/jobacct_gather_linux.a
-lib/slurm/jobacct_gather_linux.la
 lib/slurm/jobacct_gather_linux.so
 lib/slurm/jobacct_gather_none.a
-lib/slurm/jobacct_gather_none.la
 lib/slurm/jobacct_gather_none.so
 lib/slurm/jobcomp_filetxt.a
-lib/slurm/jobcomp_filetxt.la
 lib/slurm/jobcomp_filetxt.so
 lib/slurm/jobcomp_none.a
-lib/slurm/jobcomp_none.la
 lib/slurm/jobcomp_none.so
 lib/slurm/jobcomp_script.a
-lib/slurm/jobcomp_script.la
 lib/slurm/jobcomp_script.so
 lib/slurm/launch_slurm.a
-lib/slurm/launch_slurm.la
 lib/slurm/launch_slurm.so
 lib/slurm/mpi_lam.a
-lib/slurm/mpi_lam.la
 lib/slurm/mpi_lam.so
 lib/slurm/mpi_mpich1_p4.a
-lib/slurm/mpi_mpich1_p4.la
 lib/slurm/mpi_mpich1_p4.so
 lib/slurm/mpi_mpich1_shmem.a
-lib/slurm/mpi_mpich1_shmem.la
 lib/slurm/mpi_mpich1_shmem.so
 lib/slurm/mpi_mpichgm.a
-lib/slurm/mpi_mpichgm.la
 lib/slurm/mpi_mpichgm.so
 lib/slurm/mpi_mpichmx.a
-lib/slurm/mpi_mpichmx.la
 lib/slurm/mpi_mpichmx.so
 lib/slurm/mpi_mvapich.a
-lib/slurm/mpi_mvapich.la
 lib/slurm/mpi_mvapich.so
 lib/slurm/mpi_none.a
-lib/slurm/mpi_none.la
 lib/slurm/mpi_none.so
 lib/slurm/mpi_openmpi.a
-lib/slurm/mpi_openmpi.la
 lib/slurm/mpi_openmpi.so
 lib/slurm/mpi_pmi2.a
-lib/slurm/mpi_pmi2.la
 lib/slurm/mpi_pmi2.so
 lib/slurm/preempt_none.a
-lib/slurm/preempt_none.la
 lib/slurm/preempt_none.so
 lib/slurm/preempt_partition_prio.a
-lib/slurm/preempt_partition_prio.la
 lib/slurm/preempt_partition_prio.so
 lib/slurm/preempt_qos.a
-lib/slurm/preempt_qos.la
 lib/slurm/preempt_qos.so
 lib/slurm/priority_basic.a
-lib/slurm/priority_basic.la
 lib/slurm/priority_basic.so
 lib/slurm/priority_multifactor.a
-lib/slurm/priority_multifactor.la
 lib/slurm/priority_multifactor.so
 lib/slurm/proctrack_cgroup.a
-lib/slurm/proctrack_cgroup.la
 lib/slurm/proctrack_cgroup.so
 lib/slurm/proctrack_linuxproc.a
-lib/slurm/proctrack_linuxproc.la
 lib/slurm/proctrack_linuxproc.so
 lib/slurm/proctrack_pgid.a
-lib/slurm/proctrack_pgid.la
 lib/slurm/proctrack_pgid.so
 lib/slurm/sched_backfill.a
-lib/slurm/sched_backfill.la
 lib/slurm/sched_backfill.so
 lib/slurm/sched_builtin.a
-lib/slurm/sched_builtin.la
 lib/slurm/sched_builtin.so
 lib/slurm/sched_hold.a
-lib/slurm/sched_hold.la
 lib/slurm/sched_hold.so
 lib/slurm/sched_wiki.a
-lib/slurm/sched_wiki.la
 lib/slurm/sched_wiki.so
 lib/slurm/sched_wiki2.a
-lib/slurm/sched_wiki2.la
 lib/slurm/sched_wiki2.so
 lib/slurm/select_cons_res.a
-lib/slurm/select_cons_res.la
 lib/slurm/select_cons_res.so
 lib/slurm/select_cray.a
-lib/slurm/select_cray.la
 lib/slurm/select_cray.so
 lib/slurm/select_linear.a
-lib/slurm/select_linear.la
 lib/slurm/select_linear.so
 lib/slurm/select_serial.a
-lib/slurm/select_serial.la
 lib/slurm/select_serial.so
 lib/slurm/spank_pbs.a
-lib/slurm/spank_pbs.la
 lib/slurm/spank_pbs.so
 lib/slurm/src/sattach/sattach.wrapper.c
 lib/slurm/src/srun/srun.wrapper.c
 lib/slurm/switch_none.a
-lib/slurm/switch_none.la
 lib/slurm/switch_none.so
 lib/slurm/task_cgroup.a
-lib/slurm/task_cgroup.la
 lib/slurm/task_cgroup.so
 lib/slurm/task_none.a
-lib/slurm/task_none.la
 lib/slurm/task_none.so
 lib/slurm/topology_3d_torus.a
-lib/slurm/topology_3d_torus.la
 lib/slurm/topology_3d_torus.so
 lib/slurm/topology_node_rank.a
-lib/slurm/topology_node_rank.la
 lib/slurm/topology_node_rank.so
 lib/slurm/topology_none.a
-lib/slurm/topology_none.la
 lib/slurm/topology_none.so
 lib/slurm/topology_tree.a
-lib/slurm/topology_tree.la
 lib/slurm/topology_tree.so
 man/man1/sacct.1.gz
 man/man1/sacctmgr.1.gz