cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use "install.sh" during build and also during install as done in

Browse Source 
lang/sml-nj-devel to resolve PR 40866.

Submitted by:	Johannes 5 Joemann <joemann@beefree.free.de>
This commit is contained in:
Joseph Koshy 2004-12-31 07:51:03 +00:00
parent e27710fcb0
commit 86e509e853
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=125586
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/sml-nj/Makefile
View File

@ -10,8 +10,8 @@ PORTVERSION= 110.0.7
PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://ftp.research.bell-labs.com/dist/smlnj/release/110.0.7/ \
ftp://rodin.stanford.edu/pub/smlnj/release/110.0.7/ \
ftp://ftp.ntua.gr//pub/lang/smlnj/release/110.0.7/ \
http://smlnj.cs.uchicago.edu/dist/release/110.0.7/ \
ftp://flint.cs.yale.edu/pub/smlnj/release/110.0.7/ \
${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTFILES= bin.x86-unix.tar.Z cm.tar.Z cml.tar.Z \
@ -76,6 +76,11 @@ do-install:
${SED} -e "s,${WRKDIR},${SML_BASE}," < $$file > \
${SML_LIBDIR}/`${BASENAME} $$file`; \
done
# do a minimal re-"install" to fix autoloading problems
# as reported in PR ports/40866
${CP} -pr ${WRKDIR}/config ${SML_BASE}
cd ${SML_BASE} && config/install.sh
${RM} -rf ${SML_BASE}/config
@${CHOWN} -R ${BINOWN}:${BINGRP} ${SML_BINDIR}
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SML_SRCDIR}
.for file in ${SML_EXES}

17
lang/sml-nj/files/patch-ab
View File

@ -1,9 +1,17 @@
--- config/install.sh.orig Fri Oct 20 16:02:25 2000
+++ config/install.sh Tue Mar 11 22:30:59 2003
@@ -155,6 +155,26 @@
--- config/install.sh.orig Fri Oct 20 18:02:25 2000
+++ config/install.sh Tue Dec 21 06:22:34 2004
@@ -151,11 +151,34 @@
#
# build the run-time system
#
+if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+ echo "$RUNDIR/run.$ARCH-$OPSYS already exists"
+else
$CONFIGDIR/unpack.sh "run-time" $SRCDIR runtime $ROOT/runtime.tar
if [ "$?" != "0" ]; then
exit $?
fi
-if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+# we need to patch just before build
+echo "applying source patches"
+patch_file="${FILESDIR}/extra-patch-cpp"
@ -24,6 +32,7 @@
+ $PATCH $PATCH_ARGS < $patch_file
+ fi
+fi
if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+#if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
cd $SRCDIR/runtime/objs
echo "compiling the run-time system"
$MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS