number, if there was one (which, of course, makes me bump PKGREVISION to 1 for all three xscreensaver pkgs (are we really supposed to bump PKGREVISION for each pkg individually?)). This eliminates the confusion where pkg_info says version "4.14nb1" is installed, yet the dialogue says it's onlu version "4.14". Also, fix the conflicts for the screensaver pkg so that it properly conflicts with xscreensaver-gnome<4.14 (not <1.14).
22 lines
600 B
Text
22 lines
600 B
Text
$NetBSD: patch-af,v 1.13 2003/12/18 13:49:17 atatat Exp $
|
|
|
|
Make the password dialogue banner display the netbsd PKGREVISION
|
|
number, if there was one.
|
|
|
|
--- driver/xscreensaver.c.orig 2003-10-07 04:59:40.000000000 -0400
|
|
+++ driver/xscreensaver.c
|
|
@@ -478,9 +478,13 @@ set_version_string (saver_info *si, int
|
|
*s = '_';
|
|
}
|
|
|
|
- si->version = (char *) malloc (5);
|
|
+ si->version = (char *) malloc (32);
|
|
memcpy (si->version, screensaver_id + 17, 4);
|
|
si->version [4] = 0;
|
|
+
|
|
+#if PKGREVISION > 0
|
|
+ (void)snprintf(si->version, 10, "%.4snb%d", screensaver_id + 17, PKGREVISION);
|
|
+#endif
|
|
}
|
|
|
|
|