# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1526091468 -10800
# Node ID ca6fe141ca35a2f39ad501abc19a31717d177acc
# Parent  da24d490b95563f4e0150ec0ddc76f96a687cea3
Up putty (0.70)

diff -r da24d490b955 -r ca6fe141ca35 putty/receipt
--- a/putty/receipt	Fri May 11 16:56:15 2018 +0300
+++ b/putty/receipt	Sat May 12 05:17:48 2018 +0300
@@ -1,49 +1,47 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="putty"
-VERSION="0.64"
+VERSION="0.70"
 CATEGORY="utilities"
-SHORT_DESC="A free telnet/SSH client."
+SHORT_DESC="A free telnet/SSH client"
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="MIT"
+WEB_SITE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-#WGET_URL="http://putty.linux-mirror.org/latest/$TARBALL"
-WGET_URL="http://the.earth.li/~sgtatham/putty/latest/$TARBALL"
-TAGS="ssh"
+WGET_URL="https://the.earth.li/~sgtatham/putty/latest/$TARBALL"
 
-DEPENDS="glibc-base expat zlib gtk+ atk cairo freetype fontconfig glib \
-pango xorg-pixman libpng16 xorg-libxcb xorg-xcb-util xorg-libX11 xorg-libXau \
-xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
-xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrender krb5 libcomerr3"
-BUILD_DEPENDS="gtk+-dev imagemagick python perl krb5-dev openexr libltdl"
+BUILD_DEPENDS="gtk+-dev gtk+3-dev krb5-dev"
+SPLIT="putty putty-gtk3:gtk3"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
+	case $SET in
+		'')   SET_ARGS='--with-gtk=2';;
+		gtk3) SET_ARGS='--with-gtk=3';;
+	esac
 
-	cd $src/icons &&
+	./configure \
+		$SET_ARGS \
+		$CONFIGURE_ARGS &&
 	make &&
-	make install &&
-	mkdir -p $DESTDIR/usr/share/pixmaps &&
-	cp $src/icons/pterm-48.png $DESTDIR/usr/share/pixmaps/pterm.png &&
-	cp $src/icons/putty-48.png $DESTDIR/usr/share/pixmaps/putty.png &&
-	
-	cd $src/unix &&
+	make install || return 1
 
-	sed -e 's/-Werror//g' -i configure &&
-	./configure $CONFIGURE_ARGS &&
-	make XFLAGS=-DTELNET_DEFAULT &&
-	make install
+	install -Dm644 $stuff/putty.png $install/usr/share/pixmaps/putty.png
+	install -Dm644 $stuff/pterm.png $install/usr/share/pixmaps/pterm.png
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share $fs/usr/share/pixmaps
-	
-	cp -a $stuff/applications $install/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/applications $fs/usr/share
-	cp -a $install/usr/share/pixmaps $fs/usr/share
+genpkg_rules() {
+	case $PACKAGE in
+		putty)
+			copy @std
+			DEPENDS="cairo gdk-pixbuf glib gtk+ pango xorg-libX11   krb5"
+			CAT="utilities|using GTK+2"
+			;;
+		putty-gtk3)
+			copy @std
+			DEPENDS="cairo gdk-pixbuf glib gtk+3 pango xorg-libX11   krb5"
+			CAT="utilities|using GTK+3"
+			;;
+	esac
+	TAGS="ssh"
 }
diff -r da24d490b955 -r ca6fe141ca35 putty/stuff/applications/pterm.desktop
--- a/putty/stuff/applications/pterm.desktop	Fri May 11 16:56:15 2018 +0300
+++ b/putty/stuff/applications/pterm.desktop	Sat May 12 05:17:48 2018 +0300
@@ -1,8 +1,6 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=PTerm Terminal
-Name[fr]=Terminal PTerm
+Type=Application
+Name=Terminal emulator for X
 Exec=pterm -ls
 Icon=pterm
-Type=Application
 Categories=Utility;Terminal;
diff -r da24d490b955 -r ca6fe141ca35 putty/stuff/applications/putty.desktop
--- a/putty/stuff/applications/putty.desktop	Fri May 11 16:56:15 2018 +0300
+++ b/putty/stuff/applications/putty.desktop	Sat May 12 05:17:48 2018 +0300
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=PuTTY
-Exec=putty
+Comment=Graphical SSH, Telnet and Rlogin client for X
+Exec=putty %u
 Icon=putty
-Type=Application
-Categories=Utility;Terminal;
+Categories=Network;Remote;
diff -r da24d490b955 -r ca6fe141ca35 putty/stuff/pterm.png
Binary file putty/stuff/pterm.png has changed
diff -r da24d490b955 -r ca6fe141ca35 putty/stuff/putty.png
Binary file putty/stuff/putty.png has changed