libraries/PDCurses: Updated for version 3.6 + new maintainer.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 44 insertions, 29 deletions

diff --git a/libraries/PDCurses/PDCurses-3.6-makefile-in.patch b/libraries/PDCurses/PDCurses-3.6-makefile-in.patch
new file mode 100644
index 0000000000..a3065db868
--- /dev/null
+++ b/libraries/PDCurses/PDCurses-3.6-makefile-in.patch
@@ -0,0 +1,28 @@
+--- x11/Makefile.in.orig	2018-01-26 17:56:15.000000000 -0800
++++ x11/Makefile.in	2018-06-14 13:42:43.989390736 -0700
+@@ -13,9 +13,9 @@
+ 
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+-libdir		= @libdir@
+-bindir		= @bindir@
+-includedir	= @includedir@
++libdir		= $(DESTDIR)@libdir@
++bindir		= $(DESTDIR)@bindir@
++includedir	= $(DESTDIR)@includedir@
+ 
+ PDCURSES_CONFIG_H	=$(osdir)/config.h
+ PDCURSES_CURSES_H	=$(PDCURSES_SRCDIR)/curses.h
+@@ -62,8 +62,12 @@
+ 	$(INSTALL) -d -m 755 $(includedir)
+ 	$(INSTALL) -d -m 755 $(includedir)/xcurses
+ 	$(INSTALL) -c -m 644 $(PDCURSES_CURSES_H) \
++		$(includedir)/xcurses.h
++	$(INSTALL) -c -m 644 $(PDCURSES_CURSES_H) \
+ 		$(includedir)/xcurses/curses.h
+ 	$(INSTALL) -c -m 644 $(PDCURSES_SRCDIR)/panel.h \
++		$(includedir)/xpanel.h
++	$(INSTALL) -c -m 644 $(PDCURSES_SRCDIR)/panel.h \
+ 		$(includedir)/xcurses/panel.h
+ 	$(INSTALL) -c -m 644 $(PDCURSES_SRCDIR)/term.h \
+ 		$(includedir)/xcurses/term.h
diff --git a/libraries/PDCurses/PDCurses.SlackBuild b/libraries/PDCurses/PDCurses.SlackBuild
index 800607a13b..3a7bc0dba7 100644
--- a/libraries/PDCurses/PDCurses.SlackBuild
+++ b/libraries/PDCurses/PDCurses.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=PDCurses
-VERSION=${VERSION:-3.4}
+VERSION=${VERSION:-3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,6 +62,10 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+cp -p x11/Makefile.in x11/Makefile.in.orig
+cat $CWD/PDCurses-3.6-makefile-in.patch | patch -p0
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,10 +73,7 @@ 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 {} \;
 
-if [ "$ARCH" = "x86_64" ]; then
-       patch -p1 < $CWD/PDCurses_x64.patch
-fi
-
+cd x11
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -83,24 +84,24 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-x \
+  --x-libraries=/usr/lib${LIBDIRSUFFIX} \
   --build=$ARCH-slackware-linux
 
+
 make
 make install DESTDIR=$PKG
 
+cd $TMP/$PRGNAM-$VERSION
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# remove static library
-rm $PKG/usr/lib${LIBDIRSUFFIX}/libXCurses.a
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a HISTORY IMPLEMNT README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a HISTORY.md IMPLEMNT.md README.md $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:-tgz}
diff --git a/libraries/PDCurses/PDCurses.info b/libraries/PDCurses/PDCurses.info
index 0759bce1fc..0348a15a28 100644
--- a/libraries/PDCurses/PDCurses.info
+++ b/libraries/PDCurses/PDCurses.info
@@ -1,10 +1,10 @@
 PRGNAM="PDCurses"
-VERSION="3.4"
+VERSION="3.6"
 HOMEPAGE="http://pdcurses.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/pdcurses/pdcurses/3.4/PDCurses-3.4.tar.gz"
-MD5SUM="4e04e4412d1b1392a7f9a489b95b331a"
+DOWNLOAD="http://downloads.sourceforge.net/project/pdcurses/pdcurses/3.6/PDCurses-3.6.tar.gz"
+MD5SUM="4a1994e480282418d11bf8b3ead38be5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+MAINTAINER="Richard Narron"
+EMAIL="richard@aaazen.com"
diff --git a/libraries/PDCurses/PDCurses_x64.patch b/libraries/PDCurses/PDCurses_x64.patch
deleted file mode 100644
index d8d12a47fb..0000000000
--- a/libraries/PDCurses/PDCurses_x64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- PDCurses-3.4/Makefile.original.in	2014-04-18 07:43:53.909256926 +0300
-+++ PDCurses-3.4/Makefile.in	2014-04-18 07:44:18.836945287 +0300
-@@ -7,7 +7,7 @@
- srcdir		=@srcdir@
- prefix		=@prefix@
- exec_prefix	=$(DESTDIR)@exec_prefix@
--libdir		=$(exec_prefix)/lib
-+libdir		=$(exec_prefix)/lib64
- bindir		=$(exec_prefix)/bin
- includedir	=$(exec_prefix)/include
- pdcursesdir	=./x11
diff --git a/libraries/PDCurses/doinst.sh b/libraries/PDCurses/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/libraries/PDCurses/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi