Update to 1.2.0.

4 files changed, 27 insertions, 25 deletions

diff --git a/misc/stickynotes_applet/Makefile b/misc/stickynotes_applet/Makefile
index 0c365963d4ca..e40164e26ebf 100644
--- a/misc/stickynotes_applet/Makefile
+++ b/misc/stickynotes_applet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stickynotes_applet
-PORTVERSION=	1.0.11
+PORTVERSION=	1.2.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	http://loban.caltech.edu/stickynotes/packages/
 
@@ -19,11 +19,7 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomepanel
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/misc/stickynotes_applet/distinfo b/misc/stickynotes_applet/distinfo
index f2257fe05bf5..7e52a36b3083 100644
--- a/misc/stickynotes_applet/distinfo
+++ b/misc/stickynotes_applet/distinfo
@@ -1 +1 @@
-MD5 (stickynotes_applet-1.0.11.tar.gz) = 9bfb47eabd4f0b494d2e15d9343f2915
+MD5 (stickynotes_applet-1.2.0.tar.gz) = 0ef26c3d3dd9619fa10ede230bab49f6
diff --git a/misc/stickynotes_applet/files/patch-Makefile.in b/misc/stickynotes_applet/files/patch-Makefile.in
index 9caf6f5ffec7..2884298f74b8 100644
--- a/misc/stickynotes_applet/files/patch-Makefile.in
+++ b/misc/stickynotes_applet/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Feb 17 18:01:51 2003
-+++ Makefile.in	Mon Feb 17 18:02:02 2003
-@@ -444,7 +444,7 @@
+--- Makefile.in.orig	Thu Jun 12 21:29:56 2003
++++ Makefile.in	Thu Jun 12 21:30:38 2003
+@@ -450,7 +450,7 @@
  install-exec-am:
  install-exec: install-exec-recursive
  
 -install-data-am: install-docDATA install-gladeDATA install-schemasDATA \
 +install-data-am: install-gladeDATA install-schemasDATA \
- 		install-serverDATA install-xmlDATA install-data-local
+ 		install-serverDATA install-uiDATA install-data-local
  install-data: install-data-recursive
  
diff --git a/misc/stickynotes_applet/pkg-plist b/misc/stickynotes_applet/pkg-plist
index bfe86374b761..ef8f83dbe375 100644
--- a/misc/stickynotes_applet/pkg-plist
+++ b/misc/stickynotes_applet/pkg-plist
@@ -4,8 +4,8 @@ etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings/%gconf.xml
-etc/gconf/schemas/stickynotes_applet.schemas
-libdata/bonobo/servers/stickynotes_applet.server
+etc/gconf/schemas/stickynotes.schemas
+libdata/bonobo/servers/GNOME_StickyNotesApplet.server
 libexec/stickynotes_applet
 %%PORTDOCS%%share/doc/stickynotes_applet/AUTHORS
 %%PORTDOCS%%share/doc/stickynotes_applet/COPYING
@@ -15,32 +15,38 @@ libexec/stickynotes_applet
 %%PORTDOCS%%share/doc/stickynotes_applet/README
 %%PORTDOCS%%share/doc/stickynotes_applet/THANKS
 %%PORTDOCS%%share/doc/stickynotes_applet/TODO
-share/gnome/gnome-2.0/ui/stickynotes_applet.xml
-share/gnome/help/stickynotes_applet/C/figures/applet_menu.png
-share/gnome/help/stickynotes_applet/C/figures/note_menu.png
-share/gnome/help/stickynotes_applet/C/figures/preferences_dialog.png
-share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png
+share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
 share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/stickynotes_applet/close.png
-share/gnome/pixmaps/stickynotes_applet/resize.png
-share/gnome/pixmaps/stickynotes_applet/stickynotes.png
-share/gnome/pixmaps/stickynotes_applet/stickynotes_prelight.png
-share/gnome/stickynotes_applet/stickynotes_applet.glade
+share/gnome/pixmaps/stickynotes/close.png
+share/gnome/pixmaps/stickynotes/lock.png
+share/gnome/pixmaps/stickynotes/resize_se.png
+share/gnome/pixmaps/stickynotes/resize_sw.png
+share/gnome/pixmaps/stickynotes/stickynotes.png
+share/gnome/pixmaps/stickynotes/stickynotes_prelight.png
+share/gnome/pixmaps/stickynotes/unlock.png
+share/gnome/stickynotes/stickynotes.glade
 share/locale/am/LC_MESSAGES/stickynotes_applet.mo
 share/locale/cs/LC_MESSAGES/stickynotes_applet.mo
 share/locale/de/LC_MESSAGES/stickynotes_applet.mo
 share/locale/es/LC_MESSAGES/stickynotes_applet.mo
+share/locale/et/LC_MESSAGES/stickynotes_applet.mo
 share/locale/fi/LC_MESSAGES/stickynotes_applet.mo
+share/locale/fr/LC_MESSAGES/stickynotes_applet.mo
+share/locale/he/LC_MESSAGES/stickynotes_applet.mo
+share/locale/it/LC_MESSAGES/stickynotes_applet.mo
+share/locale/ms/LC_MESSAGES/stickynotes_applet.mo
 share/locale/nl/LC_MESSAGES/stickynotes_applet.mo
+share/locale/pt/LC_MESSAGES/stickynotes_applet.mo
+share/locale/sr/LC_MESSAGES/stickynotes_applet.mo
+share/locale/sr@Latn/LC_MESSAGES/stickynotes_applet.mo
 share/locale/sv/LC_MESSAGES/stickynotes_applet.mo
 share/locale/uk/LC_MESSAGES/stickynotes_applet.mo
 share/locale/vi/LC_MESSAGES/stickynotes_applet.mo
-@dirrm share/gnome/stickynotes_applet
+@dirrm share/gnome/stickynotes
 @dirrm share/gnome/omf/stickynotes_applet
-@dirrm share/gnome/help/stickynotes_applet/C/figures
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
 %%PORTDOCS%%@dirrm share/doc/stickynotes_applet