ports/139807: [MAINTAINER] lang/sml-nj-devel: update to 110.71 and adapt devel/ml-doc accordingly

From:	Johannes 5 Joemann <joemann@beefree.free.de>
Date:	21 Oct 2009 06:10:19 +0200
Subject:	[MAINTAINER] lang/smlnj-devel: update to 110.71 and adapt devel/ml-doc accordingly
Send-pr version:	3.113

Number:	139807
Category:	ports
Synopsis:	[MAINTAINER] lang/sml-nj-devel: update to 110.71 and adapt devel/ml-doc accordingly
Severity:	non-critical
Priority:	low
Responsible:	miwi@FreeBSD.org
State:	open
Class:	maintainer-update
Arrival-Date:	Wed Oct 21 04:40:00 UTC 2009
Closed-Date:
Last-Modified:	Thu Oct 29 09:47:29 UTC 2009
Originator:	Johannes 5 Joemann
Release:	FreeBSD 8.0-BETA4 i386

Organization:

Environment:

System: FreeBSD xxx.free.de 8.0-BETA4 FreeBSD 8.0-BETA4 #0: Sun Sep 6 19:25:35 CEST

Description:

- Update to 110.71
- add option to compile the SML/NJ Basis with 64bit file positions
- minor Makefile improvements
(remove != assignments; make patches to standard components easier)

NOTE: updating sml-nj-devel to 110.71 will *break* fresh builds of
devel/ml-doc because of an API change in the SML/NJ RegExp library.
A maintainer's patch to devel/ml-doc handling this is available at:

[1] <ftp://offshore.free.de/pub/patch/ml-doc.patch.20091009>
MD5 (ml-doc.patch.20091009) = c9f21063f6d60fc295e13a0383c2d29f

That patch also contains a script (files/fix-cml-doc.sh.in) for
testing the ml-doc port. Since ml-doc has no runtime dependency on
sml-nj-devel, exisiting installations of ml-doc will continue to
work after sml-nj-devel has been updated. Therefore it should not
be necessary to increment ml-doc's PORTREVISION when applying [1].

We'll attach [1] to this PR asap after this PR becomes visible.
If you (= ports committer handling this PR) prefer that ml-doc's
maintainer Timothy Bourke <timbob at bigpond.com> submits a separate
PR containing [1], please let him know. Thanx!

Removed file(s):
- files/patch-config_allsources

Generated with FreeBSD Port Tools 0.99

How-To-Repeat:

Fix:

Download smlnj-devel-110.71.patch

--- Makefile     2008-07-27 02:26:24.000000000 +0200
+++ Makefile     2009-09-19 19:29:03.000000000 +0200
@@ -6,7 +6,7 @@
 #
 PORTNAME=       smlnj
-PORTVERSION=    110.65
+PORTVERSION=    110.71
 CATEGORIES=     lang
 MASTER_SITES=   http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
                 ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
@@ -24,7 +24,8 @@
 ONLY_FOR_ARCHS= i386
 OPTIONS=        EVERYTHING "install everything from the SML/NJ distribution" off \
-                RECOMPILE "recompile the SML compiler - implies EVERYTHING" off
+                RECOMPILE  "recompile the SML compiler - implies EVERYTHING" off \
+                POSITION64 "use 64bit fi""le positions - implies RECOMPILE"  off
 SUB_FILES=      pkg-install
 SUB_LIST=       EXEBINDIR=${MLBINRELATIVE} EXENAMES="${MLEXE}"
@@ -44,6 +45,13 @@
 PLIST_SUB=      MLARCH=${MLARCH}
+.if defined(WITH_POSITION64)
+WITH_RECOMPILE?=        ${WITH_POSITION64}
+CMB_COMMAND=    '(\#set o CMB.symval) "USE_64_BIT_POSITIONS" (SOME 1);'
+.else
+CMB_COMMAND=
+.endif
+
 .if defined(WITH_RECOMPILE)
 WITH_EVERYTHING?=       ${WITH_RECOMPILE}
 .endif
@@ -58,8 +66,9 @@
 MLBINRELATIVE=  ${MLROOTRELATIVE}/bin
 MLBIN=          ${MLROOT}/bin
 MLLIB=          ${MLROOT}/lib
-MLSRCDIRS=      base ckit cml eXene heap2asm ml-burg ml-lex ml-lpt \
-                ml-yacc nlffi pgraph smlnj-c smlnj-lib
+MLSTDSRCDIRS=   cml heap2asm ml-lex ml-lpt ml-yacc smlnj-lib
+MLSRCDIRS=      base ${MLSTDSRCDIRS} \
+                ckit eXene ml-burg nlffi pgraph smlnj-c
 MLSRCS=
 .for srcdir in ${MLSRCDIRS}
 MLSRCS+=        ${MLROOT}/${srcdir}
@@ -92,6 +101,10 @@
         @${ECHO} 'Use make WITH_RECOMPILE=yes to recompile the compiler.'
         @${ECHO} ' This implies WITH_EVERYTHING.'
 .endif
+.if !defined(WITH_POSITION64)
+        @${ECHO} 'Use make WITH_POSITION64=yes to use 64bit file positions.'
+        @${ECHO} ' This implies WITH_RECOMPILE.'
+.endif
         @${ECHO}
 # make symlinks to the dist files
@@ -134,34 +147,41 @@
 RECOMPILEDIR=
 .endif
-# calm portlint complaining about /dev/null
-AUXSLASH=       /
-AUXDEV=         ${AUXSLASH}dev
-AUXDEVNULL!=    if [ -w ${AUXDEV}/null ]; then ${ECHO_CMD} -n ${AUXDEV}/null; \
-                else ${ECHO_CMD} -n '${WRKDIR}/.devnull'; fi
-
-MLRUNTIMEPATCHES!=      cd ${FILESDIR} && \
-                        ( ${LS} do-patch-base_runtime_* 2> ${AUXDEVNULL} || \
+MLRUNTIMEPATCHES_CMD=   cd ${FILESDIR} && \
+                        ( ${LS} do-patch-base_runtime_* 2>&- || \
                           ${TRUE} )
+MLSTANDARDPATCHES_CMD=  cd ${FILESDIR} && \
+                        ( for srcdir in ${MLSTDSRCDIRS} ; \
+                          do ${LS} do-patch-$${srcdir}_* 2>&- ; \
+                          done ) || ${TRUE}
+MLSTANDARDPATCHDIRS_CMD=        cd ${FILESDIR} && \
+                        ( for srcdir in ${MLSTDSRCDIRS} ; \
+                          do if ${LS} do-patch-$${srcdir}_* 1>&- 2>&- ; \
+                             then ${ECHO_CMD} -n $${srcdir} " " ; break ; fi ; \
+                          done ) || ${TRUE}
 .if defined(WITH_EVERYTHING)
-MLSOURCEPATCHES!=       cd ${FILESDIR} && \
-                        ( ${LS} do-patch-* 2> ${AUXDEVNULL} || \
+MLSOURCEPATCHES_CMD=    cd ${FILESDIR} && \
+                        ( ${LS} do-patch-* 2>&- || \
                           ${TRUE} )
 .else
-MLSOURCEPATCHES=
+MLSOURCEPATCHES_CMD=    ${TRUE}
 .endif
 do-build:
         cd ${WRKDIR} && unset PWD && \
         FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
         MLNORUNTIMECLEAN=yes \
-        MLRUNTIMEPATCHES="${MLRUNTIMEPATCHES}" \
-        MLSOURCEPATCHES="${MLSOURCEPATCHES}"    ./config/install.sh
+        MLRUNTIMEPATCHES=`${MLRUNTIMEPATCHES_CMD}` \
+        MLSTANDARDPATCHES=`${MLSTANDARDPATCHES_CMD}` \
+        MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \
+        MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \
+        ./config/install.sh
 .if defined(WITH_RECOMPILE)
         -${RM} ${WRKDIR}/config/targets.customized
         @${ECHO} '(* Recompiling the core system: *)'
         cd ${WRKDIR}/${RECOMPILEDIR} && ( \
         ${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
+        ${ECHO_CMD} ${CMB_COMMAND} ; \
         ${ECHO_CMD} 'CMB.make ();' ) | \
         ../../bin/sml
         @${ECHO} '(* Building the recompiled heap: *)'
@@ -205,12 +225,10 @@
         ${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \
                 -e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \
                 > ${MLRUNTIMEPLIST}
-.for p in ${MLRUNTIMEPATCHES}
-        @${ECHO_CMD} '${p}' | \
+        `${MLRUNTIMEPATCHES_CMD}` | \
         ${SED} ${MLPATCHPATHREGEX} | \
         ${SED} -E -e 's%^do-patch-(base/.*)%${MLROOTRELATIVE}/\1.orig%' \
         >> ${MLRUNTIMEPLIST}
-.endfor
         @cd "${WRKDIR}" && ( \
         ( ${FIND} -s -d ${MLSRCDIRS} \! -type d | \
         ${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \
@@ -247,6 +265,7 @@
         @${ECHO} '(* Rebuilding the recompiled libs: *)'
         cd ${WRKDIR}/${RECOMPILEDIR} && ( \
         ${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
+        ${ECHO_CMD} ${CMB_COMMAND} ; \
         ${ECHO_CMD} 'CMB.make ();' ) | \
         ../../bin/sml
         @${ECHO} '(* Rebuilding the recompiled heap: *)'
--- distinfo     2007-08-27 17:41:18.000000000 +0200
+++ distinfo     2009-09-23 15:13:22.000000000 +0200
@@ -1,60 +1,60 @@
-MD5 (sml-nj/110.65/MLRISC.tgz) = 6dee2df1bb58a90d86dc545261375edf
-SHA256 (sml-nj/110.65/MLRISC.tgz) = 24c036655e35f8a527b32d874231631ba84070d33fd1432de70fb38e0e5dedf4
-SIZE (sml-nj/110.65/MLRISC.tgz) = 1367586
-MD5 (sml-nj/110.65/boot.x86-unix.tgz) = df97db3fedf27627b134da88bc240d46
-SHA256 (sml-nj/110.65/boot.x86-unix.tgz) = 7d27f46bea0f53a87b40dbe63b3f1b4b9c7a9a851de47d718a678ff7da7f88c1
-SIZE (sml-nj/110.65/boot.x86-unix.tgz) = 5856903
-MD5 (sml-nj/110.65/ckit.tgz) = 1afdc1549105e4a40259ac595b5e75ac
-SHA256 (sml-nj/110.65/ckit.tgz) = 356db254e4490fb59fc25af9fd21fd5ce4014b48801a1de6c70bcdd785243f21
-SIZE (sml-nj/110.65/ckit.tgz) = 195616
-MD5 (sml-nj/110.65/cm.tgz) = 936537d0f28bc05f2b2e228cb67a30e4
-SHA256 (sml-nj/110.65/cm.tgz) = 25e4dffe764bc7f03784d6c06b5c8dc939458f800f127ffa3ce9c20db6f66537
-SIZE (sml-nj/110.65/cm.tgz) = 200916
-MD5 (sml-nj/110.65/cml.tgz) = 7cdff48d92dc2d76dce22d1da0987884
-SHA256 (sml-nj/110.65/cml.tgz) = 767664558904ac7599a30c22263ea9938a69e6be6a2e03e23a23bf8bcb8f9d0d
-SIZE (sml-nj/110.65/cml.tgz) = 104410
-MD5 (sml-nj/110.65/compiler.tgz) = 8b3cb4bdea7b89754e943432c51e6efa
-SHA256 (sml-nj/110.65/compiler.tgz) = 46fc836648215aadff547133d5d3f3039bf2a9adfd02b6434670c781ee0d8deb
-SIZE (sml-nj/110.65/compiler.tgz) = 812703
-MD5 (sml-nj/110.65/config.tgz) = 833741f2d668e8de3529a6a4b2f7dccd
-SHA256 (sml-nj/110.65/config.tgz) = aadcb4fb1afe76528e307e0374859d8b9f872b50df427c934491a1b2f7e6f3f1
-SIZE (sml-nj/110.65/config.tgz) = 17405
-MD5 (sml-nj/110.65/eXene.tgz) = a17eb858237d8adb3732d08613501887
-SHA256 (sml-nj/110.65/eXene.tgz) = 4dca2956f2991c82d6e86fbfc9ead0b98c3e2770da9d55c2d3fed2735e2ce392
-SIZE (sml-nj/110.65/eXene.tgz) = 708192
-MD5 (sml-nj/110.65/heap2asm.tgz) = fe37e8a575d73a9163046cf77472aebf
-SHA256 (sml-nj/110.65/heap2asm.tgz) = 68a82aaaf6fa8c52fdbb9edd7a242eb9ea33eaf5cd5bff55f0cb5264bf164f64
-SIZE (sml-nj/110.65/heap2asm.tgz) = 1320
-MD5 (sml-nj/110.65/ml-burg.tgz) = 0604d5430ab3ceff4825e67d24eda908
-SHA256 (sml-nj/110.65/ml-burg.tgz) = 535c92690b230a84e13868c5c3961ff7caacc063a03c573c7d74f68ff9fd1886
-SIZE (sml-nj/110.65/ml-burg.tgz) = 35989
-MD5 (sml-nj/110.65/ml-lex.tgz) = a0add456d9cc4bcf2fd43c3078322ec7
-SHA256 (sml-nj/110.65/ml-lex.tgz) = 58cb45190a410d2d24186a2ad5982f49f1e19c2f6697faa69aa3be053d9fa750
-SIZE (sml-nj/110.65/ml-lex.tgz) = 33050
-MD5 (sml-nj/110.65/ml-lpt.tgz) = 51d9cf0badcf3bfa5b2552edd9c9b378
-SHA256 (sml-nj/110.65/ml-lpt.tgz) = b432e08a840fde1608023558eeffcaf6f5b1e33b0f5f3bdd8fae326a0bea8bff
-SIZE (sml-nj/110.65/ml-lpt.tgz) = 250096
-MD5 (sml-nj/110.65/ml-yacc.tgz) = cc9a3fc240b0b56f4b32d5bbd06b6441
-SHA256 (sml-nj/110.65/ml-yacc.tgz) = 303d5afd820b916deb967bb70e04883a5bd2b6063a724cda00d1745f3991a67c
-SIZE (sml-nj/110.65/ml-yacc.tgz) = 98502
-MD5 (sml-nj/110.65/nlffi.tgz) = d877cf85fdd5a1d952ba9e856cfdddfc
-SHA256 (sml-nj/110.65/nlffi.tgz) = fdbae1fbc661de417dcde7e8f56d74f262ffb70a62b341b787e84558b3a2a035
-SIZE (sml-nj/110.65/nlffi.tgz) = 73030
-MD5 (sml-nj/110.65/pgraph.tgz) = d8160b52274f113373293ebf8fa158d1
-SHA256 (sml-nj/110.65/pgraph.tgz) = 3983bd803d939f6b4cb0f96d82c046a71f864c39ccbe73a9a9eefd5054cdda81
-SIZE (sml-nj/110.65/pgraph.tgz) = 5446
-MD5 (sml-nj/110.65/runtime.tgz) = e637fe9584529a2179c54b0f325b2da1
-SHA256 (sml-nj/110.65/runtime.tgz) = e1f83be6dd11bbd6082d9d1846d9cb012c2ab7314c79bf16b86a309458b5be8c
-SIZE (sml-nj/110.65/runtime.tgz) = 315775
-MD5 (sml-nj/110.65/smlnj-c.tgz) = 84528473fb02c8575197a25198407df0
-SHA256 (sml-nj/110.65/smlnj-c.tgz) = 87e83d2425f8dbd27a2c7c863b5025e94bae6e57058f096236e6987aa1c2580a
-SIZE (sml-nj/110.65/smlnj-c.tgz) = 10540
-MD5 (sml-nj/110.65/smlnj-lib.tgz) = b43f56983759d38a4110acb863dee00e
-SHA256 (sml-nj/110.65/smlnj-lib.tgz) = 5d094350160cdee7773d1ac502e57bd3be782f35022354d1b940d8f16a7d6a1a
-SIZE (sml-nj/110.65/smlnj-lib.tgz) = 230758
-MD5 (sml-nj/110.65/system.tgz) = 2875b7e8d3349ff03e7dc682bd42e9cd
-SHA256 (sml-nj/110.65/system.tgz) = 95608f9718821af84b68ae210d33b7a76465a9182d4463c193abcc2a66dad8f6
-SIZE (sml-nj/110.65/system.tgz) = 223918
-MD5 (sml-nj/110.65/trace-debug-profile.tgz) = db14311ae135692024bbc30ef55d222f
-SHA256 (sml-nj/110.65/trace-debug-profile.tgz) = e347119d27d6fecad72e0cd1b355db79305a40b36edac66573b794f71a9944fa
-SIZE (sml-nj/110.65/trace-debug-profile.tgz) = 3904
+MD5 (sml-nj/110.71/MLRISC.tgz) = a38d4c283ed619295278cda6db054e07
+SHA256 (sml-nj/110.71/MLRISC.tgz) = fe86100738b12fb7edbbddf66626b96d4d13c149dd71e0cfb8132a92a7522ae1
+SIZE (sml-nj/110.71/MLRISC.tgz) = 1435231
+MD5 (sml-nj/110.71/boot.x86-unix.tgz) = 753c50345fcd3b97aecd5c4743388de4
+SHA256 (sml-nj/110.71/boot.x86-unix.tgz) = 2f1a41e6639963a5c09b453d941c4ac7c62d5043e2cc2b25d2a18feb7517bc04
+SIZE (sml-nj/110.71/boot.x86-unix.tgz) = 5849700
+MD5 (sml-nj/110.71/ckit.tgz) = de846fecaade7454db0f3a7aabbf3651
+SHA256 (sml-nj/110.71/ckit.tgz) = fc8320898b17106bf759bc813c69aecfe1732d0c13e9b54ed5522920bbd562a7
+SIZE (sml-nj/110.71/ckit.tgz) = 199404
+MD5 (sml-nj/110.71/cm.tgz) = ba5b37522aff8726935203582fc5cca8
+SHA256 (sml-nj/110.71/cm.tgz) = 40bb024769f28a70b45e4ad87bb781c1277c4fa0de7ae1b5109263ed073c0300
+SIZE (sml-nj/110.71/cm.tgz) = 202311
+MD5 (sml-nj/110.71/cml.tgz) = 559fc31cae3f8b0808f991029ee04199
+SHA256 (sml-nj/110.71/cml.tgz) = 469f013db2e6abae40db34f4e78c0ce556a730c6b9a567eea35df7aa2f6b1f96
+SIZE (sml-nj/110.71/cml.tgz) = 104707
+MD5 (sml-nj/110.71/compiler.tgz) = 2cb77c40207fa7490f8d9d5e0daa7e5a
+SHA256 (sml-nj/110.71/compiler.tgz) = 3040cc3fed1f2b00f33d290bd52e999a8ea73d2ba847bbe5b16165276c07afaf
+SIZE (sml-nj/110.71/compiler.tgz) = 825457
+MD5 (sml-nj/110.71/config.tgz) = 33334c69b5f3eff1f4f65377551a89e5
+SHA256 (sml-nj/110.71/config.tgz) = accafba082cb3b7e2bbfff3221bbe49dcfb8029a5d6f8002f98597890870a3be
+SIZE (sml-nj/110.71/config.tgz) = 512911
+MD5 (sml-nj/110.71/eXene.tgz) = 2e24fac128d1e29250c94425a6613f2b
+SHA256 (sml-nj/110.71/eXene.tgz) = 23b12302c8fdeb4c94918cf1c24739c72f01114597b3bfef817c58943ec2c467
+SIZE (sml-nj/110.71/eXene.tgz) = 714564
+MD5 (sml-nj/110.71/heap2asm.tgz) = edee3a9c1d565b399b9bbe6a21254855
+SHA256 (sml-nj/110.71/heap2asm.tgz) = 01cae1f1d5217405e367d0efd1385161602d3f0828f54e794190baa13d733d0f
+SIZE (sml-nj/110.71/heap2asm.tgz) = 1326
+MD5 (sml-nj/110.71/ml-burg.tgz) = 9e968edfa8f03155401c304c004445b4
+SHA256 (sml-nj/110.71/ml-burg.tgz) = 429f2e974db4131c74eea141902491af9df1d55bc2c0767356434bab13b90dd5
+SIZE (sml-nj/110.71/ml-burg.tgz) = 36670
+MD5 (sml-nj/110.71/ml-lex.tgz) = 004919c1e1658299bce52e17e7efa260
+SHA256 (sml-nj/110.71/ml-lex.tgz) = 0a951e91caa43e025eeaa03879764e93519e82ace817eaf86d5c0f469360322b
+SIZE (sml-nj/110.71/ml-lex.tgz) = 33060
+MD5 (sml-nj/110.71/ml-lpt.tgz) = ec612fde778f7ee0742321b7f414b160
+SHA256 (sml-nj/110.71/ml-lpt.tgz) = e5c3489a9d60d4d45a266240e380a497b05f8f45ba44da83a704c4388cf664d1
+SIZE (sml-nj/110.71/ml-lpt.tgz) = 254684
+MD5 (sml-nj/110.71/ml-yacc.tgz) = f49b7a70f126d25aaf32a09e68185799
+SHA256 (sml-nj/110.71/ml-yacc.tgz) = 3e5b9ec0af3704c7045a43d974902abddecefd8d25a41225b06b7390dcf29453
+SIZE (sml-nj/110.71/ml-yacc.tgz) = 102023
+MD5 (sml-nj/110.71/nlffi.tgz) = 92e156c6623b92040c1011c7384ebf3b
+SHA256 (sml-nj/110.71/nlffi.tgz) = dc23c4ea4101f918fe5f92622c9b34b88cb91c62c2c41911e7117a7aa389f44a
+SIZE (sml-nj/110.71/nlffi.tgz) = 75182
+MD5 (sml-nj/110.71/pgraph.tgz) = bb4a20cdca80e3be06b016d1b2ecd3a2
+SHA256 (sml-nj/110.71/pgraph.tgz) = e9514a3c8c002627bf2297bca020028d6d27a6a3c31f940db1dcf2dc3941885b
+SIZE (sml-nj/110.71/pgraph.tgz) = 5454
+MD5 (sml-nj/110.71/runtime.tgz) = 5b017473a817163587fb36e4c3921259
+SHA256 (sml-nj/110.71/runtime.tgz) = ec6d38c782876db979a7b03444ded0bfaa0154d8e88c0a7befa6836f9b235763
+SIZE (sml-nj/110.71/runtime.tgz) = 334109
+MD5 (sml-nj/110.71/smlnj-c.tgz) = afaa63b6871387ad4d78bd831d132748
+SHA256 (sml-nj/110.71/smlnj-c.tgz) = 1ae91e81e77b422367f34fa1bedced1235ba0da5363b075e62bc0d39a55e8fde
+SIZE (sml-nj/110.71/smlnj-c.tgz) = 10625
+MD5 (sml-nj/110.71/smlnj-lib.tgz) = 49631e6a648afedb9e29454c4052704a
+SHA256 (sml-nj/110.71/smlnj-lib.tgz) = 3dd4cbe21bd9d2917d22d8b793776e6c519f175ddb96f6339f890f69d54feda9
+SIZE (sml-nj/110.71/smlnj-lib.tgz) = 259309
+MD5 (sml-nj/110.71/system.tgz) = 22574eb475fbb3a7d8c345ad1e9dbe04
+SHA256 (sml-nj/110.71/system.tgz) = 6279962f447ce17df64a3c52e8c10f98f0e09b41d5418077d5880a9445eb3ad3
+SIZE (sml-nj/110.71/system.tgz) = 239973
+MD5 (sml-nj/110.71/trace-debug-profile.tgz) = 0ae3fc7bd1523080a809128cc37d8c6f
+SHA256 (sml-nj/110.71/trace-debug-profile.tgz) = 3b4db9f3546c02ce5c4510e070ee304b768914914e47acdbae3a82397df1ac28
+SIZE (sml-nj/110.71/trace-debug-profile.tgz) = 3935
--- files/patch-config_allsources        2007-08-27 17:41:19.000000000 +0200
+++ files/patch-config_allsources        1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- config/allsources.orig      Fri Nov 10 21:26:00 2006
-+++ config/allsources   Sun Jun 17 01:22:22 2007
-@@ -10,7 +10,6 @@
- system
- ml-yacc
- ml-lex
--lexgen
- ml-burg
- ml-nlffigen
- ml-nlffi-lib
--- files/patch-config_install.sh        2006-11-29 18:46:37.000000000 +0100
+++ files/patch-config_install.sh        2009-09-19 19:27:48.000000000 +0200
@@ -1,5 +1,5 @@
---- config/install.sh.orig      Thu Nov  2 22:23:22 2006
-+++ config/install.sh   Sun Nov 19 23:51:03 2006
+--- config/install.sh.orig      Tue May 22 18:48:30 2007
++++ config/install.sh   Sun Sep 16 02:56:22 2007
 @@ -18,6 +18,8 @@
      nolib=false
  fi
@@ -38,7 +38,7 @@
  this=$0


-@@ -307,7 +331,12 @@
+@@ -308,7 +332,12 @@
  # the name of the bin files directory
  #
  BOOT_ARCHIVE=boot.$ARCH-unix
@@ -52,7 +52,7 @@
  #
  # build the run-time system
-@@ -316,6 +345,11 @@
+@@ -317,6 +346,11 @@
      vsay $this: Run-time system already exists.
  else
      "$CONFIGDIR"/unpack "$ROOT" runtime
@@ -64,7 +64,7 @@
      cd "$BASEDIR"/runtime/objs
      echo $this: Compiling the run-time system.
      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
-@@ -330,7 +364,7 @@
+@@ -331,7 +365,7 @@
         if [ -f run.$ARCH-$OPSYS.a ]; then
             mv run.$ARCH-$OPSYS.a "$RUNDIR"
         fi
@@ -73,7 +73,7 @@
      else
         complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -356,7 +390,7 @@
+@@ -357,7 +391,7 @@
         complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
      fi
  else
@@ -82,12 +82,31 @@
      fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
-@@ -427,5 +461,12 @@
+@@ -415,6 +449,18 @@
+
+ cd "$ROOT"
+
++# apply source patches for standard targets
++[ -n "$MLSTANDARDPATCHDIRS" ] && \
++for d in $MLSTANDARDPATCHDIRS
++do
++       "$CONFIGDIR"/unpack "$ROOT" "$d"
++done
++[ -n "$MLSTANDARDPATCHES" ] && \
++for p in $MLSTANDARDPATCHES
++do
++       do_patch $p
++done
++
+ #
+ # Now do all the rest using the precompiled installer:
+ #
+@@ -430,5 +476,12 @@
         complain "$this: !!! Installation of libraries and programs failed."
      fi
  fi
 +
-+# apply source patches
++# apply all source patches
 +[ -n "$MLSOURCEPATCHES" ] && \
 +for p in $MLSOURCEPATCHES
 +do
--- pkg-plist    2007-08-27 17:41:18.000000000 +0200
+++ pkg-plist    2009-09-19 19:27:48.000000000 +0200
@@ -28,6 +28,11 @@
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64-Peephole.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-Vararg.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-sparc.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-x86-64.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-x86.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Control.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/HPPA.cm
@@ -39,8 +44,8 @@
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/PPC.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Peephole.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/RA.cm
-smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/SA.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/SPARC.cm
+smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/StagedAlloc.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Visual.cm
 smlnj/lib/cml/.cm/%%MLARCH%%-unix/basis.cm
 smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml-internal.cm
@@ -52,6 +57,7 @@
 smlnj/lib/grm-ext.cm/.cm/%%MLARCH%%-unix/grm-ext.cm
 smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix/hash-cons-lib.cm
 smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix/inet-lib.cm
+smlnj/lib/json-lib.cm/.cm/%%MLARCH%%-unix/json-lib.cm
 smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix/lex-ext.cm
 smlnj/lib/make-tool.cm/.cm/%%MLARCH%%-unix/make-tool.cm
 smlnj/lib/ml-antlr-tool.cm/.cm/%%MLARCH%%-unix/ml-antlr-tool.cm
@@ -180,6 +186,9 @@
 @dirrm smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/inet-lib.cm/.cm
 @dirrm smlnj/lib/inet-lib.cm
+@dirrm smlnj/lib/json-lib.cm/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/json-lib.cm/.cm
+@dirrm smlnj/lib/json-lib.cm
 @dirrm smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/lex-ext.cm/.cm
 @dirrm smlnj/lib/lex-ext.cm

Release-Note:

Audit-Trail:

Class Changed
From-To:	maintainer-update->change-request
By:	edwin
When:	Wed Oct 21 04:40:22 UTC 2009
Why:	Fix category (submitter is not maintainer) (via the GNATS Auto Assign Tool)

State Changed
From-To:	open->feedback
By:	edwin
When:	Wed Oct 21 04:40:26 UTC 2009
Why:	Awaiting maintainers feedback (via the GNATS Auto Assign Tool)

Reply via E-mail
From:	Edwin Groothuis <edwin@FreeBSD.org>
Date:	Wed, 21 Oct 2009 04:40:24 UT
Maintainer of devel/ml-doc, Please note that PR ports/139807 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/139807 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org

Reply via E-mail
From:	Timothy Bourke <timbob@bigpond.com>
Date:	Wed, 21 Oct 2009 16:00:30 +1100
I approve the update to devel/ml-doc. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFK3pVutKVK1sFb0ecRAkdzAJ9cpJ8nSwtpBTs/UcawCk6MjUMeOgCeIX4T H0UyqUHg/3/QRw4zPTs97as= =VPG8 -----END PGP SIGNATURE-----

Reply via E-mail

From:

Johannes 5 Joemann <joemann@beefree.free.de>

Date:

Sat, 24 Oct 2009 01:19:48 +0200

Oops:-)

> Class Changed
> From-To: maintainer-update->change-request
> Why: Fix category (submitter is not maintainer) (via the GNATS Auto Assign Tool)

I'm sorry if this was caused by the mangled portname in the synopsis:
lang/smlnj-devel is wrong, lang/sml-nj-devel is right. (*)

> State-Changed-From-To: open->feedback
> State-Changed-Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool)

I do approve my own patch, if this is what's missing to make this PR
proceed:-)

The patch [1] to devel/ml-doc was already approved by Timothy Bourke,
the ml-doc maintainer, see above. I'll include that patch here for
completeness. As explained above, it would be nice if devel/ml-doc
could be patched simultaneously with or soon after updating
lang/sml-nj-devel.

Thanx!
Johannes (maintainer of lang/sml-nj-devel)

(*) See PR ports/139872 for an explanation of this mess:)

Download ml-doc.patch.20091009

(** new files:
files/fix-cml-doc.sh.in
files/patch-tools-lib-code_style-sml_token_scanner.sml
**)
--- Makefile     2007-09-12 04:53:51.000000000 +0200
+++ Makefile     2009-10-08 21:04:20.000000000 +0200
@@ -16,7 +16,7 @@
 MAINTAINER=     timbob@bigpond.com
 COMMENT=        Language and tools for documenting Standard ML libraries
 
-BUILD_DEPENDS=  smlnj-devel>=110.65:${PORTSDIR}/lang/sml-nj-devel \
+BUILD_DEPENDS=  smlnj-devel>=110.71:${PORTSDIR}/lang/sml-nj-devel \
                 nsgmls:${PORTSDIR}/textproc/jade
 RUN_DEPENDS=    nsgmls:${PORTSDIR}/textproc/jade
 
@@ -25,7 +25,7 @@
 ALL_TARGET=     build
 MAKE_ENV+=      DATADIR=${DATADIR} SMLNJ_DEVEL=yes
 
-SUB_FILES=      ml-doc.1 mkdoc.1
+SUB_FILES=      ml-doc.1 mkdoc.1 fix-cml-doc.sh
 MAN1=           ml-doc.1 mkdoc.1
 MLINKS=         ml-doc.1 extract-sig.1 ml-doc.1 extract-info.1 \
                 ml-doc.1 merge-info.1 ml-doc.1 html-gen.1 \
--- files/fix-cml-doc.sh.in      1970-01-01 01:00:00.000000000 +0100
+++ files/fix-cml-doc.sh.in      2009-10-09 19:20:58.000000000 +0200
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# simple script to fix the sml-nj cml documentation
+# source so that it can be used as a test for ml-doc.
+
+DOCSRCDIR='%%PREFIX%%/smlnj/cml/doc'
+
+if [ ! -d "$DOCSRCDIR" ]
+then
+        echo "CML doc sources not found in directory $DOCSRCDIR"
+        echo "Install lang/sml-nj-devel with option WITH_EVERYTHING"
+        exit 1
+fi
+
+cp -r "$DOCSRCDIR" ./cml-doc
+cd cml-doc/
+
+sed -i .orig -e 's#/Users/jhr/Work/sml-basis/Basis/##' Config.cfg
+
+mkdir Info
+mkdir HTML
+
+mv ML-Doc/lib/* ML-Doc/
+rmdir ML-Doc/lib 
+
+sed -i .orig -e 's#/Users/jhr/Work/Tools#%%PREFIX%%/share#' CATALOG 
+
+sed -i .orig \
+    -e 's/STRID="CML"/STRID="RunCML"/' \
+    -e 's/SIGID="CML"/SIGID="RunCML"/' \
+    -e 's/FILE=CML-SIG/FILE=RUNCML-SIG/' \
+    ML-Doc/run-cml.mldoc
+
+echo '<!ENTITY RUNCML SDATA "RUNCML">' >> Entities.sgml 
+echo '<!ENTITY RUNCML-SIG SDATA "run-cml-sig.sml">' >> Entities.sgml 
+
+find ML-Doc -name '*.mldoc' -print | mk-mldoc-makefile 
+make
--- files/ml-doc.1.in    2007-09-07 14:01:00.000000000 +0200
+++ files/ml-doc.1.in    2009-10-08 21:04:20.000000000 +0200
@@ -117,12 +117,12 @@
 .Op Fl root Ar file
 .Ar mldoc-files
 .Sh DESCRIPTION
-.ML-Doc
+ML-Doc
 is a system for producing reference manuals for SML libraries. It can
 produce high quality documentation with extensive indexing, like the
 published SML Basis Library reference manual, and also HTML for online use.
 .Pp
-.ML-Doc
+ML-Doc
 is different to systems like javadoc that extract documentation from source
 files.
 Rather, the documentation
@@ -132,14 +132,14 @@
 can be used to create source files from documentation. The
 .Xr mkdoc 1
 utility, however, can produce first drafts from source files.
-.ML-Doc
+ML-Doc
 is most useful for documenting stable library interfaces.
 .Pp
-.ML-Doc
+ML-Doc
 files, marked by the extension
 .Pa .mldoc ,
 are SGML documents conforming to the
-.ML-Doc
+ML-Doc
 document type definition.
 .Pp
 This manual has four major sections besides the present one:
@@ -431,7 +431,7 @@
 .\"
 .Ss Directory structure
 An
-.ML-Doc
+ML-Doc
 .Em project
 comprises a set of files and directories that, at a minimum, will include:
 .Bl -tag -width ".Pa index.template"
@@ -440,7 +440,7 @@
 Typically links to
 .Pa Entities.sgml
 in the same directory and the installed
-.ML-Doc
+ML-Doc
 .Pa CATALOG
 file.
 See
@@ -608,7 +608,7 @@
 .\"
 .Ss Entities
 Entities are used within
-.ML-Doc
+ML-Doc
 to include mathematical and other
 specialised symbols, to abbreviate titles and other text, to reference
 files, and to name certain output files.
@@ -643,7 +643,7 @@
 .D1 This feature requires the &SMLNJ; libraries.
 .Pp
 Documentation will sometimes need to reference the
-.ML-Doc
+ML-Doc
 descriptions of other libraries; such as those of the SML Basis, SML/NJ, or
 Concurrent ML.
 The reference tags described under
@@ -691,7 +691,7 @@
 hyperlinks to the online documentation.
 .Pp
 Entities are also used within
-.ML-Doc
+ML-Doc
 to specify values for the
 .Li FILE
 attribute, which specifies an input file for the
@@ -713,7 +713,7 @@
 .\"
 .Ss General Use
 A simplified sequence of steps for creating
-.ML-Doc
+ML-Doc
 documentation:
 .Bl -enum
 .\" **
@@ -807,7 +807,7 @@
 .Pa ml-doc.dtd
 file.
 An
-.ML-Doc
+ML-Doc
 file begins with the declaration:
 .Dl <!DOCTYPE ML-DOC SYSTEM>
 and contains header elements followed by one or more, potentially nested,
@@ -928,7 +928,7 @@
 file, for HTML output, and/or
 .Pa *.tex
 file, for LaTeX output, is generated for each
-.ML-Doc
+ML-Doc
 source file.
 A complete document is constructed by including, with
 .Li INCLFILE
@@ -1859,7 +1859,7 @@
 .\" ----------------------------------------
 .Sh SGML vs HTML/XML
 Although the basics of editing
-.ML-Doc
+ML-Doc
 will be familiar to most authors of HTML and XML, SGML has some peculiarities
 that are designed to make editing
 .Sq by hand
@@ -1899,7 +1899,7 @@
 .\" ----------------------------------------
 .Sh FILES
 System-wide
-.ML-Doc
+ML-Doc
 files and directories are stored at:
 .Dl %%PREFIX%%/share/ml-doc
 Notably:
@@ -1908,7 +1908,7 @@
 Master catalog file.
 .It Pa lib/ml-doc.dtd
 DTD of
-.ML-Doc
+ML-Doc
 language.
 .It Pa lib/entities.sgml
 Entity definitions
@@ -1923,7 +1923,14 @@
 .Pq see Sx Directory Structure ,
 and writing up the ML-Doc files
 .Pq see Sx WRITING DOCUMENTATION ,
-create a
+first edit the
+.Pa CATALOG
+file:
+.Bd -literal -offset indent -compact
+ENTITY    %document-entities    "Entities.sgml"
+CATALOG                         "%%PREFIX%%/share/ml-doc/lib/catalog"
+.Ed
+Then, create a
 .Pa Makefile :
 .Dl find ML-Doc -name '*.mldoc' -print | mk-mldoc-makefile
 .Pp
--- files/patch-tools-lib-code_style-sml_token_scanner.sml       1970-01-01 01:00:00.000000000 +0100
+++ files/patch-tools-lib-code_style-sml_token_scanner.sml       2009-10-08 21:04:20.000000000 +0200
@@ -0,0 +1,36 @@
+--- tools/lib/code-style/sml-token-scanner.sml.orig     2006-11-27 23:41:58.000000000 +0100
++++ tools/lib/code-style/sml-token-scanner.sml  2009-09-24 00:05:48.000000000 +0200
+@@ -37,20 +37,20 @@
+ 
+     val comElem : E.element option = SOME E.IT
+ 
+-    fun startCom (M.Match(SOME{pos as {comLevel, data}, len}, _)) =
++    fun startCom (M.Match({pos as {comLevel, data}, len}, _)) =
+          (comElem, prefix(len, pos), {comLevel=comLevel+1, data=SS.triml len data})
+ 
+-    fun endCom (M.Match(SOME{pos as {comLevel, data}, len}, _)) =
++    fun endCom (M.Match({pos as {comLevel, data}, len}, _)) =
+          (comElem, prefix(len, pos), {comLevel=comLevel-1, data=SS.triml len data})
+ 
+-    fun ident (M.Match(SOME{pos, len}, _)) = let
++    fun ident (M.Match({pos, len}, _)) = let
+          val txt = prefix(len, pos)
+          val kind = if SMLKeywords.isKW txt then SOME E.KW else NONE
+          in
+            (kind, txt, trim(len, pos))
+          end
+ 
+-    fun mkToken (kind : E.element option) (M.Match(SOME{pos, len}, _)) =
++    fun mkToken (kind : E.element option) (M.Match({pos, len}, _)) =
+          (kind, prefix(len, pos), trim(len, pos))
+ 
+     val tyvar = mkToken NONE
+@@ -60,7 +60,7 @@
+     val entity = mkToken NONE
+ 
+   (* string gets called after we have seen either #" or " *)
+-    fun string (M.Match(SOME{pos, len}, _)) = let
++    fun string (M.Match({pos, len}, _)) = let
+          fun getS (ss, n) = (case SS.getc ss
+                 of NONE => raise Fail "unclosed string"
+                  | SOME(#"\\", ss') => getS'(ss', n+1)

State Changed
From-To:	feedback->open
By:	linimon
When:	Mon Oct 26 23:22:09 UTC 2009
Why:	Fix portname and note, once again, that it is a maintainer update.

Class Changed
From-To:	change-request->maintainer-update
By:	linimon
When:	Mon Oct 26 23:22:09 UTC 2009
Why:

Responsible Changed
From-To:	freebsd-ports-bugs->miwi
By:	miwi
When:	Thu Oct 29 09:47:28 UTC 2009
Why:	I'll take it.

Unformatted:

Submit Followup | Raw PR | Find another PR

Header And Logo

Peripheral Links

Search

Site Navigation

ports/139807: [MAINTAINER] lang/sml-nj-devel: update to 110.71 and adapt devel/ml-doc accordingly