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.103 retrieving revision 1.104 diff -u -p -r1.103 -r1.104 --- pkgsrc/x11/xscreensaver/Makefile 2014/08/12 15:57:13 1.103 +++ pkgsrc/x11/xscreensaver/Makefile 2015/04/25 14:25:25 1.104 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.103 2014/08/12 15:57:13 hauke Exp $ +# $NetBSD: Makefile,v 1.104 2015/04/25 14:25:25 tnn Exp $ COMMENT= Screen saver and locker for the X window system +PKGREVISION= 1 CONFLICTS+= xscreensaver-gnome<4.14