Update to 0.4.12, requested in PR 22819 by Ian Fry:

* Translations updated and added new ones.
* Make GTM work with galeon 2. Thanks to Philip Langdale
  for the patch.
* GTM can now detach from wget and let it run in the background.
  Thanks to Robert Millan for the patch.
* MIME support to open downloaded files. Thanks to Mark Heily
  for this patch.
* GTM now works with wget 1.8.1. Thanks to Philip Langdale
  for the patch. Many thanks to many others
  who took the time to come up with a patch to fix this.
* The applet now opens GTM if the network is on. This is by default
  off but you can change it on the applet properties.
* New proxy option to allow the user to use the same proxy options
  for all the protocols. Thanks to Markus Saarinen
  for the piece of code.

4 files changed, 101 insertions, 65 deletions

diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index 2a3122c5f89..13f7e0271fb 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/07/13 13:52:54 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/16 22:24:14 wiz Exp $
 #
 
-DISTNAME=	gtm-0.4.11
-PKGREVISION=	4
+DISTNAME=	gtm-0.4.12
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtm/}
 
@@ -13,13 +12,11 @@ COMMENT=	Gnome Transfer Manager
 DEPENDS+=	wget-[0-9]*:../../net/wget
 
 USE_BUILDLINK2=		YES
-USE_X11BASE=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 
-#post-install:
-#	${RMDIR} ${PREFIX}/share/gnome/help/gtm/C/images
-
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 
diff --git a/net/gtm/PLIST b/net/gtm/PLIST
index cec47fdc255..71c9527e3e8 100644
--- a/net/gtm/PLIST
+++ b/net/gtm/PLIST
@@ -1,72 +1,77 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/29 17:05:06 magick Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/09/16 22:24:14 wiz Exp $
 bin/gtm_applet
 bin/gtm
-etc/sound/events/gtm.soundlist
 etc/CORBA/servers/gtm_applet.gnorba
-share/locale/ca/LC_MESSAGES/gtm.mo
-share/locale/da/LC_MESSAGES/gtm.mo
-share/locale/de/LC_MESSAGES/gtm.mo
-share/locale/el/LC_MESSAGES/gtm.mo
-share/locale/es/LC_MESSAGES/gtm.mo
-share/locale/et/LC_MESSAGES/gtm.mo
-share/locale/fi/LC_MESSAGES/gtm.mo
-share/locale/fr/LC_MESSAGES/gtm.mo
-share/locale/gl/LC_MESSAGES/gtm.mo
-share/locale/hu/LC_MESSAGES/gtm.mo
-share/locale/it/LC_MESSAGES/gtm.mo
-share/locale/nl/LC_MESSAGES/gtm.mo
-share/locale/ja/LC_MESSAGES/gtm.mo
-share/locale/ko/LC_MESSAGES/gtm.mo
-share/locale/no/LC_MESSAGES/gtm.mo
-share/locale/pl/LC_MESSAGES/gtm.mo
-share/locale/pt/LC_MESSAGES/gtm.mo
-share/locale/pt_BR/LC_MESSAGES/gtm.mo
-share/locale/ro/LC_MESSAGES/gtm.mo
-share/locale/ru/LC_MESSAGES/gtm.mo
-share/locale/sk/LC_MESSAGES/gtm.mo
-share/locale/sl/LC_MESSAGES/gtm.mo
-share/locale/sv/LC_MESSAGES/gtm.mo
-share/locale/tr/LC_MESSAGES/gtm.mo
-share/locale/uk/LC_MESSAGES/gtm.mo
-share/locale/wa/LC_MESSAGES/gtm.mo
-share/locale/zh_TW/LC_MESSAGES/gtm.mo
-share/pixmaps/gtm.png
-share/pixmaps/gtm_applet.png
-share/idl/Gtm.idl
-share/gnome/help/gtm/C/index.html
-share/gnome/help/gtm/C/topic.dat
-share/gnome/help/gtm/C/authors.html
-share/gnome/help/gtm/C/bugs.html
-share/gnome/help/gtm/C/license.html
-share/gnome/help/gtm/C/prefs.html
-share/gnome/help/gtm/C/usage.html
+etc/sound/events/gtm.soundlist
+lib/bonobo/servers/GNOME_GTM.server
+man/man1/gtm.1
+man/man1/gtm_applet.1
+share/applets/Network/gtm_applet.desktop
+share/gnome/apps/Internet/gtm.desktop
 share/gnome/help/gtm/C/images/mainwindow.png
 share/gnome/help/gtm/C/images/newwindow.png
 share/gnome/help/gtm/C/images/numericwindow.png
 share/gnome/help/gtm/C/ln7.html
-share/gnome/help/gtm/C/newdownload.html
-share/gnome/help/gtm/C/numericdownload.html
-share/gnome/help/gtm/pt/topic.dat
+share/gnome/help/gtm/C/t1.html
+share/gnome/help/gtm/C/topic.dat
+share/gnome/help/gtm/C/x148.html
+share/gnome/help/gtm/C/x179.html
+share/gnome/help/gtm/C/x225.html
+share/gnome/help/gtm/C/x30.html
+share/gnome/help/gtm/C/x360.html
+share/gnome/help/gtm/C/x363.html
+share/gnome/help/gtm/C/x384.html
 share/gnome/help/gtm/pt/images/mainwindow.png
 share/gnome/help/gtm/pt/images/newwindow.png
 share/gnome/help/gtm/pt/images/numericwindow.png
-share/gnome/help/gtm/pt/authors.html
-share/gnome/help/gtm/pt/bugs.html
-share/gnome/help/gtm/pt/index.html
-share/gnome/help/gtm/pt/license.html
 share/gnome/help/gtm/pt/ln10.html
-share/gnome/help/gtm/pt/newdownload.html
-share/gnome/help/gtm/pt/numericdownload.html
-share/gnome/help/gtm/pt/prefs.html
-share/gnome/help/gtm/pt/usage.html
-share/gnome/apps/Internet/gtm.desktop
+share/gnome/help/gtm/pt/t1.html
+share/gnome/help/gtm/pt/topic.dat
+share/gnome/help/gtm/pt/x152.html
+share/gnome/help/gtm/pt/x183.html
+share/gnome/help/gtm/pt/x229.html
+share/gnome/help/gtm/pt/x34.html
+share/gnome/help/gtm/pt/x365.html
+share/gnome/help/gtm/pt/x368.html
+share/gnome/help/gtm/pt/x391.html
+share/idl/Gtm.idl
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtm.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gtm.mo
+share/oaf/GNOME_GTM.oaf
+share/pixmaps/gtm.png
+share/pixmaps/gtm_applet.png
 share/sounds/gtm/add.wav
 share/sounds/gtm/complete.wav
 share/sounds/gtm/start.wav
-share/applets/Network/gtm_applet.desktop
-share/oaf/GNOME_GTM.oaf
-man/man1/gtm.1
-man/man1/gtm_applet.1
 @dirrm share/sounds/gtm
 @dirrm share/gnome/help/gtm/C/images
 @dirrm share/gnome/help/gtm/C
diff --git a/net/gtm/distinfo b/net/gtm/distinfo
index fdd46bd6085..f8c636d25cc 100644
--- a/net/gtm/distinfo
+++ b/net/gtm/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/04/29 17:05:06 magick Exp $
+$NetBSD: distinfo,v 1.5 2003/09/16 22:24:14 wiz Exp $
 
-SHA1 (gtm-0.4.11.tar.gz) = 912d507e43a39e4240afe7e1b764f39c98cc5f34
-Size (gtm-0.4.11.tar.gz) = 575067 bytes
+SHA1 (gtm-0.4.12.tar.gz) = b0249328a36e1176091eee474cadf82b108f2b0c
+Size (gtm-0.4.12.tar.gz) = 499796 bytes
+SHA1 (patch-aa) = b8b354491cd9d14b4feefd469ad88f46ac7739a0
diff --git a/net/gtm/patches/patch-aa b/net/gtm/patches/patch-aa
new file mode 100644
index 00000000000..67508ab571f
--- /dev/null
+++ b/net/gtm/patches/patch-aa
@@ -0,0 +1,33 @@
+$NetBSD: patch-aa,v 1.1 2003/09/16 22:24:16 wiz Exp $
+
+--- po/zh_TW.po.orig	Mon Aug 12 22:49:46 2002
++++ po/zh_TW.po
+@@ -53,9 +53,8 @@ msgstr ""
+ "每次只可執行一個 GNOME 檔案傳送管理程式。"
+ 
+ #: src/main-window.c:76
+-#, fuzzy
+ msgid "Opening multiple files is not implemented yet.\n"
+-msgstr "多執行緒同時下載功能尚未完成"
++msgstr ""
+ 
+ #: src/main-window.c:85
+ msgid "Could not determine MIME type...\n"
+@@ -436,7 +435,7 @@ msgstr "另外指定下載目錄但未填上目錄名稱
+ 
+ #: src/dialog-common-elements.c:244 applet/dialog-new.c:91
+ msgid "Multiple download not implemented yet"
+-msgstr "多執行緒同時下載功能尚未完成"
++msgstr ""
+ 
+ #: src/dialog-about.c:50
+ msgid "GNOME Transfer Manager"
+@@ -597,7 +596,7 @@ msgstr "同時下載檔案數目："
+ 
+ #: src/dialog-prefs.c:638
+ msgid "Manual stop disables auto download"
+-msgstr "手動停止下載會同時停用自動下載功能"
++msgstr ""
+ 
+ #: src/dialog-prefs.c:644
+ msgid "Stop download on link loss"