From owner-svn-ports-all@FreeBSD.ORG Fri Jul 4 12:03:39 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 ED57332F; Fri, 4 Jul 2014 12:03:39 +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 DA98F22EE; Fri, 4 Jul 2014 12:03:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64C3dBJ019145; Fri, 4 Jul 2014 12:03:39 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64C3djU019143; Fri, 4 Jul 2014 12:03:39 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201407041203.s64C3djU019143@svn.freebsd.org> From: Antoine Brodin Date: Fri, 4 Jul 2014 12:03:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360603 - head/math/eukleides 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: Fri, 04 Jul 2014 12:03:40 -0000 Author: antoine Date: Fri Jul 4 12:03:39 2014 New Revision: 360603 URL: http://svnweb.freebsd.org/changeset/ports/360603 QAT: https://qat.redports.org/buildarchive/r360603/ Log: - Unbreak - Finish stage support, binaries were referring to STAGEDIR Modified: head/math/eukleides/Makefile Modified: head/math/eukleides/Makefile ============================================================================== --- head/math/eukleides/Makefile Fri Jul 4 12:00:59 2014 (r360602) +++ head/math/eukleides/Makefile Fri Jul 4 12:03:39 2014 (r360603) @@ -3,6 +3,7 @@ PORTNAME= eukleides PORTVERSION= 1.5.4 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.eukleides.org/files/ @@ -17,6 +18,7 @@ RUN_DEPENDS= pstoedit:${PORTSDIR}/graphi USE_TEX= latex USES= bison gettext iconv gmake tar:bzip2 +INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX} OPTIONS_DEFINE= DOCS EXAMPLES @@ -37,18 +39,18 @@ post-patch: @${GREP} -lR "ginstall-info" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|ginstall-info|install-info|g' @${GREP} -lR "%%[[:alpha:]]\+%%" ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ - -e "s|%%PREFIX%%|${STAGEDIR}${PREFIX}|g" \ + -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ - -e "s|%%EXAMPLESDIR%%|${STAGEDIR}${EXAMPLESDIR}|g" \ - -e "s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g" + -e "s|%%EXAMPLESDIR%%|\$${PREFIX}/${EXAMPLESDIR_REL}|g" \ + -e "s|%%DOCSDIR%%|\$${PREFIX}/${DOCSDIR_REL}|g" @${GREP} -lFR "gcc" ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ -e "s|gcc|${CC}|g" -.if ${PORT_OPTIONS:MDOCS} +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/^install:/ s/install_doc//g' \ -e '/^all:/ s/doc//g' ${WRKSRC}/Makefile .endif -.if ${PORT_OPTIONS:MEXAMPLES} +.if ! ${PORT_OPTIONS:MEXAMPLES} @${REINPLACE_CMD} -e 's/install_exm$$//g' ${WRKSRC}/Makefile .endif