From owner-svn-ports-all@FreeBSD.ORG  Sun Nov 10 20:25:25 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id EC5D03CA;
 Sun, 10 Nov 2013 20:25:25 +0000 (UTC) (envelope-from nox@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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA08F2FD8;
 Sun, 10 Nov 2013 20:25:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAKPPkJ024548;
 Sun, 10 Nov 2013 20:25:25 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAAKPPAR024547;
 Sun, 10 Nov 2013 20:25:25 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201311102025.rAAKPPAR024547@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Sun, 10 Nov 2013 20:25:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333440 - head/emulators/qemu-devel
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.14
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: Sun, 10 Nov 2013 20:25:26 -0000

Author: nox
Date: Sun Nov 10 20:25:25 2013
New Revision: 333440
URL: http://svnweb.freebsd.org/changeset/ports/333440

Log:
  - Fix plist when security/nss is installed. [1]
  - (Attempt to) fix build with unusual locales(?). [2]
  
  Reported by:	jkim (via private email) [1]
  Reported by:	AN <andy@neu.net> on -ports [2]

Modified:
  head/emulators/qemu-devel/Makefile

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Sun Nov 10 20:19:46 2013	(r333439)
+++ head/emulators/qemu-devel/Makefile	Sun Nov 10 20:25:25 2013	(r333440)
@@ -46,9 +46,11 @@ STATIC_LINK_DESC=	Statically link the ex
 OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP
 
 NO_STAGE=	yes
+
 .include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--extra-ldflags=-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--disable-smartcard-nss
 PORTDOCS=	docs qemu-doc.html qemu-tech.html qmp-commands.txt
 
 .if ${PORT_OPTIONS:MX86_TARGETS}
@@ -232,6 +234,9 @@ post-patch:
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch
 .endif
 	@${REINPLACE_CMD} -E \
+		-e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \
+		${WRKSRC}/qemu-doc.texi
+	@${REINPLACE_CMD} -E \
 		-e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \
 		-e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \
 		${WRKSRC}/Makefile.target