From owner-svn-ports-all@FreeBSD.ORG  Fri May 29 04:24:56 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 538BC6E7;
 Fri, 29 May 2015 04:24:56 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 27C531FC0;
 Fri, 29 May 2015 04:24:56 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4T4OuST079924;
 Fri, 29 May 2015 04:24:56 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4T4OtrT079920;
 Fri, 29 May 2015 04:24:55 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201505290424.t4T4OtrT079920@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Fri, 29 May 2015 04:24:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r387780 - in head/deskutils/gnome-initial-setup: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 May 2015 04:24:56 -0000

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>