Fix with new libnotify API.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15358 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 366 insertions, 0 deletions

diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
new file mode 100644
index 000000000..85593ad35
--- /dev/null
+++ b/x11/gnome-screensaver/Makefile
@@ -0,0 +1,100 @@
+# New ports collection makefile for:	gnome-screensaver
+# Date created:		09 June 2005
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.121 2010/09/30 19:51:41 kwm Exp $
+#
+
+PORTNAME=	gnome-screensaver
+PORTVERSION=	2.30.2
+PORTREVISION=	2
+CATEGORIES=	x11 gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME screen saver and locker
+
+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+USE_XORG=	xtst xxf86vm
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \
+		gnomedesktop
+CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
+		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
+		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	gnome-screensaver.schemas
+MAN1=		gnome-screensaver-command.1 gnome-screensaver-preferences.1 \
+		gnome-screensaver.1
+
+PLIST=	${WRKDIR}/pkg-plist
+SUB_FILES+=	gnome-screensaver.pam
+
+XSCREENSAVER_DIR=	${LOCALBASE}/share/xscreensaver/config
+SCREENSAVER_DIR=	share/applications/screensavers
+
+XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
+
+OPTIONS=	PAM "Pluggable Authentication Module support" on \
+		KEYRING "Enable GnomeKeyring integration (needs PAM)" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_PAM)
+RUN_DEPENDS+=		pam_helper:${PORTSDIR}/security/pam_helper
+CONFIGURE_ARGS+=	--enable-authentication-scheme=helper \
+			--with-passwd-helper=${LOCALBASE}/bin/pam_helper
+PLIST_SUB+=		PAM=""
+.else
+CONFIGURE_ARGS+=	--disable-pam
+PLIST_SUB+=		PAM="@comment "
+.endif
+
+.if defined(WITH_KEYRING) && defined(WITH_PAM)
+SUB_LIST+=		PAM_KEYRING=
+RUN_DEPENDS+=		${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
+.else
+SUB_LIST+=		PAM_KEYRING=\#
+.endif
+
+pre-everything::
+.if defined(WITHOUT_PAM) && defined(WITH_KEYRING)
+	@${ECHO_MSG} "Keyring integration is disabled because it needs PAM."
+.endif
+
+post-patch:
+.if defined(WITH_PAM)
+	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
+		${WRKSRC}/src/gs-auth-pam.c
+.endif
+
+pre-install:
+	@${CAT} ${.CURDIR}/pkg-plist > ${PLIST}
+	@cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
+		${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
+		${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \
+		${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
+	@${ECHO_CMD} @dirrm ${SCREENSAVER_DIR} >> ${PLIST}
+
+post-install:
+	${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
+	${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
+	${MKDIR} ${PREFIX}/${SCREENSAVER_DIR}
+	cd ${PREFIX}/${SCREENSAVER_DIR} && \
+		${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
+			${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
+			${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
+.if defined(WITH_PAM)
+	${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
new file mode 100644
index 000000000..58e63346c
--- /dev/null
+++ b/x11/gnome-screensaver/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-screensaver-2.30.2.tar.bz2) = 0fbe6e610e6847ac1e69d49b1e1f0582
+SHA256 (gnome2/gnome-screensaver-2.30.2.tar.bz2) = dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa
+SIZE (gnome2/gnome-screensaver-2.30.2.tar.bz2) = 4814653
diff --git a/x11/gnome-screensaver/files/gnome-screensaver.pam.in b/x11/gnome-screensaver/files/gnome-screensaver.pam.in
new file mode 100644
index 000000000..c2f8394ff
--- /dev/null
+++ b/x11/gnome-screensaver/files/gnome-screensaver.pam.in
@@ -0,0 +1,3 @@
+auth		include		system
+%%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
+account		include		system
diff --git a/x11/gnome-screensaver/files/patch-data_Makefile.in b/x11/gnome-screensaver/files/patch-data_Makefile.in
new file mode 100644
index 000000000..b61f2225d
--- /dev/null
+++ b/x11/gnome-screensaver/files/patch-data_Makefile.in
@@ -0,0 +1,73 @@
+--- data/Makefile.in.orig	2009-06-15 22:41:37.000000000 +0200
++++ data/Makefile.in	2009-06-15 22:42:51.000000000 +0200
+@@ -916,38 +916,38 @@
+ @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
+ 
+ install-data-hook:
+-	@system=`uname`; \
+-	if test -f /usr/include/security/pam_appl.h; then \
+-	  if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
+-		$(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
+-		chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
+-	   fi; \
+-	   if test $$system = Linux; then \
+-		if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-screensaver; then \
+-		     $(INSTALL_DATA) gnome-screensaver $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-screensaver; \
+-		fi; \
+-		if test "x$(PAM_PREFIX)" != "x/etc/pam.d"; then \
+-	             echo "***" ; \
+-	             echo "***  Warning: gnome-screensaver has been compiled with support for" ; \
+-	             echo "***           Pluggable Authentication Modules (PAM).  However, you may need to" ; \
+-	             echo "***           manually install $(PAM_PREFIX)/pam.d/gnome-screensaver" ; \
+-	             echo "***           to /etc/pam.d/gnome-screensaver.  Otherwise, unlocking might" ; \
+-	             echo "***           not work." ; \
+-	             echo "***" ; \
+-	             echo "***           Note: If you are using SuSE/Novell you may have to modify this file." ; \
+-	             echo "***" ; \
+-		fi; \
+-	   fi; \
+-	   if test $$system = SunOS; then \
+-	        echo "***" ; \
+-	        echo "***  Warning: gnome-screensaver has been compiled with support for" ; \
+-	        echo "***           Pluggable Authentication Modules (PAM).  However, you" ; \
+-	        echo "***           need to manually add authentication for gnome-screensaver in" ; \
+-	        echo "***           $(PAM_PREFIX)/pam.conf or /etc/pam.conf." ; \
+-	        echo "***           Otherwise, unlocking might not work." ; \
+-	        echo "***" ; \
+-	   fi; \
+-	fi
++#	@system=`uname`; \
++#	if test -f /usr/include/security/pam_appl.h; then \
++#	  if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
++#		$(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
++#		chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
++#	   fi; \
++#	   if test $$system = Linux; then \
++#		if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-screensaver; then \
++#		     $(INSTALL_DATA) gnome-screensaver $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-screensaver; \
++#		fi; \
++#		if test "x$(PAM_PREFIX)" != "x/etc/pam.d"; then \
++#	             echo "***" ; \
++#	             echo "***  Warning: gnome-screensaver has been compiled with support for" ; \
++#	             echo "***           Pluggable Authentication Modules (PAM).  However, you may need to" ; \
++#	             echo "***           manually install $(PAM_PREFIX)/pam.d/gnome-screensaver" ; \
++#	             echo "***           to /etc/pam.d/gnome-screensaver.  Otherwise, unlocking might" ; \
++#	             echo "***           not work." ; \
++#	             echo "***" ; \
++#	             echo "***           Note: If you are using SuSE/Novell you may have to modify this file." ; \
++#	             echo "***" ; \
++#		fi; \
++#	   fi; \
++#	   if test $$system = SunOS; then \
++#	        echo "***" ; \
++#	        echo "***  Warning: gnome-screensaver has been compiled with support for" ; \
++#	        echo "***           Pluggable Authentication Modules (PAM).  However, you" ; \
++#	        echo "***           need to manually add authentication for gnome-screensaver in" ; \
++#	        echo "***           $(PAM_PREFIX)/pam.conf or /etc/pam.conf." ; \
++#	        echo "***           Otherwise, unlocking might not work." ; \
++#	        echo "***" ; \
++#	   fi; \
++#	fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/gnome-screensaver/files/patch-src_gs-job.c b/x11/gnome-screensaver/files/patch-src_gs-job.c
new file mode 100644
index 000000000..39e303d27
--- /dev/null
+++ b/x11/gnome-screensaver/files/patch-src_gs-job.c
@@ -0,0 +1,12 @@
+--- src/gs-job.c.orig	Wed Sep  7 09:23:59 2005
++++ src/gs-job.c	Mon Sep 12 13:24:11 2005
+@@ -29,7 +29,8 @@
+ #include <sys/wait.h>
+ #include <errno.h>
+ 
+-#if defined(HAVE_SETPRIORITY) && defined(PRIO_PROCESS)
++#if defined(HAVE_SETPRIORITY)
++#include <sys/time.h>
+ #include <sys/resource.h>
+ #endif
+ 
diff --git a/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c b/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c
new file mode 100644
index 000000000..af5d39f8e
--- /dev/null
+++ b/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c
@@ -0,0 +1,11 @@
+--- src/gs-lock-plug.c.orig	2011-03-06 21:27:00.000000000 +0100
++++ src/gs-lock-plug.c	2011-03-06 21:27:36.000000000 +0100
+@@ -1090,7 +1090,7 @@ submit_note (GtkButton  *button,
+         strftime (summary, 128, "%X", tmp);
+ 
+         notify_init ("gnome-screensaver-dialog");
+-        note = notify_notification_new (summary, escaped_text, NULL, NULL);
++        note = notify_notification_new (summary, escaped_text, NULL);
+         notify_notification_set_timeout (note, NOTIFY_EXPIRES_NEVER);
+         notify_notification_show (note, NULL);
+         g_object_unref (note);
diff --git a/x11/gnome-screensaver/pkg-descr b/x11/gnome-screensaver/pkg-descr
new file mode 100644
index 000000000..96af92f11
--- /dev/null
+++ b/x11/gnome-screensaver/pkg-descr
@@ -0,0 +1,7 @@
+Gnome-screensaver is GNOME-based screen saver and locker that aims to have
+simple, sane, secure defaults and be well integrated with the desktop.
+It is designed to support:
+
+        * the ability to lock down configuration settings
+        * translation into other languages
+        * user switching
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
new file mode 100644
index 000000000..4333ecdb3
--- /dev/null
+++ b/x11/gnome-screensaver/pkg-plist
@@ -0,0 +1,157 @@
+bin/gnome-screensaver
+bin/gnome-screensaver-command
+bin/gnome-screensaver-preferences
+%%PAM%%etc/pam.d/gnome-screensaver
+etc/xdg/autostart/gnome-screensaver.desktop
+etc/xdg/menus/gnome-screensavers.menu
+libdata/pkgconfig/gnome-screensaver.pc
+libexec/gnome-screensaver-dialog
+libexec/gnome-screensaver-gl-helper
+libexec/gnome-screensaver/floaters
+libexec/gnome-screensaver/popsquares
+libexec/gnome-screensaver/slideshow
+share/applications/gnome-screensaver-preferences.desktop
+share/applications/screensavers/cosmos-slideshow.desktop
+share/applications/screensavers/footlogo-floaters.desktop
+share/applications/screensavers/personal-slideshow.desktop
+share/applications/screensavers/popsquares.desktop
+share/dbus-1/services/org.gnome.ScreenSaver.service
+share/desktop-directories/gnome-screensaver.directory
+%%DATADIR%%/gnome-screensaver-preferences.ui
+%%DATADIR%%/lock-dialog-default.ui
+share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
+share/locale/as/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ast/LC_MESSAGES/gnome-screensaver.mo
+share/locale/be/LC_MESSAGES/gnome-screensaver.mo
+share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo
+share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
+share/locale/bn/LC_MESSAGES/gnome-screensaver.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-screensaver.mo
+share/locale/br/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ca/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-screensaver.mo
+share/locale/crh/LC_MESSAGES/gnome-screensaver.mo
+share/locale/cs/LC_MESSAGES/gnome-screensaver.mo
+share/locale/cy/LC_MESSAGES/gnome-screensaver.mo
+share/locale/da/LC_MESSAGES/gnome-screensaver.mo
+share/locale/de/LC_MESSAGES/gnome-screensaver.mo
+share/locale/dz/LC_MESSAGES/gnome-screensaver.mo
+share/locale/el/LC_MESSAGES/gnome-screensaver.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-screensaver.mo
+share/locale/en_CA/LC_MESSAGES/gnome-screensaver.mo
+share/locale/en_GB/LC_MESSAGES/gnome-screensaver.mo
+share/locale/es/LC_MESSAGES/gnome-screensaver.mo
+share/locale/et/LC_MESSAGES/gnome-screensaver.mo
+share/locale/eu/LC_MESSAGES/gnome-screensaver.mo
+share/locale/fa/LC_MESSAGES/gnome-screensaver.mo
+share/locale/fi/LC_MESSAGES/gnome-screensaver.mo
+share/locale/fr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ga/LC_MESSAGES/gnome-screensaver.mo
+share/locale/gl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/gu/LC_MESSAGES/gnome-screensaver.mo
+share/locale/he/LC_MESSAGES/gnome-screensaver.mo
+share/locale/hi/LC_MESSAGES/gnome-screensaver.mo
+share/locale/hr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/hu/LC_MESSAGES/gnome-screensaver.mo
+share/locale/id/LC_MESSAGES/gnome-screensaver.mo
+share/locale/is/LC_MESSAGES/gnome-screensaver.mo
+share/locale/it/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ja/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ka/LC_MESSAGES/gnome-screensaver.mo
+share/locale/kn/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ko/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ku/LC_MESSAGES/gnome-screensaver.mo
+share/locale/lt/LC_MESSAGES/gnome-screensaver.mo
+share/locale/lv/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mai/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mg/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mk/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ml/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
+share/locale/nds/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
+share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/nn/LC_MESSAGES/gnome-screensaver.mo
+share/locale/oc/LC_MESSAGES/gnome-screensaver.mo
+share/locale/or/LC_MESSAGES/gnome-screensaver.mo
+share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
+share/locale/pl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ps/LC_MESSAGES/gnome-screensaver.mo
+share/locale/pt/LC_MESSAGES/gnome-screensaver.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ro/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ru/LC_MESSAGES/gnome-screensaver.mo
+share/locale/si/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sq/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sv/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
+share/locale/te/LC_MESSAGES/gnome-screensaver.mo
+share/locale/th/LC_MESSAGES/gnome-screensaver.mo
+share/locale/tr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/uk/LC_MESSAGES/gnome-screensaver.mo
+share/locale/vi/LC_MESSAGES/gnome-screensaver.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
+share/backgrounds/cosmos/background-1.xml
+share/backgrounds/cosmos/blue-marble-west.jpg
+share/backgrounds/cosmos/cloud.jpg
+share/backgrounds/cosmos/comet.jpg
+share/backgrounds/cosmos/earth-horizon.jpg
+share/backgrounds/cosmos/galaxy-ngc3370.jpg
+share/backgrounds/cosmos/helix-nebula.jpg
+share/backgrounds/cosmos/jupiter.jpg
+share/backgrounds/cosmos/sombrero.jpg
+share/backgrounds/cosmos/whirlpool.jpg
+share/gnome-background-properties/cosmos.xml
+share/pixmaps/gnome-logo-white.svg
+@dirrm share/gnome-background-properties
+@dirrm share/backgrounds/cosmos
+@dirrmtry share/backgrounds
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm libexec/gnome-screensaver
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as