Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 May 2015 00:00:55 +0000 (UTC)
From:      Stephen Montgomery-Smith <stephen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r387365 - in head/math/sage: . files
Message-ID:  <201505250000.t4P00tAq030285@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: stephen
Date: Mon May 25 00:00:55 2015
New Revision: 387365
URL: https://svnweb.freebsd.org/changeset/ports/387365

Log:
  - Handle removal of the /usr/bin/perl symlink.  (See UPDATING 20150513.)

Modified:
  head/math/sage/Makefile
  head/math/sage/files/patch-build_pkgs_git_spkg-install

Modified: head/math/sage/Makefile
==============================================================================
--- head/math/sage/Makefile	Sun May 24 23:47:56 2015	(r387364)
+++ head/math/sage/Makefile	Mon May 25 00:00:55 2015	(r387365)
@@ -37,7 +37,7 @@ pre-extract:
 
 PLIST_FILES=	bin/sage
 USE_TEX=	latex:build
-USES=		gmake iconv tk
+USES=		gmake iconv tk perl5
 MAKE_JOBS_SAFE=	yes
 
 # Optimization flags will be defined by the source
@@ -47,7 +47,8 @@ FFLAGS:=	${CFLAGS:C/^-O.*$//}
 MAKE_ENV+=	SAGE_PORT=yes \
 		SAGE_ATLAS_LIB=${LOCALBASE}/lib \
 		DOT_SAGE=${WRKSRC}/tmp/.sage \
-		SAGE_FAT_BINARY=yes
+		SAGE_FAT_BINARY=yes \
+		PERL=${PERL}
 
 LATEST_LINK=	sage-math	# Conflicts with graphics/sage.
 

Modified: head/math/sage/files/patch-build_pkgs_git_spkg-install
==============================================================================
--- head/math/sage/files/patch-build_pkgs_git_spkg-install	Sun May 24 23:47:56 2015	(r387364)
+++ head/math/sage/files/patch-build_pkgs_git_spkg-install	Mon May 25 00:00:55 2015	(r387365)
@@ -1,6 +1,16 @@
---- build/pkgs/git/spkg-install.bak	2015-02-17 00:15:08.000000000 +0000
-+++ build/pkgs/git/spkg-install	2015-03-27 02:33:07.652231000 +0000
-@@ -77,7 +77,7 @@
+--- build/pkgs/git/spkg-install.orig	2015-05-17 22:46:55.000000000 +0000
++++ build/pkgs/git/spkg-install	2015-05-24 22:10:32.517077000 +0000
+@@ -69,7 +69,8 @@
+             --libexecdir="$SAGE_LOCAL"/libexec \
+             --with-python="$SAGE_LOCAL"/bin/python \
+             --without-tcltk \
+-            --with-sane-tool-path=
++            --with-sane-tool-path= \
++            --with-perl=$PERL
+ if [ $? -ne 0 ]; then
+     echo >&2 "Error configuring git."
+     exit 1
+@@ -77,7 +78,7 @@
  
  
  echo "Building git..."



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505250000.t4P00tAq030285>