Switch from GTK+-1.2 depend to OpenMotif wrt #205511. Fix compilers warnings. Install desktop entry with icon.

Package-Manager: portage-2.1.4

6 files changed, 83 insertions, 36 deletions

diff --git a/net-ftp/axyftp/ChangeLog b/net-ftp/axyftp/ChangeLog
index 6512086d20ce..08f7dfd5d978 100644
--- a/net-ftp/axyftp/ChangeLog
+++ b/net-ftp/axyftp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/axyftp
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/axyftp/ChangeLog,v 1.6 2007/05/15 14:03:32 bangert Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/axyftp/ChangeLog,v 1.7 2008/01/17 13:59:12 drac Exp $
+
+*axyftp-0.5.1-r1 (17 Jan 2008)
+
+  17 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/axyftp-0.5.1-built-in-function-exit.patch, -axyftp-0.5.1.ebuild,
+  +axyftp-0.5.1-r1.ebuild:
+  Switch from GTK+-1.2 depend to OpenMotif wrt #205511. Fix compilers
+  warnings. Install desktop entry with icon.
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/net-ftp/axyftp/Manifest b/net-ftp/axyftp/Manifest
index 2fb26bb1084f..a152c66cfe7b 100644
--- a/net-ftp/axyftp/Manifest
+++ b/net-ftp/axyftp/Manifest
@@ -1,16 +1,20 @@
+AUX axyftp-0.5.1-built-in-function-exit.patch 725 RMD160 335b331317a49a691b915058a97c7949c528e7b9 SHA1 33e6e8afcbb742d24cd8e751d0f20274c34fdd9c SHA256 85ec22ec49351c8463ef3a98028cd27bd32983ce77744de4a486d036bbf6c4ac
+MD5 6aa52a937b6fbba8baf51dad95e3fecb files/axyftp-0.5.1-built-in-function-exit.patch 725
+RMD160 335b331317a49a691b915058a97c7949c528e7b9 files/axyftp-0.5.1-built-in-function-exit.patch 725
+SHA256 85ec22ec49351c8463ef3a98028cd27bd32983ce77744de4a486d036bbf6c4ac files/axyftp-0.5.1-built-in-function-exit.patch 725
 DIST axyftp-0.5.1.tar.gz 518736 RMD160 965569da072f2cc99f78fff51a3880ace75c06d9 SHA1 4b20c7d270eefa35cc19232cd81cc468030bb453 SHA256 f35735393de275b6bed3070fc879791014961e3ec16f0305397759df60ebef89
-EBUILD axyftp-0.5.1.ebuild 614 RMD160 014c51278a63380839ccd332681a2d9f6a591942 SHA1 f8bf09f67e77ad0305842e3fd9e7be1e11e57f35 SHA256 726d5d7e5e795d4fd5d9a5f547bdc367afa4cba47da716ab8fb9c7938007dc17
-MD5 a4294e3cb151946fb8f3f0b4aa6b7e0a axyftp-0.5.1.ebuild 614
-RMD160 014c51278a63380839ccd332681a2d9f6a591942 axyftp-0.5.1.ebuild 614
-SHA256 726d5d7e5e795d4fd5d9a5f547bdc367afa4cba47da716ab8fb9c7938007dc17 axyftp-0.5.1.ebuild 614
-MISC ChangeLog 734 RMD160 252e4470e6332b35c5d070284a300a339f2fe323 SHA1 2d0cb53a12072baa454e27c53b3d6604f4ba7622 SHA256 163bd52ccb569d96e4256cc4feec2355023d79051245e7e41f7f34dcbf347598
-MD5 3652e8e6f46c8eb0184fbb794c163a20 ChangeLog 734
-RMD160 252e4470e6332b35c5d070284a300a339f2fe323 ChangeLog 734
-SHA256 163bd52ccb569d96e4256cc4feec2355023d79051245e7e41f7f34dcbf347598 ChangeLog 734
+EBUILD axyftp-0.5.1-r1.ebuild 1019 RMD160 6f7f43a87ba959ff2916a5a71228eb1c939bbb41 SHA1 1dc45e3280ad290cb77d47091d43be27eee31f91 SHA256 c6a44823e009ef504c8df1fa220d42ffed332a84e50742fa6a53dfb196f3c4e0
+MD5 fd8094ca932ff54e09857dce74611b19 axyftp-0.5.1-r1.ebuild 1019
+RMD160 6f7f43a87ba959ff2916a5a71228eb1c939bbb41 axyftp-0.5.1-r1.ebuild 1019
+SHA256 c6a44823e009ef504c8df1fa220d42ffed332a84e50742fa6a53dfb196f3c4e0 axyftp-0.5.1-r1.ebuild 1019
+MISC ChangeLog 1029 RMD160 aa46e96563e317e298dcd1c1f78a9bcbe91e71e9 SHA1 2c0c51d78313447380f47a979755da736a699831 SHA256 ac55fdd383d91d9c8e545ff7b572385130f918f528a177a40df79f30a8a10a75
+MD5 0ab9e60070a02dfe11e9cb92635f343b ChangeLog 1029
+RMD160 aa46e96563e317e298dcd1c1f78a9bcbe91e71e9 ChangeLog 1029
+SHA256 ac55fdd383d91d9c8e545ff7b572385130f918f528a177a40df79f30a8a10a75 ChangeLog 1029
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
 SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
-MD5 f0856748feb1327c79eaf1e1898b0fae files/digest-axyftp-0.5.1 238
-RMD160 aeb347e6ebc4208a618f4019812a85ad88ed1828 files/digest-axyftp-0.5.1 238
-SHA256 3ffb1a5fa38154b8fe2879318a55701111429d7f9340f8f10ffbd8e88ca6c522 files/digest-axyftp-0.5.1 238
+MD5 f0856748feb1327c79eaf1e1898b0fae files/digest-axyftp-0.5.1-r1 238
+RMD160 aeb347e6ebc4208a618f4019812a85ad88ed1828 files/digest-axyftp-0.5.1-r1 238
+SHA256 3ffb1a5fa38154b8fe2879318a55701111429d7f9340f8f10ffbd8e88ca6c522 files/digest-axyftp-0.5.1-r1 238
diff --git a/net-ftp/axyftp/axyftp-0.5.1-r1.ebuild b/net-ftp/axyftp/axyftp-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..8a4b4a64938d
--- /dev/null
+++ b/net-ftp/axyftp/axyftp-0.5.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/axyftp/axyftp-0.5.1-r1.ebuild,v 1.1 2008/01/17 13:59:12 drac Exp $
+
+inherit eutils
+
+DESCRIPTION="GUI FTP client for X Window System (former WXftp)"
+HOMEPAGE="http://www.wxftp.seul.org"
+SRC_URI="http://www.wxftp.seul.org/download/${P}.tar.gz"
+
+LICENSE="Artistic LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/openmotif
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-built-in-function-exit.patch
+}
+
+src_compile(){
+	econf --with-help=/usr/share/doc/${PF}/html \
+		--with-gui=motif
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc CHANGES README TODO
+	newicon icons/${PN}-ball64.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "AxY FTP" ${PN} "Network;FileTransfer;Motif"
+}
diff --git a/net-ftp/axyftp/axyftp-0.5.1.ebuild b/net-ftp/axyftp/axyftp-0.5.1.ebuild
deleted file mode 100644
index 4b0ce39764e9..000000000000
--- a/net-ftp/axyftp/axyftp-0.5.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/axyftp/axyftp-0.5.1.ebuild,v 1.4 2005/02/03 11:36:36 dholm Exp $
-
-DESCRIPTION="GUI FTP client for X Window System (former WXftp)"
-SRC_URI="http://www.wxftp.seul.org/download/${P}.tar.gz"
-HOMEPAGE="http://www.wxftp.seul.org"
-
-LICENSE="Artistic LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~ppc"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-1.2"
-
-src_compile(){
-	econf || die "configure failed"
-	emake -j1 || die "compilation failed"
-}
-
-src_install() {
-	make install DESTDIR=${D}
-}
diff --git a/net-ftp/axyftp/files/axyftp-0.5.1-built-in-function-exit.patch b/net-ftp/axyftp/files/axyftp-0.5.1-built-in-function-exit.patch
new file mode 100644
index 000000000000..8937114251e3
--- /dev/null
+++ b/net-ftp/axyftp/files/axyftp-0.5.1-built-in-function-exit.patch
@@ -0,0 +1,18 @@
+diff -ur axyftp-0.5.1.orig/src/buttonbar.c axyftp-0.5.1/src/buttonbar.c
+--- axyftp-0.5.1.orig/src/buttonbar.c	2000-01-17 21:50:04.000000000 +0200
++++ axyftp-0.5.1/src/buttonbar.c	2008-01-17 15:46:22.000000000 +0200
+@@ -1,4 +1,5 @@
+ /* Copyright (c) 1998   Alexander Yukhimets. All rights reserved. */
++#include<stdlib.h>
+ #include"axyftp.h"
+ #include"utils.h"
+ #include"multi.h"
+diff -ur axyftp-0.5.1.orig/src/utils.c axyftp-0.5.1/src/utils.c
+--- axyftp-0.5.1.orig/src/utils.c	2000-01-17 22:03:59.000000000 +0200
++++ axyftp-0.5.1/src/utils.c	2008-01-17 15:45:51.000000000 +0200
+@@ -1,4 +1,5 @@
+ /* Copyright (c) 1998   Alexander Yukhimets. All rights reserved. */
++#include<stdlib.h>
+ #include<string.h>
+ #include<stdio.h>
+ 
diff --git a/net-ftp/axyftp/files/digest-axyftp-0.5.1 b/net-ftp/axyftp/files/digest-axyftp-0.5.1-r1
index 3fb36bf10ca3..3fb36bf10ca3 100644
--- a/net-ftp/axyftp/files/digest-axyftp-0.5.1
+++ b/net-ftp/axyftp/files/digest-axyftp-0.5.1-r1