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/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/x11/xscreensaver/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.99 retrieving revision 1.100 diff -u -p -r1.99 -r1.100 --- pkgsrc/x11/xscreensaver/Makefile 2012/10/29 05:07:19 1.99 +++ pkgsrc/x11/xscreensaver/Makefile 2013/05/31 12:42:57 1.100 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.99 2012/10/29 05:07:19 asau Exp $ +# $NetBSD: Makefile,v 1.100 2013/05/31 12:42:57 wiz Exp $ COMMENT= Screen saver and locker for the X window system -PKGREVISION= 1 +PKGREVISION= 2 CONFLICTS+= xscreensaver-gnome<4.14