Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/x11/xscreensaver-demo/Attic/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/x11/xscreensaver-demo/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- pkgsrc/x11/xscreensaver-demo/Attic/Makefile 2003/12/18 13:49:17 1.2 +++ pkgsrc/x11/xscreensaver-demo/Attic/Makefile 2004/01/03 18:50:01 1.3 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2003/12/18 13:49:17 atatat Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/03 18:50:01 reed Exp $ # PKGNAME= ${DISTNAME:S/-/-demo-/} COMMENT= Screen saver and locker for the X window system (demo program) -PKGREVISION= 1 +PKGREVISION= 2 CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]*