diff options
| author | fredb <fredb@pkgsrc.org> | 2000-09-11 20:46:36 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2000-09-11 20:46:36 +0000 |
| commit | 6149f04faec636511e680dc3e9b274e412466b7f (patch) | |
| tree | f98edb35acfd3f7aed567227f9d952d1f4b1239b /x11/xscreensaver-gnome | |
| parent | 33d14f8283a417f6315bb7a9890b68532f66b6cf (diff) | |
| download | pkgsrc-6149f04faec636511e680dc3e9b274e412466b7f.tar.gz | |
Excise "screensaver" capplet from control-center, in order to resolve
conflict with xscreensaver-gnome, as discussed (briefly) on tech-pkg.
Also, reorder some dependencies: gnome-core (rather than gnome) depends
on xscreensaver-gnome, which depends on control-center; bump teeny
version of xscreensaver-gnome so control-center won't try to go with
old binary packages of xscreensaver-gnome, which would lead to circular
dependencies.
Diffstat (limited to 'x11/xscreensaver-gnome')
| -rw-r--r-- | x11/xscreensaver-gnome/Makefile | 6 | ||||
| -rw-r--r-- | x11/xscreensaver-gnome/pkg/PLIST | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 3112cd5e815..91cc5cb0360 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2000/07/10 18:18:39 tron Exp $ +# $NetBSD: Makefile,v 1.3 2000/09/11 20:46:41 fredb Exp $ # -PKGNAME= ${DISTNAME:S/-/-gnome-/} +PKGNAME= ${DISTNAME:S/-/-gnome-/:S/$/nb1/} -DEPENDS+= gnome-core>=1.2.0:../../x11/gnome-core +DEPENDS+= control-center>=1.2.0:../../x11/controlcenter CONFLICTS+= xscreensaver-[0-9]* diff --git a/x11/xscreensaver-gnome/pkg/PLIST b/x11/xscreensaver-gnome/pkg/PLIST index bd24615238a..aefd0159738 100644 --- a/x11/xscreensaver-gnome/pkg/PLIST +++ b/x11/xscreensaver-gnome/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2000/09/11 13:49:15 fredb Exp $ +@comment $NetBSD: PLIST,v 1.5 2000/09/11 20:46:41 fredb Exp $ bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-demo @@ -187,6 +187,6 @@ man/man1/xscreensaver-demo.1 man/man1/xscreensaver.1 man/man1/xsublim.1 man/man1/xteevee.1 -share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/control-center/Desktop/screensaver-properties.desktop +share/gnome/apps/Settings/Desktop/screensaver-properties.desktop @dirrm libexec/xscreensaver |