From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 29 09:41:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5C9F8A0;
 Wed, 29 Oct 2014 09:41:48 +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 4914AD2B;
 Wed, 29 Oct 2014 09:41:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9T9fmwm032310;
 Wed, 29 Oct 2014 09:41:48 GMT (envelope-from johans@FreeBSD.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9T9fm9o032309;
 Wed, 29 Oct 2014 09:41:48 GMT (envelope-from johans@FreeBSD.org)
Message-Id: <201410290941.s9T9fm9o032309@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: johans set sender to
 johans@FreeBSD.org using -f
From: Johan van Selst <johans@FreeBSD.org>
Date: Wed, 29 Oct 2014 09:41:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371671 - head/irc/irc
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.18-1
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: Wed, 29 Oct 2014 09:41:48 -0000

Author: johans
Date: Wed Oct 29 09:41:47 2014
New Revision: 371671
URL: https://svnweb.freebsd.org/changeset/ports/371671
QAT: https://qat.redports.org/buildarchive/r371671/

Log:
  The IRC configure script has curious logic, is being overly complex,
  and actually breaks badly if the port is being built in a chroot
  where the host triplet won't match the jail triplet.
  
  The solution I've provided here is clean.  Using the pre-configure
  target, the build directory (with a fixed name) is created and the
  needed configure script and header are copied over, just like the top
  configure script does.  Then the port makefile just configures with
  that.  It's much better, more robust, and fixes the triplet mismatch.
  
  PR:		194679
  Submitted by:	marino

Modified:
  head/irc/irc/Makefile

Modified: head/irc/irc/Makefile
==============================================================================
--- head/irc/irc/Makefile	Wed Oct 29 09:13:41 2014	(r371670)
+++ head/irc/irc/Makefile	Wed Oct 29 09:41:47 2014	(r371671)
@@ -19,11 +19,17 @@ CONFLICTS_INSTALL=	charybdis-[0-9]* ircd
 USE_RC_SUBR=	ircd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd
-BUILD_WRKSRC=	${WRKSRC}/${MACHINE_ARCH}-unknown-${OPSYS:tl}${OSREL}
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
+BUILD_WRKSRC=		${WRKSRC}/build
+INSTALL_WRKSRC=		${BUILD_WRKSRC}
+CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
 
 OPTIONS_DEFINE=	IPV6
 OPTIONS_DEFAULT=IPV6
 IPV6_CONFIGURE_ENABLE=	ipv6
 
+pre-configure:
+	@${MKDIR} ${BUILD_WRKSRC}
+	${CP} -p ${WRKSRC}/support/configure ${BUILD_WRKSRC}
+	${CP} -p ${WRKSRC}/support/config.h.dist ${BUILD_WRKSRC}/config.h
+
 .include <bsd.port.mk>