diff --git a/system/linuxconsoletools/linuxconsoletools-1.4.4.patch b/system/linuxconsoletools/linuxconsoletools-1.4.4.patch deleted file mode 100644 index b9a1a72313..0000000000 --- a/system/linuxconsoletools/linuxconsoletools-1.4.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru linuxconsoletools-1.4.4.orig/docs/Makefile linuxconsoletools-1.4.4/docs/Makefile ---- linuxconsoletools-1.4.4.orig/docs/Makefile 2011-12-15 16:49:01.000000000 +0100 -+++ linuxconsoletools-1.4.4/docs/Makefile 2012-12-11 08:46:08.276507553 +0100 -@@ -26,7 +26,7 @@ - PREFIX ?= /usr/local - - install: -- install -d $(DESTDIR)$(PREFIX)/share/man/man1 -- install $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1 -+ install -d $(DESTDIR)$(PREFIX)/man/man1 -+ install $(MANPAGES) $(DESTDIR)$(PREFIX)/man/man1 - - .PHONY: install diff --git a/system/linuxconsoletools/linuxconsoletools.SlackBuild b/system/linuxconsoletools/linuxconsoletools.SlackBuild index ef30234847..f968883ac9 100644 --- a/system/linuxconsoletools/linuxconsoletools.SlackBuild +++ b/system/linuxconsoletools/linuxconsoletools.SlackBuild @@ -22,8 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20140315 bkw: took over maintenance, updated for 1.4.7, replaced patch +# with a bit of sed. + PRGNAM=linuxconsoletools -VERSION=${VERSION:-1.4.4} +VERSION=${VERSION:-1.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,13 +67,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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 {} \; -# Patch to install manpages in /usr/man instead of /usr/share/man -patch -p1 < $CWD/$PRGNAM-$VERSION.patch +# install manpages in /usr/man instead of /usr/share/man +sed -i 's,share/man,man,g' docs/Makefile # No ./configure provided make CFLAGS="$SLKCFLAGS" PREFIX=/usr diff --git a/system/linuxconsoletools/linuxconsoletools.info b/system/linuxconsoletools/linuxconsoletools.info index 0eb79f31ba..433d9d354f 100644 --- a/system/linuxconsoletools/linuxconsoletools.info +++ b/system/linuxconsoletools/linuxconsoletools.info @@ -1,10 +1,10 @@ PRGNAM="linuxconsoletools" -VERSION="1.4.4" +VERSION="1.4.7" HOMEPAGE="http://sourceforge.net/projects/linuxconsole/" -DOWNLOAD="http://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.4.4.tar.bz2" -MD5SUM="4ae531759fb7b2315db941a0bea52884" +DOWNLOAD="http://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.4.7.tar.bz2" +MD5SUM="fc839ab0dd04718244e17eab9d137ecd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="B Watson" -EMAIL=" yalhcru@gmail.com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com"