Pullup ticket #3676 - requested by wiz

x11/startup-notification010: new package
x11/startup-notification: suport older native X11 via "startup-notification010"

Revisions pulled up:
- x11/startup-notification/buildlink3.mk                        1.12
- x11/startup-notification010/Makefile				1.1.1.1
- x11/startup-notification010/DESCR				1.1.1.1
- x11/startup-notification010/distinfo				1.1.1.1
- x11/startup-notification010/PLIST				1.1.1.1
- x11/startup-notification010/patches/patch-aa			1.1.1.1
- x11/startup-notification010/patches/patch-ab			1.1.1.1

---
    Module Name:	pkgsrc
    Committed By:	wiz
    Date:		Thu Feb  2 11:31:33 UTC 2012

    Update of /cvsroot/pkgsrc/x11/startup-notification010
    In directory ivanova.netbsd.org:/tmp/cvs-serv24369

    Log Message:
    Initial import of startup-notification-0.10nb1 for NetBSD-5.[0-9], from
    Robert Elz.

    startup-notification provides mechanisms allowing a desktop environment to
    track application startup, to provide user feedback and other features.

    This is an older version to allow compatibility with native X11 in
    NetBSD 5 and earlier (pre-xcb).
---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Thu Feb  2 11:33:32 UTC 2012

   Modified Files:
   	pkgsrc/x11/startup-notification: buildlink3.mk

   Log Message:
   On NetBSD<5.99 with native X, use startup-notification010 instead,
   which does not use XCB (which is not provided by native X in older
   NetBSD releases). From Robert Elz.

6 files changed, 131 insertions, 0 deletions

diff --git a/x11/startup-notification010/DESCR b/x11/startup-notification010/DESCR
new file mode 100644
index 00000000000..705d137e5d8
--- /dev/null
+++ b/x11/startup-notification010/DESCR
@@ -0,0 +1,5 @@
+startup-notification provides mechanisms allowing a desktop environment to
+track application startup, to provide user feedback and other features.
+
+This is an older version to allow compatibility with native X11 in
+NetBSD 5 and earlier (pre-xcb).
diff --git a/x11/startup-notification010/Makefile b/x11/startup-notification010/Makefile
new file mode 100644
index 00000000000..35b3576e707
--- /dev/null
+++ b/x11/startup-notification010/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1.1.1.2.2 2012/02/08 20:54:25 tron Exp $
+
+DISTNAME=		startup-notification-0.10
+CATEGORIES=		x11
+MASTER_SITES=		http://www.freedesktop.org/software/startup-notification/releases/
+PKGREVISION=		1
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://www.freedesktop.org/wiki/Software/startup-notification
+COMMENT=		X11 application startup notification library
+LICENSE=		mit AND gnu-lgpl-v2.1
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+
+PKGCONFIG_OVERRIDE=	libstartup-notification-1.0.pc.in
+
+DOCDIR=			${PREFIX}/share/doc/startup-notification
+INSTALLATION_DIRS+=	${DOCDIR}
+
+post-install:
+	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING ChangeLog NEWS \
+		doc/startup-notification.txt ${DESTDIR}${DOCDIR}
+
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/startup-notification010/PLIST b/x11/startup-notification010/PLIST
new file mode 100644
index 00000000000..b09f609ef7f
--- /dev/null
+++ b/x11/startup-notification010/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2012/02/08 20:54:25 tron Exp $
+include/startup-notification-1.0/libsn/sn-common.h
+include/startup-notification-1.0/libsn/sn-launchee.h
+include/startup-notification-1.0/libsn/sn-launcher.h
+include/startup-notification-1.0/libsn/sn-monitor.h
+include/startup-notification-1.0/libsn/sn-util.h
+include/startup-notification-1.0/libsn/sn.h
+lib/libstartup-notification-1.la
+lib/pkgconfig/libstartup-notification-1.0.pc
+share/doc/startup-notification/AUTHORS
+share/doc/startup-notification/COPYING
+share/doc/startup-notification/ChangeLog
+share/doc/startup-notification/NEWS
+share/doc/startup-notification/startup-notification.txt
diff --git a/x11/startup-notification010/distinfo b/x11/startup-notification010/distinfo
new file mode 100644
index 00000000000..7c6b65f43d0
--- /dev/null
+++ b/x11/startup-notification010/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1.2.2 2012/02/08 20:54:25 tron Exp $
+
+SHA1 (startup-notification-0.10.tar.gz) = 670c5e44f59e3844e2ca0c67730ba9ca5f5228fc
+RMD160 (startup-notification-0.10.tar.gz) = de905634db3263d24b69ae42887111b7ff95b3ba
+Size (startup-notification-0.10.tar.gz) = 328787 bytes
+SHA1 (patch-aa) = 71748b823916667c59af680371d31b03f56a2177
+SHA1 (patch-ab) = ec8c08bb3ce2cf0db23d6949e95ccf88c149d1cc
diff --git a/x11/startup-notification010/patches/patch-aa b/x11/startup-notification010/patches/patch-aa
new file mode 100644
index 00000000000..bb898892da9
--- /dev/null
+++ b/x11/startup-notification010/patches/patch-aa
@@ -0,0 +1,57 @@
+$NetBSD: patch-aa,v 1.1.1.1.2.2 2012/02/08 20:54:25 tron Exp $
+
+--- libsn/sn-monitor.c	2009-04-03 17:57:27.000000000 +0700
++++ libsn/sn-monitor.c	2011-05-05 16:34:34.000000000 +0700
+@@ -66,7 +66,8 @@
+   Time timestamp;
+ 
+   char *binary_name;
+-  char *icon_name;  
++  char *icon_name;
++  char *application_id;
+ 
+   unsigned int completed : 1;
+   unsigned int canceled : 1;
+@@ -269,7 +270,8 @@
+       sn_free (sequence->wmclass);
+       sn_free (sequence->binary_name);
+       sn_free (sequence->icon_name);
+-      
++      sn_free (sequence->application_id);
++
+       sn_display_unref (sequence->display);
+       sn_free (sequence);
+     }
+@@ -337,6 +339,12 @@
+   return sequence->icon_name;
+ }
+ 
++const char*
++sn_startup_sequence_get_application_id (SnStartupSequence *sequence)
++{
++  return sequence->application_id;
++}
++
+ int
+ sn_startup_sequence_get_screen (SnStartupSequence *sequence)
+ {
+@@ -805,10 +813,18 @@
+                   changed = TRUE;
+                 }
+             }
++          else if (strcmp (names[i], "APPLICATION_ID") == 0)
++            {
++              if (sequence->application_id == NULL)
++                {
++                  sequence->application_id = sn_internal_strdup (values[i]);
++                  changed = TRUE;
++                }
++            }
+           else if (strcmp (names[i], "DESKTOP") == 0)
+             {
+               int workspace;
+-              
++
+               workspace = sn_internal_string_to_ulong (values[i]);
+ 
+               sequence->workspace = workspace;
diff --git a/x11/startup-notification010/patches/patch-ab b/x11/startup-notification010/patches/patch-ab
new file mode 100644
index 00000000000..adb8944ee3b
--- /dev/null
+++ b/x11/startup-notification010/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1.2.2 2012/02/08 20:54:25 tron Exp $
+
+--- libsn/sn-monitor.h	2009-04-03 17:11:34.000000000 +0700
++++ libsn/sn-monitor.h	2010-03-26 20:35:05.000000000 +0700
+@@ -73,6 +73,7 @@
+ const char* sn_startup_sequence_get_wmclass               (SnStartupSequence *sequence);
+ const char* sn_startup_sequence_get_binary_name           (SnStartupSequence *sequence);
+ const char* sn_startup_sequence_get_icon_name             (SnStartupSequence *sequence);
++const char* sn_startup_sequence_get_application_id        (SnStartupSequence *sequence);
+ int         sn_startup_sequence_get_screen                (SnStartupSequence *sequence);
+ 
+ void        sn_startup_sequence_get_initiated_time        (SnStartupSequence *sequence,