From owner-svn-ports-all@FreeBSD.ORG Tue Jul 8 09:44:14 2014 Return-Path: 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 ESMTPS id 61075ECE; Tue, 8 Jul 2014 09:44:14 +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 342D92F20; Tue, 8 Jul 2014 09:44:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s689iE2s062999; Tue, 8 Jul 2014 09:44:14 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s689iEP1062998; Tue, 8 Jul 2014 09:44:14 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407080944.s689iEP1062998@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 8 Jul 2014 09:44:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361207 - head/www/interchange 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 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2014 09:44:14 -0000 Author: rakuco Date: Tue Jul 8 09:44:13 2014 New Revision: 361207 URL: http://svnweb.freebsd.org/changeset/ports/361207 QAT: https://qat.redports.org/buildarchive/r361207/ Log: Override do-configure with our own. We install most of interchange's files into ${PREFIX}/interchange. This does not play well with Uses/perl5.mk, since it appends some values to CONFIGURE_ARGS that do not work with a custom prefix (it overrides PREFIX, INSTALLARCHLIB and INSTALLPRIVLIB). Since the right paths are necessary at the configure stage, we have to implement do-configure ourselves with a custom INTERCH_CONFIGURE_ARGS with the values we want. Additionally, set only the required values in INTERCH_CONFIGURE_ARGS and MAKE_ARGS, based on what upstream's RPM spec file does. Submitted by: loader@freebsdmall.com Modified: head/www/interchange/Makefile Modified: head/www/interchange/Makefile ============================================================================== --- head/www/interchange/Makefile Tue Jul 8 09:37:51 2014 (r361206) +++ head/www/interchange/Makefile Tue Jul 8 09:44:13 2014 (r361207) @@ -3,12 +3,12 @@ PORTNAME= interchange PORTVERSION= 5.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www perl5 MASTER_SITES= http://ftp.icdevgroup.org/interchange/5.6/tar/ MAINTAINER= ports@FreeBSD.org -COMMENT= RedHat's database-enabled e-commerce server +COMMENT= RedHat\'s database-enabled e-commerce server RUN_DEPENDS= p5-Safe-Hole>=0.10:${PORTSDIR}/security/p5-Safe-Hole \ p5-URI>=1.37:${PORTSDIR}/net/p5-URI \ @@ -31,18 +31,27 @@ USE_RC_SUBR= interchange INTERCH_PREFIX= ${PREFIX}/interchange -CONFIGURE_ARGS= INTERCHANGE_USER=interch \ - force=1 -MAKE_ARGS= INSTALLARCHLIB=${INTERCH_PREFIX} \ - INSTALLPRIVLIB=${INTERCH_PREFIX}/lib \ - INSTALLMAN1DIR=${PREFIX}/man/man1 \ - NOCPANINSTALL=1 +# Basically the parts of CONFIGURE_ARGS that interest us without +# Uses/perl5.mk's overriding of PREFIX, INSTALLARCHLIB and INSTALLPRIVLIB, +# since we install into a custom location. +INTERCH_CONFIGURE_ARGS= INSTALLDIRS=site \ + INTERCHANGE_USER=interch \ + PREFIX=${INTERCH_PREFIX} \ + force=1 +MAKE_ARGS= NOCPANINSTALL=1 pre-install: # This directory must exist before the installation happens, otherwise _uid (a # file) will be copied to a file called ${STAGEDIR}${INTERCH_PREFIX}. ${MKDIR} ${STAGEDIR}${INTERCH_PREFIX} +do-configure: +# The same as the do-configure stage in Uses/perl5.mk, except we use +# INTERCH_CONFIGURE_ARGS instead of CONFIGURE_ARGS. + @cd ${CONFIGURE_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} \ + ${PERL5} ./${CONFIGURE_SCRIPT} ${INTERCH_CONFIGURE_ARGS} + post-install: # This directory has to be created here for check-plist to pass, otherwise it # complains the @dirrmtry /var/run/interchange entry does not have a matching