diff --git a/academic/wmcalc/README b/academic/wmcalc/README index 464a9dc1a2..6b8bee5461 100644 --- a/academic/wmcalc/README +++ b/academic/wmcalc/README @@ -1,11 +1,6 @@ +wmcalc (calculator dockapp for windowmaker) + wmcalc is a program designed to act as a simple four-function calculator. It is different from other calculator programs, however in that it is -designed to take up very little desktop space. As such, it can be left +designed to take up very little desktop space. As such, it can be left running on the desktop at all times. - -Note: The coding of this DockApp seems incredibly unorganized and there -are several xpm's that are almost the same thing. It also seems that -for whatever reason the author uses a xpm with the default WM backdrop, -meaning it wont fit in with themed desktops. I may have a patch in the -future that fixes this and also make it use "wmcalc1.xpm". For now, -enjoy it for what it is, a simple WindowMaker calculator. diff --git a/academic/wmcalc/doinst.sh b/academic/wmcalc/doinst.sh index 191f720108..2cb6861d40 100644 --- a/academic/wmcalc/doinst.sh +++ b/academic/wmcalc/doinst.sh @@ -1,3 +1,8 @@ +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi config() { NEW="$1" diff --git a/academic/wmcalc/slack-desc b/academic/wmcalc/slack-desc index 8a26dc0b9d..7b7d82b3a1 100644 --- a/academic/wmcalc/slack-desc +++ b/academic/wmcalc/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -wmcalc: wmcalc (Calculator DockApp) +wmcalc: wmcalc (calculator dockapp for windowMaker) wmcalc: wmcalc: wmcalc is a program designed to act as a simple four-function -wmcalc: calculator. It is different from other calculator programs, however -wmcalc: in that it is designed to take up very little desktop space. As such, +wmcalc: calculator. It is different from other calculator programs, however +wmcalc: in that it is designed to take up very little desktop space. As such, wmcalc: it can be left running on the desktop at all times. wmcalc: -wmcalc: Homepage: http://windowmaker.org/dockapps/?name=wmcalc +wmcalc: wmcalc: wmcalc: wmcalc: diff --git a/academic/wmcalc/wmcalc.SlackBuild b/academic/wmcalc/wmcalc.SlackBuild index c8e2eb286b..0b75dc766c 100644 --- a/academic/wmcalc/wmcalc.SlackBuild +++ b/academic/wmcalc/wmcalc.SlackBuild @@ -27,6 +27,8 @@ # Now maintained by B. Watson +# 20180911 bkw: update for v0.7. + # 20160816 bkw: # - take over maintenance # - BUILD=2 @@ -42,14 +44,10 @@ # - previous version installed man page in wrong place PRGNAM=wmcalc -VERSION=${VERSION:-0.6} +VERSION=${VERSION:-0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# annoyingly, the directory inside the tarball isn't named $PRGNAM-$VERSION -# or even just $PRGNAM. Instead: -TARDIR=dockapps-43ddcdf - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -82,19 +80,24 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $TARDIR +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $TARDIR +cd $PRGNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -make CFLAGS="$SLKCFLAGS" -strip $PRGNAM -make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man/man1 +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux +make install-strip DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man/man1 gzip -9 $PKG/usr/man/man1/$PRGNAM.1 mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new diff --git a/academic/wmcalc/wmcalc.info b/academic/wmcalc/wmcalc.info index 5dc93252fe..09b7df1b66 100644 --- a/academic/wmcalc/wmcalc.info +++ b/academic/wmcalc/wmcalc.info @@ -1,8 +1,8 @@ PRGNAM="wmcalc" -VERSION="0.6" +VERSION="0.7" HOMEPAGE="https://www.dockapps.net/wmcalc" -DOWNLOAD="https://www.dockapps.net/download/wmcalc-0.6.tar.gz" -MD5SUM="0d84c4e1cdb8742c5abf03a34ea03540" +DOWNLOAD="https://www.dockapps.net/download/wmcalc-0.7.tar.gz" +MD5SUM="1ccc2515828f2cfdec8e5be0e9f996c6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""