From 872a3a44666f80852f17bd388fa579441e9682be Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 26 May 2020 13:29:10 +0200 Subject: Change remaining PRGNAM -> PKGNAM variables --- deps/hack-font-ttf/hack-font-ttf.SlackBuild | 10 +++++----- deps/libburn/libburn.SlackBuild | 2 +- deps/libsass/libsass.SlackBuild | 2 +- deps/noto-cjk-font-ttf/noto-cjk-font-ttf.SlackBuild | 10 +++++----- deps/noto-font-ttf/noto-font-ttf.SlackBuild | 16 ++++++++-------- deps/opencv/opencv.SlackBuild | 2 +- deps/sassc/sassc.SlackBuild | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/deps/hack-font-ttf/hack-font-ttf.SlackBuild b/deps/hack-font-ttf/hack-font-ttf.SlackBuild index ab48b87..80e0606 100755 --- a/deps/hack-font-ttf/hack-font-ttf.SlackBuild +++ b/deps/hack-font-ttf/hack-font-ttf.SlackBuild @@ -24,7 +24,7 @@ # ----------------------------------------------------------------------------- -PRGNAM=hack-font-ttf +PKGNAM=hack-font-ttf SRCNAM=Hack VERSION=${VERSION:-"2.020"} SRCVER=$(echo $VERSION |tr . _) @@ -33,7 +33,7 @@ BUILD=${BUILD:-1} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG @@ -70,10 +70,10 @@ fi EOT # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ $CWD/CHANGELOG.md $CWD/LICENSE.md $CWD/README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; # Add a package description: @@ -82,5 +82,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/deps/libburn/libburn.SlackBuild b/deps/libburn/libburn.SlackBuild index 5b82850..2bfad39 100755 --- a/deps/libburn/libburn.SlackBuild +++ b/deps/libburn/libburn.SlackBuild @@ -88,7 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-static \ --build=$TARGET diff --git a/deps/libsass/libsass.SlackBuild b/deps/libsass/libsass.SlackBuild index 254f216..3560350 100755 --- a/deps/libsass/libsass.SlackBuild +++ b/deps/libsass/libsass.SlackBuild @@ -92,7 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --build=$TARGET || exit 1 make || exit 1 diff --git a/deps/noto-cjk-font-ttf/noto-cjk-font-ttf.SlackBuild b/deps/noto-cjk-font-ttf/noto-cjk-font-ttf.SlackBuild index 75f65e9..0dc3be1 100755 --- a/deps/noto-cjk-font-ttf/noto-cjk-font-ttf.SlackBuild +++ b/deps/noto-cjk-font-ttf/noto-cjk-font-ttf.SlackBuild @@ -24,7 +24,7 @@ # ----------------------------------------------------------------------------- -PRGNAM=noto-cjk-font-ttf +PKGNAM=noto-cjk-font-ttf SANS=NotoSansCJK SERIF=NotoSerifCJK-Regular VERSION=${VERSION:-"2.001"} @@ -33,7 +33,7 @@ BUILD=${BUILD:-1} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG @@ -67,10 +67,10 @@ EOT # Add documentation: # Files downloaded from https://github.com/googlei18n/noto-cjk -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ $CWD/HISTORY $CWD/LICENSE $CWD/NEWS $CWD/README* \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; # Add a package description: @@ -79,5 +79,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/deps/noto-font-ttf/noto-font-ttf.SlackBuild b/deps/noto-font-ttf/noto-font-ttf.SlackBuild index e9807a2..d9f28af 100755 --- a/deps/noto-font-ttf/noto-font-ttf.SlackBuild +++ b/deps/noto-font-ttf/noto-font-ttf.SlackBuild @@ -24,7 +24,7 @@ # ----------------------------------------------------------------------------- -PRGNAM=noto-font-ttf +PKGNAM=noto-font-ttf SRCNAM=noto-fonts SRCVER=${SRCVER:-"2015-09-29"} VERSION=$(echo $SRCVER | tr - _) @@ -33,7 +33,7 @@ BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG @@ -51,9 +51,9 @@ fi mkdir -p $PKG$FONTDIR cd $TMP -rm -rf ${PRGNAM}-${SRCVER} -mkdir ${PRGNAM}-${SRCVER} -cd ${PRGNAM}-${SRCVER} +rm -rf ${PKGNAM}-${SRCVER} +mkdir ${PKGNAM}-${SRCVER} +cd ${PKGNAM}-${SRCVER} tar xvf $CWD/${SRCNAM}-${SRCVER}-license-adobe.tar.gz || exit 1 chown -R root:root . find . \ @@ -82,10 +82,10 @@ fi EOT # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ FAQ.md LICENSE README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; # Add a package description: @@ -94,5 +94,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/deps/opencv/opencv.SlackBuild b/deps/opencv/opencv.SlackBuild index dc473ed..8b0202b 100755 --- a/deps/opencv/opencv.SlackBuild +++ b/deps/opencv/opencv.SlackBuild @@ -99,7 +99,7 @@ cd build -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_MAN_DIR=man \ - -DINSTALL_DOC_DIR=doc/$PRGNAM-$VERSION \ + -DINSTALL_DOC_DIR=doc/$PKGNAM-$VERSION \ -DSYSCONF_INSTALL_DIR=/etc \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ diff --git a/deps/sassc/sassc.SlackBuild b/deps/sassc/sassc.SlackBuild index 42e753c..eb190d9 100755 --- a/deps/sassc/sassc.SlackBuild +++ b/deps/sassc/sassc.SlackBuild @@ -92,7 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --build=$TARGET || exit 1 make || exit 1 -- cgit v1.2.3