From owner-svn-ports-head@FreeBSD.ORG  Thu Apr 30 15:34:29 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 4B09CE36;
 Thu, 30 Apr 2015 15:34:29 +0000 (UTC)
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 3911C1909;
 Thu, 30 Apr 2015 15:34:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UFYTX0088447;
 Thu, 30 Apr 2015 15:34:29 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UFYTD2088446;
 Thu, 30 Apr 2015 15:34:29 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201504301534.t3UFYTD2088446@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org
 using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 30 Apr 2015 15:34:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r385052 - head/audio/mumble
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Apr 2015 15:34:29 -0000

Author: feld
Date: Thu Apr 30 15:34:28 2015
New Revision: 385052
URL: https://svnweb.freebsd.org/changeset/ports/385052

Log:
  "But be aware that some variables will not work as expected after the
  inclusion of bsd.port.pre.mk, typically some USE_* flags."
  
  relocate to ensure port options don't end up broken
  
  pointyhat -> me

Modified:
  head/audio/mumble/Makefile

Modified: head/audio/mumble/Makefile
==============================================================================
--- head/audio/mumble/Makefile	Thu Apr 30 15:17:20 2015	(r385051)
+++ head/audio/mumble/Makefile	Thu Apr 30 15:34:28 2015	(r385052)
@@ -34,13 +34,6 @@ MAKE_JOBS_UNSAFE=yes
 CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-opus no-update \
 		bundled-celt no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
 
-.include <bsd.port.pre.mk>
-
-# PCH is broken on GCC
-.if ${COMPILER_TYPE} == gcc
-CONFIG+=	no-pch
-.endif
-
 QMAKE_ARGS=	"CONFIG+=${CONFIG}"
 
 OPTIONS_DEFINE=	DBUS BONJOUR
@@ -61,6 +54,13 @@ CONFIG+=	no-bonjour
 LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 .endif
 
+.include <bsd.port.pre.mk>
+
+# PCH is broken on GCC
+.if ${COMPILER_TYPE} == gcc
+CONFIG+=	no-pch
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro