summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-10 08:25:02 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-10 08:25:02 +0800
commit4d99dad2557a0628b8faaa1cb461700350e221d2 (patch)
tree7af81430e566f930f70a25456a468db372a56229 /x11
parent86479645016d3620f6b6c48d3a6dccbf174287ff (diff)
downloadmarcuscom-ports-4d99dad2557a0628b8faaa1cb461700350e221d2.tar
marcuscom-ports-4d99dad2557a0628b8faaa1cb461700350e221d2.tar.gz
marcuscom-ports-4d99dad2557a0628b8faaa1cb461700350e221d2.tar.bz2
marcuscom-ports-4d99dad2557a0628b8faaa1cb461700350e221d2.tar.lz
marcuscom-ports-4d99dad2557a0628b8faaa1cb461700350e221d2.tar.xz
marcuscom-ports-4d99dad2557a0628b8faaa1cb461700350e221d2.tar.zst
marcuscom-ports-4d99dad2557a0628b8faaa1cb461700350e221d2.zip
Complete xscreensaver support, and bump PORTREVISION again.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4810 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-screensaver/Makefile7
-rw-r--r--x11/gnome-screensaver/files/patch-src_gs-job.c16
2 files changed, 18 insertions, 5 deletions
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index ce1636df8..c37c79b98 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.11 2005/09/09 21:15:13 ahze Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.12 2005/09/09 21:18:36 ahze Exp $
#
PORTNAME= gnome-screensaver
PORTVERSION= 0.0.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.0
@@ -34,7 +34,8 @@ GCONF_SCHEMAS= gnome-screensaver.schemas
post-patch:
@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/configure
+ ${WRKSRC}/configure \
+ ${WRKSRC}/src/gs-job.c
post-install:
${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
diff --git a/x11/gnome-screensaver/files/patch-src_gs-job.c b/x11/gnome-screensaver/files/patch-src_gs-job.c
index 9363ee6e6..484c46ef8 100644
--- a/x11/gnome-screensaver/files/patch-src_gs-job.c
+++ b/x11/gnome-screensaver/files/patch-src_gs-job.c
@@ -1,5 +1,5 @@
---- src/gs-job.c.orig Wed Jun 8 23:57:35 2005
-+++ src/gs-job.c Thu Jun 9 00:00:29 2005
+--- src/gs-job.c.orig Wed Sep 7 09:23:59 2005
++++ src/gs-job.c Fri Sep 9 20:21:31 2005
@@ -29,7 +29,8 @@
#include <sys/wait.h>
#include <errno.h>
@@ -10,3 +10,15 @@
#include <sys/resource.h>
#endif
+@@ -655,9 +656,10 @@ gs_job_set_widget (GSJob *job,
+ static const char *known_locations [] = {
+ SAVERDIR,
+ LIBEXECDIR "/xscreensaver",
+- "/usr/X11R6/lib/xscreensaver",
++ "%%X11BASE%%/lib/xscreensaver",
+ "/usr/libexec/xscreensaver",
+ "/usr/lib/xscreensaver",
++ "%%X11BASE%%/bin/xscreensaver-hacks",
+ NULL
+ };
+