[rkward] macports: macports: fixed bundle name (KF5 instead of KDE)
m.eik michalke
null at kde.org
Wed Mar 28 19:16:30 UTC 2018
Git commit 5b5e22cff6625d1f9ea758a6d71917bd377329d8 by m.eik michalke.
Committed on 28/03/2018 at 19:16.
Pushed by meikm into branch 'master'.
macports: fixed bundle name (KF5 instead of KDE)
M +5 -5 macports/update_bundle.sh
https://commits.kde.org/rkward/5b5e22cff6625d1f9ea758a6d71917bd377329d8
diff --git a/macports/update_bundle.sh b/macports/update_bundle.sh
index fcf82fc8..816db167 100755
--- a/macports/update_bundle.sh
+++ b/macports/update_bundle.sh
@@ -444,7 +444,7 @@ if $COPYMDMD ; then
TARGETVERS="$PORTVERS"
fi
fi
- KDEVERS=$("${MPTINST}/bin/port" list kdelibs4 | sed -e "s/.*@//;s/[[:space:]].*//")
+ KDEVERS=$("${MPTINST}/bin/port" list kf5-kparts | sed -e "s/.*@//;s/[[:space:]].*//")
fi
# get R version, long and short
@@ -541,9 +541,9 @@ if $MAKEMDMD ; then
if $COPYMDMD ; then
MPKGFILE="${WORKDIR}/${PTARGET}-${PORTVERS}.mpkg"
if $BINARY ; then
- TRGTFILE="${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_OSX${OSXVERSION}_KDE-${KDEVERS}_needs_CRAN_R-${RVERS}.pkg"
+ TRGTFILE="${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_OSX${OSXVERSION}_KF5-${KDEVERS}_needs_CRAN_R-${RVERS}.pkg"
else
- TRGTFILE="${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_R-${RVERS}_KDE-${KDEVERS}_MacOSX${OSXVERSION}_bundle.pkg"
+ TRGTFILE="${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_R-${RVERS}_KF5-${KDEVERS}_MacOSX${OSXVERSION}_bundle.pkg"
fi
if ! [ -d "${LPUBDIR}" ] ; then
echo "creating directory: ${LPUBDIR}"
@@ -570,9 +570,9 @@ if $MKSRCTAR ; then
# copy the source archive to a public directory
if $COPYMDMD ; then
if $BINARY ; then
- TRGSFILE="${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_OSX${OSXVERSION}_KDE-${KDEVERS}_src.tar"
+ TRGSFILE="${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_OSX${OSXVERSION}_KF5-${KDEVERS}_src.tar"
else
- TRGSFILE="${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_OSX${OSXVERSION}_R-${RVERS}_KDE-${KDEVERS}_src.tar"
+ TRGSFILE="${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_OSX${OSXVERSION}_R-${RVERS}_KF5-${KDEVERS}_src.tar"
fi
if ! [ -d "${LPUBDIR}" ] ; then
echo "creating directory: ${LPUBDIR}"
More information about the rkward-tracker
mailing list