svn commit: r387780 - in head/deskutils/gnome-initial-setup: . files
Don Lewis
truckman at FreeBSD.org
Fri May 29 04:24:56 UTC 2015
Author: truckman
Date: Fri May 29 04:24:55 2015
New Revision: 387780
URL: https://svnweb.freebsd.org/changeset/ports/387780
Log:
Recategorize an unconditional patch as an EXTRA_PATCH to unbreak
the build on FreeBSD 8.
Change the OSVERSION test to the actual version where the utmp -> utmpx
change was actually made, and also check OPSYS.
Approved by: mat (mentor, implicit)
Added:
head/deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_pages_password_um-utils.c
- copied unchanged from r387543, head/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_password_um-utils.c
Deleted:
head/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_password_um-utils.c
Modified:
head/deskutils/gnome-initial-setup/Makefile
Modified: head/deskutils/gnome-initial-setup/Makefile
==============================================================================
--- head/deskutils/gnome-initial-setup/Makefile Thu May 28 23:17:27 2015 (r387779)
+++ head/deskutils/gnome-initial-setup/Makefile Fri May 29 04:24:55 2015 (r387780)
@@ -33,8 +33,9 @@ OPTIONS_DEFAULT=KERBEROS
.include <bsd.port.options.mk>
-.if ${OSVERSION} >= 900000
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-initial-setup_pages_account_um-utils.c
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 900007
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-initial-setup_pages_account_um-utils.c \
+ ${FILESDIR}/extra-patch-gnome-initial-setup_pages_password_um-utils.c
.endif
.if !${PORT_OPTIONS:MKERBEROS}
Copied: head/deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_pages_password_um-utils.c (from r387543, head/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_password_um-utils.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_pages_password_um-utils.c Fri May 29 04:24:55 2015 (r387780, copy of r387543, head/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_password_um-utils.c)
@@ -0,0 +1,12 @@
+--- gnome-initial-setup/pages/password/um-utils.c.orig 2014-05-12 17:42:09.000000000 +0000
++++ gnome-initial-setup/pages/password/um-utils.c 2014-05-13 20:51:30.994992990 +0000
+@@ -26,7 +26,8 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+-#include <utmp.h>
++#include <utmpx.h>
++#define UT_NAMESIZE 16
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
More information about the svn-ports-all
mailing list