svn commit: r301676 - in head/x11/xscreensaver: . files

[Doug Barton]

Author: dougb
Date: Sun Jul 29 08:01:59 2012
New Revision: 301676
URL: http://svn.freebsd.org/changeset/ports/301676

Log:
  Upgrade to 5.19 which contains some minor improvements
  
  Add .desktop files for starting and stopping the daemon, and locking
  and blanking the screen.
  
  Add an explicit build dep for pkgconf, and add a sed pattern for configure
  since pkgconf does not support the --list-all option

Added:
  head/x11/xscreensaver/files/xscreensaver-blank.desktop.in   (contents, props changed)
  head/x11/xscreensaver/files/xscreensaver-lock.desktop.in   (contents, props changed)
  head/x11/xscreensaver/files/xscreensaver-start.desktop.in   (contents, props changed)
  head/x11/xscreensaver/files/xscreensaver-stop.desktop.in   (contents, props changed)
Modified:
  head/x11/xscreensaver/Makefile
  head/x11/xscreensaver/distinfo
  head/x11/xscreensaver/pkg-plist

Modified: head/x11/xscreensaver/Makefile
==============================================================================
--- head/x11/xscreensaver/Makefile	Sun Jul 29 07:28:17 2012	(r301675)
+++ head/x11/xscreensaver/Makefile	Sun Jul 29 08:01:59 2012	(r301676)
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.18
-CATEGORIES?=	x11
-MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
-		http://dougbarton.us/Downloads/
+PORTVERSION=	5.19
+CATEGORIES=	x11
+MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
-MAINTAINER?=	dougb at FreeBSD.org
+MAINTAINER=	dougb at FreeBSD.org
 COMMENT=	Save your screen while you entertain your cat
 
+BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS=	gle.4:${PORTSDIR}/graphics/gle \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
@@ -134,13 +134,16 @@ MAN6=	anemone.6 anemotaxis.6 antinspect.
 	companioncube.6 hilbert.6 tronbit.6 \
 	xscreensaver-gl-helper.6
 
+SUB_FILES=	xscreensaver-blank.desktop xscreensaver-lock.desktop \
+		xscreensaver-start.desktop xscreensaver-stop.desktop
+
 post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
 	@ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
 		-e 's#malloc.h#stdlib.h#g' \
 		-e 's#/usr/X11R6#${LOCALBASE}#g' \
+		-e 's#pkg_config --list-all#pkg_config --help#' \
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
-
 .if defined(WITH_PAM)
 .for f in driver/passwd-pam.c driver/xscreensaver.man
 	@ ${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
@@ -161,5 +164,6 @@ post-install:
 		${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
 			${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
 			${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
+	${INSTALL_DATA} ${WRKDIR}/*.desktop ${PREFIX}/share/applications/
 
 .include <bsd.port.post.mk>

Modified: head/x11/xscreensaver/distinfo
==============================================================================
--- head/x11/xscreensaver/distinfo	Sun Jul 29 07:28:17 2012	(r301675)
+++ head/x11/xscreensaver/distinfo	Sun Jul 29 08:01:59 2012	(r301676)
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.18.tar.gz) = 3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9
-SIZE (xscreensaver-5.18.tar.gz) = 7363800
+SHA256 (xscreensaver-5.19.tar.gz) = fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0
+SIZE (xscreensaver-5.19.tar.gz) = 7373580

Added: head/x11/xscreensaver/files/xscreensaver-blank.desktop.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xscreensaver/files/xscreensaver-blank.desktop.in	Sun Jul 29 08:01:59 2012	(r301676)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=XScreenSaver Blank
+Comment=Blank the screen with (activate) XScreenSaver
+Icon=%%PREFIX%%/share/xscreensaver/glade/screensaver-diagnostic.png
+Exec=%%PREFIX%%/bin/xscreensaver-command -activate
+Categories=Settings;DesktopSettings;Security;X-XFCE;XScreenSaver;
+Terminal=false
+StartupNotify=false

Added: head/x11/xscreensaver/files/xscreensaver-lock.desktop.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xscreensaver/files/xscreensaver-lock.desktop.in	Sun Jul 29 08:01:59 2012	(r301676)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=XScreenSaver Lock
+Comment=Lock the screen with XScreenSaver
+Icon=%%PREFIX%%/share/xscreensaver/glade/screensaver-locking.png
+Exec=%%PREFIX%%/bin/xscreensaver-command -lock
+Categories=Settings;DesktopSettings;Security;X-XFCE;XScreenSaver;
+Terminal=false
+StartupNotify=false

Added: head/x11/xscreensaver/files/xscreensaver-start.desktop.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xscreensaver/files/xscreensaver-start.desktop.in	Sun Jul 29 08:01:59 2012	(r301676)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=XScreenSaver Start
+Comment=Start XScreenSaver daemon
+Icon=%%PREFIX%%/share/pixmaps/xscreensaver.xpm
+Exec=%%PREFIX%%/bin/xscreensaver
+Categories=Settings;DesktopSettings;Security;X-XFCE;XScreenSaver;
+Terminal=false
+StartupNotify=false

Added: head/x11/xscreensaver/files/xscreensaver-stop.desktop.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xscreensaver/files/xscreensaver-stop.desktop.in	Sun Jul 29 08:01:59 2012	(r301676)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=XScreenSaver Stop
+Comment=Stop XScreenSaver daemon
+Icon=process-stop
+Exec=%%PREFIX%%/bin/xscreensaver-command -exit
+Categories=Settings;DesktopSettings;Security;X-XFCE;XScreenSaver;
+Terminal=false
+StartupNotify=false

Modified: head/x11/xscreensaver/pkg-plist
==============================================================================
--- head/x11/xscreensaver/pkg-plist	Sun Jul 29 07:28:17 2012	(r301675)
+++ head/x11/xscreensaver/pkg-plist	Sun Jul 29 08:01:59 2012	(r301676)
@@ -208,7 +208,11 @@ bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
 %%PAM%%etc/pam.d/xscreensaver
 lib/X11/app-defaults/XScreenSaver
+share/applications/xscreensaver-blank.desktop
+share/applications/xscreensaver-lock.desktop
 share/applications/xscreensaver-properties.desktop
+share/applications/xscreensaver-start.desktop
+share/applications/xscreensaver-stop.desktop
 share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/README
 %%DATADIR%%/config/abstractile.xml