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

This commit is contained in:
Stephen Montgomery-Smith 2015-05-25 00:00:55 +00:00
parent 41f5c927c6
commit c4d7e70760
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=387365
2 changed files with 16 additions and 5 deletions

View file

@ -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.

View file

@ -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..."