From 22b7536d6b5f11159e776882c04f81c51e097b8a Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Tue, 26 May 2020 17:10:15 +0000 Subject: [PATCH] science/fastjet: Enable plugins; Fix the config program --- science/fastjet/Makefile | 8 +++++++- science/fastjet/files/patch-fastjet-config.in | 8 -------- science/fastjet/pkg-plist | 8 ++++++++ 3 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 science/fastjet/files/patch-fastjet-config.in diff --git a/science/fastjet/Makefile b/science/fastjet/Makefile index f871a82e695a..c833bbe36ea3 100644 --- a/science/fastjet/Makefile +++ b/science/fastjet/Makefile @@ -2,6 +2,7 @@ PORTNAME= fastjet DISTVERSION= 3.3.4 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= http://fastjet.fr/repo/ @@ -11,10 +12,15 @@ COMMENT= Package for jet finding in pp and e+e- collisions LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake libtool +RUN_DEPENDS= bash:shells/bash + +USES= fortran gmake libtool shebangfix +SHEBANG_FILES= fastjet-config.in GNU_CONFIGURE= yes USE_LDCONFIG= yes +CONFIGURE_ARGS= --enable-allplugins + LDFLAGS+= -lexecinfo post-install: diff --git a/science/fastjet/files/patch-fastjet-config.in b/science/fastjet/files/patch-fastjet-config.in deleted file mode 100644 index e3dfb4b5c167..000000000000 --- a/science/fastjet/files/patch-fastjet-config.in +++ /dev/null @@ -1,8 +0,0 @@ ---- fastjet-config.in.orig 2020-05-26 16:35:22 UTC -+++ fastjet-config.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # @configure_input@ - # diff --git a/science/fastjet/pkg-plist b/science/fastjet/pkg-plist index 63e9fa53a85d..39a0bfe37900 100644 --- a/science/fastjet/pkg-plist +++ b/science/fastjet/pkg-plist @@ -1,8 +1,10 @@ bin/fastjet-config +include/fastjet/ATLASConePlugin.hh include/fastjet/ActiveAreaSpec.hh include/fastjet/AreaDefinition.hh include/fastjet/CDFJetCluPlugin.hh include/fastjet/CDFMidPointPlugin.hh +include/fastjet/CMSIterativeConePlugin.hh include/fastjet/CircularRange.hh include/fastjet/ClusterSequence.hh include/fastjet/ClusterSequence1GhostPassiveArea.hh @@ -15,6 +17,10 @@ include/fastjet/ClusterSequenceStructure.hh include/fastjet/ClusterSequenceVoronoiArea.hh include/fastjet/ClusterSequenceWithArea.hh include/fastjet/CompositeJetStructure.hh +include/fastjet/D0RunIBaseConePlugin.hh +include/fastjet/D0RunIConePlugin.hh +include/fastjet/D0RunIIConePlugin.hh +include/fastjet/D0RunIpre96ConePlugin.hh include/fastjet/EECambridgePlugin.hh include/fastjet/Error.hh include/fastjet/FunctionOfPseudoJet.hh @@ -30,6 +36,7 @@ include/fastjet/NNH.hh include/fastjet/NestedDefsPlugin.hh include/fastjet/PseudoJet.hh include/fastjet/PseudoJetStructureBase.hh +include/fastjet/PxConePlugin.hh include/fastjet/RangeDefinition.hh include/fastjet/RectangularGrid.hh include/fastjet/SISConeBasePlugin.hh @@ -37,6 +44,7 @@ include/fastjet/SISConePlugin.hh include/fastjet/SISConeSphericalPlugin.hh include/fastjet/Selector.hh include/fastjet/SharedPtr.hh +include/fastjet/TrackJetPlugin.hh include/fastjet/WrappedStructure.hh include/fastjet/config.h include/fastjet/config_auto.h