svn commit: r371671 - head/irc/irc

[Johan van Selst]

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>