aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/trashy/doinst.sh1
-rw-r--r--system/trashy/trashy.SlackBuild25
-rw-r--r--system/trashy/trashy.info6
3 files changed, 19 insertions, 13 deletions
diff --git a/system/trashy/doinst.sh b/system/trashy/doinst.sh
new file mode 100644
index 000000000000..aaa8e9a655cb
--- /dev/null
+++ b/system/trashy/doinst.sh
@@ -0,0 +1 @@
+ln -s /usr/bin/trashy /usr/bin/trash
diff --git a/system/trashy/trashy.SlackBuild b/system/trashy/trashy.SlackBuild
index 9699aae20591..a5221a676843 100644
--- a/system/trashy/trashy.SlackBuild
+++ b/system/trashy/trashy.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Slackware build script for trashy
-# Copyright 2014 Klaatu @member.fsf.org
+# Copyright 2014-22 Klaatu @member.fsf.org
# GNU All-Permissive License
# Copying and distribution of this file, with or without modification,
@@ -12,7 +12,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=trashy
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-2.5.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -47,14 +47,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-#make install
-mkdir -p $PKG/usr/bin
-cp $PRGNAM $PKG/usr/bin/$PRGNAM
+aclocal
+automake --add-missing
+autoconf
+./configure \
+ --prefix=/usr \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION
-(
- cd $PKG/usr/bin
- ln -s $PRGNAM trash
-)
+make
+make install DESTDIR=$PKG
#man
mkdir -p $PKG/usr/man/man8/
@@ -62,11 +64,14 @@ cp $CWD/$PRGNAM.8 $PKG/usr/man/man8/$PRGNAM.8
gzip $PKG/usr/man/man8/$PRGNAM.8
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ README.md COPYING INSTALL \
+$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trashy/trashy.info b/system/trashy/trashy.info
index f19bf503050b..cb1a99e594b1 100644
--- a/system/trashy/trashy.info
+++ b/system/trashy/trashy.info
@@ -1,8 +1,8 @@
PRGNAM="trashy"
-VERSION="2.3"
+VERSION="2.5.1"
HOMEPAGE="http://slackermedia.info/trashy"
-DOWNLOAD="https://gitlab.freedesktop.org/notklaatu/trashy/-/archive/2.3/trashy-2.3.tar.bz2"
-MD5SUM="34134a6eac7aa41f072034edc54ddaca"
+DOWNLOAD="https://gitlab.com/trashy/trashy/-/archive/2.5.1/trashy-2.5.1.tar.bz2
+MD5SUM="a466a47c74d20ef1d564fc134704c54c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""