diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-02-13 23:03:22 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-02-13 23:03:22 +0000 |
| commit | dc0bc71533f500c2f62212ac881ebe2063bb4d4f (patch) | |
| tree | 1afcdce79516eb4e8f8324baf19202e2d6eea068 /x11 | |
| parent | Fix typo (diff) | |
- Correctly work in GNOME/noGNOME cases (plist and such);
- allow CATEGORIES and MAINTAINER be overriden in slaves.
Notes
Notes:
svn path=/head/; revision=54672
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xscreensaver/Makefile | 6 | ||||
| -rw-r--r-- | x11/xscreensaver/files/patch-ab | 17 | ||||
| -rw-r--r-- | x11/xscreensaver/pkg-plist | 10 |
3 files changed, 25 insertions, 8 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 6df15daac781..999e4760bc6a 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -7,10 +7,11 @@ PORTNAME= xscreensaver PORTVERSION= 4.00 -CATEGORIES= x11 +PORTREVISION= 1 +CATEGORIES?= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ -MAINTAINER= DougB@FreeBSD.org +MAINTAINER?= DougB@FreeBSD.org LIB_DEPENDS= gle.3:${PORTSDIR}/graphics/gle \ xml.5:${PORTSDIR}/textproc/libxml @@ -28,6 +29,7 @@ CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \ .include <bsd.port.pre.mk> .if defined(HAVE_GNOME) +USE_GNOME= yes CONFIGURE_ARGS+= --with-gnome .else CONFIGURE_ARGS+= --without-gnome diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab index a02757728c78..2057668883f6 100644 --- a/x11/xscreensaver/files/patch-ab +++ b/x11/xscreensaver/files/patch-ab @@ -1,5 +1,8 @@ ---- configure.orig Wed Jan 2 00:15:22 2002 -+++ configure Sun Jan 13 15:52:38 2002 + +$FreeBSD$ + +--- configure.orig Wed Jan 2 10:15:22 2002 ++++ configure Wed Feb 13 15:53:35 2002 @@ -5999,7 +5999,7 @@ PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err" elif test "$have_kerberos" = yes ; then @@ -9,11 +12,13 @@ fi if test "$have_kerberos" = yes ; then -@@ -9883,6 +9883,8 @@ +@@ -9881,8 +9881,8 @@ + # Now that we know whether we have Gnome, we can decide where the XML + # config files get installed. if test -z "$HACK_CONF_DIR" ; then - if test -n "$GNOME_DATADIR" ; then - HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers' -+ elif test -n "$CONFIGDIR" ; then +- if test -n "$GNOME_DATADIR" ; then +- HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers' ++ if test -n "$CONFIGDIR" ; then + HACK_CONF_DIR="$CONFIGDIR" else HACK_CONF_DIR='${prefix}/lib/xscreensaver/config' diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist index 3517350bf4fe..117cee9a13f0 100644 --- a/x11/xscreensaver/pkg-plist +++ b/x11/xscreensaver/pkg-plist @@ -1,3 +1,4 @@ +%%GNOME:%%bin/screensaver-properties-capplet bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-demo @@ -134,6 +135,15 @@ bin/xscreensaver-hacks/xspirograph bin/xscreensaver-hacks/xsublim bin/xscreensaver-hacks/xteevee bin/xscreensaver-hacks/zoom +%%GNOME:%%share/gnome/control-center/Desktop/screensaver-properties.desktop +%%GNOME:%%share/gnome/gnome/apps/Settings/Desktop/screensaver-properties.desktop +%%GNOME:%%share/gnome/pixmaps/screensaver-cmndln.xpm +%%GNOME:%%share/gnome/pixmaps/screensaver-colorselector.xpm +%%GNOME:%%share/gnome/pixmaps/screensaver-diagnostic.xpm +%%GNOME:%%share/gnome/pixmaps/screensaver-locking.xpm +%%GNOME:%%share/gnome/pixmaps/screensaver-power.xpm +%%GNOME:%%share/gnome/pixmaps/screensaver-snap.xpm +%%GNOME:%%share/gnome/pixmaps/xscreensaver.xpm share/xscreensaver/config/README share/xscreensaver/config/ant.xml share/xscreensaver/config/atlantis.xml |