diff options
Diffstat (limited to 'science')
| -rw-r--r-- | science/kalzium/Makefile | 14 | ||||
| -rw-r--r-- | science/kalzium/distinfo | 4 | ||||
| -rw-r--r-- | science/kalzium/pkg-plist | 13 | ||||
| -rw-r--r-- | science/step/Makefile | 15 | ||||
| -rw-r--r-- | science/step/distinfo | 4 | ||||
| -rw-r--r-- | science/step/files/patch-git_b0b45d0 | 50 |
6 files changed, 18 insertions, 82 deletions
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile index f80ba05bfbd9..ee1b0ec61db7 100644 --- a/science/kalzium/Makefile +++ b/science/kalzium/Makefile @@ -2,24 +2,19 @@ PORTNAME= kalzium PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 CATEGORIES= science kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Periodic table of elements for KDE 4 -LIB_DEPENDS= openbabel:${PORTSDIR}/science/openbabel \ - avogadro:${PORTSDIR}/science/avogadro +LIB_DEPENDS= libopenbabel.so:${PORTSDIR}/science/openbabel \ + libavogadro.so:${PORTSDIR}/science/avogadro BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \ ${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile -CONFLICTS= kdeedu-4.[0-6].* - -USE_GCC= yes USE_KDE4= kdehier kdelibs kdeprefix automoc4 USES= cmake:outsource pkgconfig USE_OCAML= yes @@ -29,7 +24,4 @@ USE_QT4= corelib declarative designer opengl script xml \ USE_XZ= yes USE_LDCONFIG= yes -MAN1= kalzium.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/science/kalzium/distinfo b/science/kalzium/distinfo index 7d38c8314b1e..9858e6d1c8b8 100644 --- a/science/kalzium/distinfo +++ b/science/kalzium/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/kalzium-4.10.5.tar.xz) = b673fb965a418ff93f55931c6ec81fb3c43b4fcb2b2fa5c42b75b81fc204f789 -SIZE (KDE/4.10.5/kalzium-4.10.5.tar.xz) = 3710284 +SHA256 (KDE/4.12.2/kalzium-4.12.2.tar.xz) = 9e0eb80fcdbce0097f2b0e00f233c53343288ab916aaea41668f0f660bf8d2be +SIZE (KDE/4.12.2/kalzium-4.12.2.tar.xz) = 3939588 diff --git a/science/kalzium/pkg-plist b/science/kalzium/pkg-plist index ab35511cbe58..914e5231e3ec 100644 --- a/science/kalzium/pkg-plist +++ b/science/kalzium/pkg-plist @@ -17,11 +17,12 @@ lib/kde4/plasma_applet_didyouknow.so lib/kde4/plasma_applet_molmassCalculator.so lib/kde4/plasma_engine_kalzium.so lib/libcompoundviewer.so -lib/libcompoundviewer.so.5 -lib/libcompoundviewer.so.5.0.1 +lib/libcompoundviewer.so.4 +lib/libcompoundviewer.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libscience.so -lib/libscience.so.5 -lib/libscience.so.5.0.1 +lib/libscience.so.4 +lib/libscience.so.%%KDE4_GENERIC_LIB_VERSION%% +man/man1/kalzium.1.gz share/applications/kde4/kalzium.desktop share/applications/kde4/kalzium_cml.desktop share/apps/desktoptheme/default/widgets/chalkboard.svg @@ -374,7 +375,6 @@ share/doc/HTML/en/kalzium/infodialog_misc.png share/doc/HTML/en/kalzium/infodialog_spectrum.png share/doc/HTML/en/kalzium/man-kalzium.1.docbook share/doc/HTML/en/kalzium/quick-1.png -share/doc/HTML/en/kalzium/quick-2.png share/doc/HTML/en/kalzium/quick-3.png share/doc/HTML/en/kalzium/quick-4.png share/doc/HTML/en/kalzium/screenshot-calc-conc.png @@ -397,7 +397,6 @@ share/doc/HTML/en/kalzium/settings2.png share/doc/HTML/en/kalzium/settings3.png share/doc/HTML/en/kalzium/settings4.png share/doc/HTML/en/kalzium/sidebar1.png -share/doc/HTML/en/kalzium/sidebar2.png share/icons/hicolor/128x128/apps/kalzium.png share/icons/hicolor/16x16/apps/kalzium.png share/icons/hicolor/22x22/apps/kalzium.png @@ -413,7 +412,7 @@ share/kde4/services/plasma-dataengine-kalzium.desktop share/kde4/services/plasma_didyouknow.desktop @dirrm share/doc/HTML/en/kalzium @dirrm share/apps/libkdeedu/data -@dirrm share/apps/libkdeedu +@dirrmtry share/apps/libkdeedu @dirrm share/apps/kalzium/qml @dirrm share/apps/kalzium/icons/hicolor/scalable/actions @dirrm share/apps/kalzium/icons/hicolor/scalable diff --git a/science/step/Makefile b/science/step/Makefile index b785e133b903..fbb446f0c403 100644 --- a/science/step/Makefile +++ b/science/step/Makefile @@ -2,31 +2,26 @@ PORTNAME= step PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= science kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 interactive physics simulator -LIB_DEPENDS= qalculate.5:${PORTSDIR}/math/libqalculate \ - gsl:${PORTSDIR}/math/gsl +LIB_DEPENDS= libqalculate.so:${PORTSDIR}/math/libqalculate \ + libgsl.so:${PORTSDIR}/math/gsl BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 -CONFLICTS= kdeedu-4.[0-6].* - USE_KDE4= kdehier kdelibs kdeprefix automoc4 USES= cmake:outsource USE_QT4= opengl moc_build qmake_build rcc_build uic_build USE_XZ= yes -NO_STAGE= yes pre-configure: - # Avoid building translations, should the user pass - # CURRENT_LANG to CMake. +# Avoid building translations, should the user pass +# CURRENT_LANG to CMake. ${REINPLACE_CMD} -e '/set(STEP_BUILD_TRANSLATIONS 1)/ d' \ ${WRKSRC}/${PORTNAME}/data/CMakeLists.txt diff --git a/science/step/distinfo b/science/step/distinfo index 5e9154f05961..6b378fdaabcf 100644 --- a/science/step/distinfo +++ b/science/step/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/step-4.10.5.tar.xz) = ea19672626b228c06b17ec917b0ec45da4f3067a628e430e0ee9ff6ac2b23217 -SIZE (KDE/4.10.5/step-4.10.5.tar.xz) = 376380 +SHA256 (KDE/4.12.2/step-4.12.2.tar.xz) = 861a15106a61525f6bdd3c0904cb6e404c075acc31858f06f8cb26344da549c0 +SIZE (KDE/4.12.2/step-4.12.2.tar.xz) = 361632 diff --git a/science/step/files/patch-git_b0b45d0 b/science/step/files/patch-git_b0b45d0 deleted file mode 100644 index 2c030b5fb9b5..000000000000 --- a/science/step/files/patch-git_b0b45d0 +++ /dev/null @@ -1,50 +0,0 @@ -commit b0b45d0b871c4cdcd714de29f1d587a26366fbca -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Nov 4 00:07:22 2013 +0200 - - Use Eigen2's newer StdVector implementation if it is available. - - This should fix the build with libc++ (ie. recent versions of FreeBSD and OS - X at least), as Eigen2's default StdVector implementation reimplements - std::vector in an incompatible way. - - Defining EIGEN_USE_NEW_STDVECTOR makes Eigen >= 2.0.6 use the new - implementation that does not have these problems and is the default in - Eigen3. - -diff --git a/stepcore/collisionsolver.cc b/stepcore/collisionsolver.cc -index a5d2f90..9a263a8 100644 ---- stepcore/collisionsolver.cc -+++ stepcore/collisionsolver.cc -@@ -23,6 +23,7 @@ - #include <algorithm> - #include <QtGlobal> - -+#define EIGEN_USE_NEW_STDVECTOR - #include <Eigen/StdVector> - - namespace StepCore { -diff --git a/stepcore/collisionsolver.h b/stepcore/collisionsolver.h -index c136d9a..d67d1d0 100644 ---- stepcore/collisionsolver.h -+++ stepcore/collisionsolver.h -@@ -28,6 +28,7 @@ - #include "vector.h" - #include "solver.h" - -+#define EIGEN_USE_NEW_STDVECTOR - #include <Eigen/StdVector> - - namespace StepCore -diff --git a/stepcore/types.h b/stepcore/types.h -index 05dbd9d..b1259a6 100644 ---- stepcore/types.h -+++ stepcore/types.h -@@ -25,6 +25,7 @@ - - #include "object.h" - #include "vector.h" -+#define EIGEN_USE_NEW_STDVECTOR - #include <Eigen/StdVector> - #include <QByteArray> - #include <Eigen/Sparse> |