Update xpad to 4.0.

Version 4.0
* Added --toggle (between --hide and --show). Patch by Paul Ivanov.
* Updated French, Japanese, Russian, Spanish, and Swedish translations
* New Croatian, Estonian, German, Portuguese, Thai, and Turkish translations

Version 3.1
* Updated Danish, French, Russian, Spanish, and Swedish translations
* New Czech, Japanese, and Latvian translations

Version 3.0
* Don't wake up every 20 milliseconds to check session management messages.
  Rather, wait for an event.
* Add --hide/--show, removed --hide-old.  --hide and --show affect all pads
  on startup or can be used on an already running xpad instance.  Patch by
  Jan Losinski.
* Update icon to be less aliased
* Relicense as GPL v3+

Version 2.14
* Fix 100% CPU bug

Version 2.13
* Requires GTK+ 2.12
* Fix pads possibly not remembering location after close
* Fix pad-closed state not being remembered
* Uses native status icon code in GTK+
* Maybe, possibly fix some 'pad on all workspaces' problems
* New Chinese (simplified) translation (Meng Jie)
* New English (British) translation (David Lodge)
* New Finnish translation (Jorma Karvonen)
* New Korean translation (KwangSub Lee)
* Updated Dutch translation (Benno Schulenberg)
* Updated Slovak translation (Andrej Kacian)
* Fixed Danish, Swedish translations

Version 2.12
* Fix a crash when loading pads with formatting

Version 2.11
* If window decorations are turned on, pads will now show up in the taskbar
* Added -f option to open a file as a note
* New Chinese (simplified) translation (Meng Jie)
* New Danish translation (Morten Bo Johansen)
* New Swedish translation (Daniel Nylander)
* Updated Chinese (traditional) translation (Wei-Lun Chao)

Version 2.10
* Fix a possible crash when deleting pads with autohide toolbar
* Make toolbar buttons smaller
* Make toolbar appear inside pad if there is enough unused space
* New Slovak translation (Andrej Kacian)
* New Slovenian translation (Matej Urbančič)

Version 2.9
* Fix pads saving slightly off bad x,y values
* Fix pads saving bad heights when toolbar always on (Sham Chukoury)
* Fix possible crash from not allocating enough memory (Federico Schwindt)
* New Malay translation (Sharuzzaman Ahmat Raslan)

Version 2.8
* Allow translations to be used (broken for a couple versions)
* New Chinese (traditional) translation (Wei-Lun Chao)
* Removed half-baked Esperanto translation

Version 2.7
* Stop pads from popping toolbar while the pad is moving/resizing
* Make sure pads use correct sizes when autohide is off (Sham Chukoury)
* New Bulgarian translation (Yavor Doganov)
* New Kinyarwanda translation (Steve Murphy et al)

Version 2.6
* Stop pad windows from 'jumping' when dragged via the toolbar
* Updated Hungarian translation (Németh Csaba)
* Updated Irish translation (Kevin Patrick Scannell)
* Updated Vietnamese translation (Clytie Siddall)

Version 2.5
* Stop making all new pads start in top left
* Stop closing xpad if toggling window decorations with only one pad open
* Stop losing pad contents if upgrading from old versions of xpad

Version 2.4
* Create the configuration directory if it doesn't exist

Version 2.3
* Fixed a compile bug with binreloc and threading

Version 2.2
* Bumped GTK+ dependency to 2.6
* New About dialog (using GtkAboutDialog)
* New default location for configuration files: ~/.config/xpad
* Updated icon (now uses lighter colors)
* Use GOption for command-line parsing
* New command-line option --hide-old (or -H) to not show old pads
* Renamed command-line option --nonew to --no-new and added -N shortcut
* Allow running from console if we don't need to do anything graphical
* Readded keyboard shortcuts
* Updated antiquated man page
* New Hungarian translation (Németh Csaba)
* New Vietnamese translation (Clytie Siddall)
* Updated Irish translation (Kevin Patrick Scannell)

Version 2.1
* Fix tray icon being the wrong size
* Fix xpad to close when no tray and no open pads

Version 2.0
* Fix notes list to display correct number of pads
* Fix notification icon from not doing anything
* Fix compilation when BinReloc is disabled
* Fix compilation with gcc 3.4
* Fix endianness issue with preference files
* Updated Dutch translation (Elros Cyriatan)

Version 2.0-b3
* Use BinReloc to allow any-prefix installs of xpad to work
* Fixed a double-free bug that caused some problems with new pads
* Updated Irish translation (Kevin Patrick Scannell)
* Updated Spanish translation (Ramon Rey Vicente)

Version 2.0-b2
* Redesigned preferences and pad properties dialogs
* If the tray disappears (e.g. killall gnome-panel), xpad's icon reappears
* More formally ask window manager to make us skip taskbar and pager
* New, lighter default color for pads
* Lots of internal code cleanup
* Fixed a crasher with not being able to find window icons
* Fixed some crashers with turning off toolbar
* Fixed bug with text cursor color being one color change behind

Version 2.0-b1
* The text cursor is now always the same color as the text color
* Formatting can now be applied to selected text
* Pads remember their hidden state
* Rewritten toolbar, allowing easier adding/removing/moving buttons
* Simplified preferences dialog; many functions are now accessed from popup menu
* --new now also loads the old pads, instead of the previous broken behavior
* Fixed bug with pads over the 9th not having numbers in note lists
* Fixed bug with inter process communicating causing only first communication to work
* Fixed bug with pads becoming unstyled after closing and reopening
* New Afrikaans translation (Petri Jooste)
* New French translation (Michel Robitaille)

Version 1.13
* Don't close xpad if no pads are open but the system tray is
* Made translations work again
* New Spanish translation (Ramon Rey Vicente)
* Updated Dutch translation (Elros Cyriatan)
* Updated Irish translation (Kevin Patrick Scannell)

4 files changed, 65 insertions, 29 deletions

diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 778e4eab0dc..823b448f5e1 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.33 2011/01/13 13:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2011/01/25 08:33:27 obache Exp $
 #
 
-DISTNAME=	xpad-1.12
-PKGREVISION=	13
+DISTNAME=	xpad-4.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xpad/}
+MASTER_SITES=	http://launchpad.net/xpad/trunk/${PKGVERSION_NOREV}/+download/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://xpad.sourceforge.net/
-COMMENT=	Sticky notes application in GTK 2
+HOMEPAGE=	http://mterry.name/xpad/
+COMMENT=	Sticky notes application for GTK+ 2.0
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,15 +17,8 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 
-LIBS.SunOS+=		-lX11
-
-BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpad/PLIST b/x11/xpad/PLIST
index cc7877780b6..48aab85147d 100644
--- a/x11/xpad/PLIST
+++ b/x11/xpad/PLIST
@@ -1,22 +1,33 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:25:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/01/25 08:33:27 obache Exp $
 bin/xpad
 man/man1/xpad.1
 share/applications/xpad.desktop
-share/icons/hicolor/128x128/apps/xpad.png
-share/icons/hicolor/16x16/apps/xpad.png
-share/icons/hicolor/22x22/apps/xpad.png
-share/icons/hicolor/32x32/apps/xpad.png
-share/icons/hicolor/48x48/apps/xpad.png
-share/icons/hicolor/64x64/apps/xpad.png
-share/icons/hicolor/96x96/apps/xpad.png
 share/icons/hicolor/scalable/apps/xpad.svg
-share/locale/dk/LC_MESSAGES/xpad.mo
-share/locale/eo/LC_MESSAGES/xpad.mo
+share/locale/af/LC_MESSAGES/xpad.mo
+share/locale/bg/LC_MESSAGES/xpad.mo
+share/locale/cs/LC_MESSAGES/xpad.mo
+share/locale/da/LC_MESSAGES/xpad.mo
+share/locale/de/LC_MESSAGES/xpad.mo
+share/locale/en_GB/LC_MESSAGES/xpad.mo
 share/locale/es/LC_MESSAGES/xpad.mo
+share/locale/et/LC_MESSAGES/xpad.mo
+share/locale/fi/LC_MESSAGES/xpad.mo
 share/locale/fr/LC_MESSAGES/xpad.mo
 share/locale/ga/LC_MESSAGES/xpad.mo
+share/locale/hr/LC_MESSAGES/xpad.mo
+share/locale/hu/LC_MESSAGES/xpad.mo
 share/locale/it/LC_MESSAGES/xpad.mo
+share/locale/ja/LC_MESSAGES/xpad.mo
+share/locale/ko/LC_MESSAGES/xpad.mo
+share/locale/lv/LC_MESSAGES/xpad.mo
 share/locale/nl/LC_MESSAGES/xpad.mo
+share/locale/pt/LC_MESSAGES/xpad.mo
 share/locale/ro/LC_MESSAGES/xpad.mo
 share/locale/ru/LC_MESSAGES/xpad.mo
-share/pixmaps/xpad.png
+share/locale/rw/LC_MESSAGES/xpad.mo
+share/locale/sv/LC_MESSAGES/xpad.mo
+share/locale/th/LC_MESSAGES/xpad.mo
+share/locale/tr/LC_MESSAGES/xpad.mo
+share/locale/vi/LC_MESSAGES/xpad.mo
+share/locale/zh_CN/LC_MESSAGES/xpad.mo
+share/locale/zh_TW/LC_MESSAGES/xpad.mo
diff --git a/x11/xpad/distinfo b/x11/xpad/distinfo
index b8448d0f019..d6001e576c2 100644
--- a/x11/xpad/distinfo
+++ b/x11/xpad/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 17:36:25 wiz Exp $
+$NetBSD: distinfo,v 1.7 2011/01/25 08:33:27 obache Exp $
 
-SHA1 (xpad-1.12.tar.bz2) = 39785fb183d61039383204352ba03c4ca4cb392d
-RMD160 (xpad-1.12.tar.bz2) = b2ca21e60bc550f74e92c1ee3f06529f46b87751
-Size (xpad-1.12.tar.bz2) = 238411 bytes
+SHA1 (xpad-4.0.tar.bz2) = 9d9c7c5ed6feb8aac97fc48bfcd662c3b0dbcba5
+RMD160 (xpad-4.0.tar.bz2) = f0c571452463f6fcdbd4912e2ce178baa321eca8
+Size (xpad-4.0.tar.bz2) = 180340 bytes
+SHA1 (patch-ac) = d48f055a6006c39d55e01ccd9888cd2494e46f41
diff --git a/x11/xpad/patches/patch-ac b/x11/xpad/patches/patch-ac
new file mode 100644
index 00000000000..8652bfb9e38
--- /dev/null
+++ b/x11/xpad/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1 2011/01/25 08:33:27 obache Exp $
+
+* Use API for set window properties.
+  construct property "type" for object can't be set after construction.
+
+--- src/xpad-pad.c.orig	2009-05-11 01:44:09.000000000 +0000
++++ src/xpad-pad.c
+@@ -268,16 +268,14 @@ xpad_pad_init (XpadPad *pad)
+ 		NULL));
+ 	gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL);
+ 	
++	gtk_window_set_decorated (GTK_WINDOW(pad), xpad_settings_get_has_decorations (xpad_settings ()));
++	gtk_window_set_default_size (GTK_WINDOW(pad), xpad_settings_get_width (xpad_settings ()), xpad_settings_get_height (xpad_settings ()));
++	gtk_window_set_gravity (GTK_WINDOW(pad),  GDK_GRAVITY_STATIC); /* static gravity makes saving pad x,y work */
++	gtk_window_set_skip_pager_hint (GTK_WINDOW(pad),xpad_settings_get_has_decorations (xpad_settings ()));
++	gtk_window_set_skip_taskbar_hint (GTK_WINDOW(pad), !xpad_settings_get_has_decorations (xpad_settings ()));
++	gtk_window_set_type_hint (GTK_WINDOW(pad), GDK_WINDOW_TYPE_HINT_NORMAL);
++	gtk_window_set_position (GTK_WINDOW(pad), GTK_WIN_POS_MOUSE);
+ 	g_object_set (G_OBJECT (pad),
+-		"decorated", xpad_settings_get_has_decorations (xpad_settings ()),
+-		"default-height", xpad_settings_get_height (xpad_settings ()),
+-		"default-width", xpad_settings_get_width (xpad_settings ()),
+-		"gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving pad x,y work */
+-		"skip-pager-hint", !xpad_settings_get_has_decorations (xpad_settings ()),
+-		"skip-taskbar-hint", !xpad_settings_get_has_decorations (xpad_settings ()),
+-		"type", GTK_WINDOW_TOPLEVEL,
+-		"type-hint", GDK_WINDOW_TYPE_HINT_NORMAL,
+-		"window-position", GTK_WIN_POS_MOUSE,
+ 		"child", vbox,
+ 		NULL);
+