3 files changed, 10 insertions, 36 deletions
diff --git a/network/sieve-connect/patches/00-Makefile_DESTDIR.diff b/network/sieve-connect/patches/00-Makefile_DESTDIR.diff
deleted file mode 100644
index f3a947cc80..0000000000
--- a/network/sieve-connect/patches/00-Makefile_DESTDIR.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.orig	2013-07-27 15:23:14.285754141 +0200
-+++ Makefile	2013-07-27 15:23:44.974756110 +0200
-@@ -2,7 +2,7 @@
- INSTALLPROG=install
- INSTALLROOT=
- INSTALLARGS=
--PREFIX=/usr/local
-+PREFIX=${DESTDIR}/usr
- BINDIR=bin
- BINPERM=0755
- # Might use: MANDIR=share/man
-@@ -32,12 +32,14 @@ all: $(SCRIPTNAME)
- install: all install-bin install-man
- 
- install-bin: $(SCRIPTNAME)
-+	mkdir -m755 -p $(PREFIX)/$(BINDIR)
- 	$(INSTALLPROG) -m $(BINPERM) $(INSTALLARGS) $(SCRIPTNAME) $(INSTALLROOT)$(PREFIX)/$(BINDIR)/./
- 
- # making the man-page is dependent upon files not distributed, so they're
- # regenerated, so we don't list it as a dependency here -- instead we
- # assume that the maintainer created it for us (as a tarball depenency)
- install-man:
-+	mkdir -m755 -p $(PREFIX)/$(MANDIR)/$(MANSECTDIR)
- 	$(INSTALLPROG) -m $(MANPERM) $(INSTALLARGS) $(MANPAGE) $(INSTALLROOT)$(PREFIX)/$(MANDIR)/$(MANSECTDIR)/./
- 
- bin $(SCRIPTNAME): $(SCRIPTDIST)
diff --git a/network/sieve-connect/sieve-connect.SlackBuild b/network/sieve-connect/sieve-connect.SlackBuild
index bd89979326..b582790c7f 100644
--- a/network/sieve-connect/sieve-connect.SlackBuild
+++ b/network/sieve-connect/sieve-connect.SlackBuild
@@ -28,7 +28,7 @@
 # Build script for sieve-connect
 
 PRGNAM=sieve-connect
-VERSION=0.86
+VERSION=${VERSION:-0.87}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,14 +49,14 @@ 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 < $CWD/patches/00-Makefile_DESTDIR.diff
 make
-make install DESTDIR=$PKG
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+make install PREFIX=/usr INSTALLROOT=$PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
diff --git a/network/sieve-connect/sieve-connect.info b/network/sieve-connect/sieve-connect.info
index 0d07871b27..d6a750e0fe 100644
--- a/network/sieve-connect/sieve-connect.info
+++ b/network/sieve-connect/sieve-connect.info
@@ -1,8 +1,8 @@
 PRGNAM="sieve-connect"
-VERSION="0.86"
+VERSION="0.87"
 HOMEPAGE="https://github.com/syscomet/sieve-connect"
-DOWNLOAD="https://github.com/syscomet/sieve-connect/releases/download/v0.86/sieve-connect-0.86.tar.bz2"
-MD5SUM="1c1e50e2c48e0fc75ee69fc04b2d5820"
+DOWNLOAD="https://github.com/syscomet/sieve-connect/releases/download/v0.87/sieve-connect-0.87.tar.bz2"
+MD5SUM="064c2ebacd3062bdf59a3ce8cb55a2fa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Authen-SASL perl-IO-Socket-INET6 perl-IO-Socket-SSL perl-net-dns perl-TermReadKey"