Date: Mon, 13 Oct 2014 19:33:54 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370816 - in head/lang/smlnj: . files Message-ID: <201410131933.s9DJXsSr026393@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Oct 13 19:33:54 2014 New Revision: 370816 URL: https://svnweb.freebsd.org/changeset/ports/370816 QAT: https://qat.redports.org/buildarchive/r370816/ Log: lang/smlnj: 110.76 -> 110.77 Changelog: http://www.smlnj.org/dist/working/110.77/110.77-README.html - defined LICENSE PR: 193431 Submitted by: joemann@beefree.free.de (maintainer) Deleted: head/lang/smlnj/files/do-patch-base_runtime_c-libs_posix-os_tmpname.c head/lang/smlnj/files/extra-patch-base_runtime_include_ml-unixdep.h Modified: head/lang/smlnj/Makefile head/lang/smlnj/distinfo head/lang/smlnj/files/patch-config___arch-n-opsys head/lang/smlnj/files/patch-config___heap2exec head/lang/smlnj/files/patch-config_install.sh head/lang/smlnj/files/pkg-install.in head/lang/smlnj/pkg-plist Modified: head/lang/smlnj/Makefile ============================================================================== --- head/lang/smlnj/Makefile Mon Oct 13 19:03:24 2014 (r370815) +++ head/lang/smlnj/Makefile Mon Oct 13 19:33:54 2014 (r370816) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= smlnj -PORTVERSION= 110.76 -PORTREVISION= 1 +PORTVERSION= 110.77 CATEGORIES= lang MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \ ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ @@ -13,6 +12,12 @@ EXTRACT_ONLY= config.tgz MAINTAINER= joemann@beefree.free.de COMMENT= Compiler and tools for Standard ML (SML '97) +LICENSE= SMLNJ +LICENSE_NAME= Standard ML of New Jersey License +LICENSE_TEXT= The text of the license can be obtained from the following URL:\ + http://www.smlnj.org/license.html +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + NO_WRKSUBDIR= yes SUB_FILES= pkg-install @@ -65,8 +70,8 @@ AS+= --32 MLARCH= x86 DISTFILES+= boot.x86-unix.tgz .endif -DISTFILES+= MLRISC.tgz ckit.tgz cml.tgz heap2asm.tgz ml-burg.tgz \ - ml-lpt.tgz ml-lex.tgz ml-yacc.tgz nlffi.tgz \ +DISTFILES+= MLRISC.tgz ckit.tgz cml.tgz doc.tgz heap2asm.tgz \ + ml-burg.tgz ml-lpt.tgz ml-lex.tgz ml-yacc.tgz nlffi.tgz \ smlnj-lib.tgz trace-debug-profile.tgz PLIST_SUB= MLARCH=${MLARCH} @@ -99,7 +104,7 @@ MLROOT= ${PREFIX}/${MLROOTRELATIVE} MLBINRELATIVE= ${MLROOTRELATIVE}/bin MLBIN= ${MLROOT}/bin MLLIB= ${MLROOT}/lib -MLSTDSRCDIRS= cml heap2asm ml-burg ml-lex ml-lpt ml-yacc nlffi smlnj-lib +MLSTDSRCDIRS= cml doc heap2asm ml-burg ml-lex ml-lpt ml-yacc nlffi smlnj-lib MLSRCDIRS= base ${MLSTDSRCDIRS} \ ckit eXene pgraph smlnj-c MLSRCS= @@ -239,6 +244,19 @@ do-build: ./config/install.sh .endif +# If Mac OS X resource files make it into the distribution tarballs, +# then we have to remove them at several points during the +# installation process. This is no longer necessary with FreeBSD 10 +# as it uses libarchive 3.x (via bsdtar), but earlier versions +# don't ignore such resource files and hence WRKDIR and STAGEDIR +# are full of them. Once FreeBSD 9 will be out of service, all +# lines in this Makefile can be removed which contain a pattern +# for the prefix "._" of the resource files. Background information: +# <https://github.com/libarchive/libarchive/wiki/TarExtendedAttributes#Apple_tar>; + +post-build: + ${FIND} ${WRKDIR} -type f -name '\._*' -delete + # Nowadays PLIST has to be computed before installation. We do it in # "pre-install" because source extraction happens during "build". @@ -261,9 +279,9 @@ pre-install: .if defined(ML_EVERYTHING) @${ECHO} -n '(* Computing package list ...' @${TAR} -tzf ${WRKDIR}/runtime.tgz | \ - ${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \ - -e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \ - > ${MLRUNTIMEPLIST} + ${GREP} -E -v '(^|/)\._.*' | \ + ${SED} -E -n -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%p' \ + > ${MLRUNTIMEPLIST} @${MLRUNTIMEPATCHES_CMD} | \ ${SED} ${MLPATCHPATHREGEX} | \ ${SED} -E -e 's%^(do|extra)-patch-(base/.*)%${MLROOTRELATIVE}/\2%' \ @@ -279,15 +297,12 @@ pre-install: ( ${FIND} -s -d ${MLSRCDIRS} \! -type d | \ ${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \ ( ${FIND} -s -d ${MLSRCDIRS} -type d -empty | \ - ${AWK} '{ print "@exec mkdir${CALM} -p %D/${MLROOTRELATIVE}/" $$0 }' ) ; \ - ( ${FIND} -s -d ${MLSRCDIRS} -type d | \ - ${AWK} '{ print "@dirrm ${MLROOTRELATIVE}/" $$0 }' ) ) | \ + ${AWK} '{ print "@dir ${MLROOTRELATIVE}/" $$0 }' ) ) | \ ${EGREP} -v ${MLSRCEXCLUDEREGEX} > ${MLSRCPLIST} @${SED} -e 's/^%%EVERYTHING%%//' ${MLPLISTFILES} | \ - ${GREP} -h -v "^@dirrm" | ${SORT} -u > ${PLIST} - @${GREP} -h "^@exec mkdir${CALM}" ${MLPLISTFILES} | ${SORT} -u >> ${PLIST} + ${GREP} -h -v "^@dir" | ${SORT} -u > ${PLIST} @${SED} -e 's/^%%EVERYTHING%%//' ${MLPLISTFILES} | \ - ${GREP} -h "^@dirrm" | ${SORT} -r -u >> ${PLIST} + ${GREP} -h "^@dir" | ${SORT} -r -u >> ${PLIST} @${ECHO} ' done. *)' .endif # ${PKGINSTALL} contains multiexec-wrapper, which is used to select @@ -347,9 +362,20 @@ do-install: CFLAGS='${CFLAGS}' AS='${AS}' EXTRA_DEFS='${EXTRA_DEFS}' \ ./config/install.sh .endif + [ ! -d ${STAGEDIR} ] || \ + ${FIND} ${STAGEDIR} -type f -name '\._*' -delete + @${ECHO} '(* Installing man pages. *)' +.for mansect in 1 2 3 4 5 6 7 8 9 + @[ ! -d ${WRKDIR}/doc/man/man${mansect} ] || \ + { cd ${WRKDIR}/doc/man/man${mansect} && ls *.${mansect} | \ + ${XARGS} -J % \ + ${INSTALL_MAN} % ${STAGEDIR}${MANPREFIX}/man/man${mansect} ; } +.endfor + @${ECHO} '(* Stripping runtime executable: *)' MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \ ( eval $${MLARCHOPSYS} ; \ - ${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" ) + ${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" \ + "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so" ) .if defined(ML_EVERYTHING) @${ECHO} '(* Cleaning base/runtime: *)' cd ${WRKDIR}/base/runtime/objs && ${MAKE_CMD} clean @@ -368,7 +394,11 @@ post-install: .endif post-stage: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/smlnj/bin/.run/run.x86-freebsd.so + ${FIND} ${STAGEDIR} -type f -name '\._*' -delete + MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \ + ( eval $${MLARCHOPSYS} ; \ + ${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" \ + "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so" ) .ifndef MULTIEXEC_WRAPPER_VERBOSE deinstall: Modified: head/lang/smlnj/distinfo ============================================================================== --- head/lang/smlnj/distinfo Mon Oct 13 19:03:24 2014 (r370815) +++ head/lang/smlnj/distinfo Mon Oct 13 19:33:54 2014 (r370816) @@ -1,40 +1,42 @@ -SIZE (smlnj/110.76/MLRISC.tgz) = 1434516 -SHA256 (smlnj/110.76/MLRISC.tgz) = 9d944dea4e80a8ef2cc01e7e16ae72cb280f2e4dc0d6648c9bc27156ccfcc102 -SIZE (smlnj/110.76/boot.x86-unix.tgz) = 5890950 -SHA256 (smlnj/110.76/boot.x86-unix.tgz) = dd16569fb6991d673e66dae57f5e9b372d5a4e305f92a9756002e4bb296c9b61 -SIZE (smlnj/110.76/ckit.tgz) = 194486 -SHA256 (smlnj/110.76/ckit.tgz) = c4534e6e7f910ebee3146cc8ed214a1d5a2ea90afbd79c2290cefdc784ee0dbb -SIZE (smlnj/110.76/cm.tgz) = 200425 -SHA256 (smlnj/110.76/cm.tgz) = 539e8199764a803f486dbf5c0ecb3fa3b2277a6b52ccbbf350bbdcc231bec193 -SIZE (smlnj/110.76/cml.tgz) = 106005 -SHA256 (smlnj/110.76/cml.tgz) = cbd357a3b3377d049911a247be880dcde7f52f705f7cdfe800b67631858681e1 -SHA256 (smlnj/110.76/compiler.tgz) = 322755b8a3f105eec4ce4a3197aaf83bcd542e4c2b2f43c724d0ae8f393bf681 -SIZE (smlnj/110.76/compiler.tgz) = 817182 -SHA256 (smlnj/110.76/config.tgz) = 41cec8bd28c43f49bea24cc7d80d091d8a0e0c7473ee67e4a0b06019567ca557 -SIZE (smlnj/110.76/config.tgz) = 511139 -SHA256 (smlnj/110.76/eXene.tgz) = 35befa7d37207c7fc2eab81e29e3a5afb4f2c5893f7336394906425d5f4ee607 -SIZE (smlnj/110.76/eXene.tgz) = 703059 -SIZE (smlnj/110.76/heap2asm.tgz) = 1314 -SHA256 (smlnj/110.76/heap2asm.tgz) = 8c1f52bc7459de1d0d8e07807abb8e8916fa5ef1cf08c0ceb3f06437f977215d -SIZE (smlnj/110.76/ml-burg.tgz) = 36341 -SHA256 (smlnj/110.76/ml-burg.tgz) = d59dad9188778c96b3e59f9d754a4fbdef4b67de2ded67deb0d26c40915a594e -SIZE (smlnj/110.76/ml-lex.tgz) = 33150 -SHA256 (smlnj/110.76/ml-lex.tgz) = 9d00143cff4e8cc87421270d34b29864c27d353d6b429cce3d3428f6c7280a6b -SIZE (smlnj/110.76/ml-lpt.tgz) = 256293 -SHA256 (smlnj/110.76/ml-lpt.tgz) = 9970b22506a605012055700cc28497c2850d29fbb7bcc5b069fbef785220fc8d -SHA256 (smlnj/110.76/ml-yacc.tgz) = 9151f7fef0abcb312daf731621b682b2c7e9f87a151832e99c30b5e56f03f1cf -SIZE (smlnj/110.76/ml-yacc.tgz) = 99943 -SHA256 (smlnj/110.76/nlffi.tgz) = 07bdc123b2c93f01bc0a5bbdf33aac0b34407bd70cd8d3e1d06ad55e92deb521 -SIZE (smlnj/110.76/nlffi.tgz) = 74484 -SIZE (smlnj/110.76/pgraph.tgz) = 5440 -SHA256 (smlnj/110.76/pgraph.tgz) = df44036b170f68a79a62134812adecd54c3f0da2188f0190996fc57faa10969c -SIZE (smlnj/110.76/runtime.tgz) = 324373 -SHA256 (smlnj/110.76/runtime.tgz) = f6086cd4e30ea3a89c528ee08c793eca77f7701589e0436acf347faf7e940a7f -SHA256 (smlnj/110.76/smlnj-c.tgz) = 0cdf1c3563f3080dffc184e8e64f5e58f7f21f1426d43cb8960cf090e2232a6f -SIZE (smlnj/110.76/smlnj-c.tgz) = 10534 -SIZE (smlnj/110.76/smlnj-lib.tgz) = 402937 -SHA256 (smlnj/110.76/smlnj-lib.tgz) = 81e994a07d7c8979b28c4911272de3c37eec648e58c03a9dc1ecb9bbbadca1d7 -SIZE (smlnj/110.76/system.tgz) = 227685 -SHA256 (smlnj/110.76/system.tgz) = 8f6a143db22a9d025e2820899c9cccbf0e66c679a9aa68c3dcd1bec68003da37 -SHA256 (smlnj/110.76/trace-debug-profile.tgz) = 3769e1d251d04c95b4c1b759f3bf21644bcb3135404d0346e8ff34553ae704df -SIZE (smlnj/110.76/trace-debug-profile.tgz) = 3899 +SHA256 (smlnj/110.77/MLRISC.tgz) = 4b443ee9e27bc8d2010bdce5724302c7d338e8eba0051d45cb4e384204488a76 +SIZE (smlnj/110.77/MLRISC.tgz) = 1479104 +SHA256 (smlnj/110.77/boot.x86-unix.tgz) = 9982a36d9fb3d2d15590d0d8bb15a30d3e684ad49f56d69eef8684f4eaf3bf02 +SIZE (smlnj/110.77/boot.x86-unix.tgz) = 5905482 +SHA256 (smlnj/110.77/ckit.tgz) = 29145b1739d46173cbaa87456b2bed35977c4ae7e83c48134a591459939b3966 +SIZE (smlnj/110.77/ckit.tgz) = 206672 +SHA256 (smlnj/110.77/cm.tgz) = 1c60316b3f16ae1a93cb87e281edcf2a84a554ac0415f010b8d565c2ae3a0a82 +SIZE (smlnj/110.77/cm.tgz) = 209949 +SHA256 (smlnj/110.77/cml.tgz) = bc4548eda9531c52029ed68a7988985b62ad17e95841c04dbbe32b4b30df4ef7 +SIZE (smlnj/110.77/cml.tgz) = 119083 +SHA256 (smlnj/110.77/compiler.tgz) = fcc7388167ee2d0048644bb2147bbca3e16f60be326dd724407e0f51e254e52f +SIZE (smlnj/110.77/compiler.tgz) = 841677 +SHA256 (smlnj/110.77/config.tgz) = 6bed2026e05367f247e2fcfa918edb835bdab24182f02f3253c1baf2f301b552 +SIZE (smlnj/110.77/config.tgz) = 514900 +SHA256 (smlnj/110.77/doc.tgz) = 8301bccdc1e99e8865e905070f7719d94a0ae39b44733d961a3e3002d97dd27e +SIZE (smlnj/110.77/doc.tgz) = 10240 +SHA256 (smlnj/110.77/eXene.tgz) = d4d3ccbde1bc11943054fb093a34c8531c9e8f56731293ca2470eab21602ea33 +SIZE (smlnj/110.77/eXene.tgz) = 729294 +SHA256 (smlnj/110.77/heap2asm.tgz) = f3f5c26d11dbe8019e6b3349ab07c04ffe553780a3a6ca0b000fe8084886ada5 +SIZE (smlnj/110.77/heap2asm.tgz) = 1606 +SHA256 (smlnj/110.77/ml-burg.tgz) = 9bc7bb014d34a63cb3ac8c42104bd579e8990ab2803c32a6a4410fcf8cfcbd4c +SIZE (smlnj/110.77/ml-burg.tgz) = 37604 +SHA256 (smlnj/110.77/ml-lex.tgz) = c4c0e108bf166f77e083692a27f9231d730c5b2a73a2f9f5409e55928c679553 +SIZE (smlnj/110.77/ml-lex.tgz) = 34081 +SHA256 (smlnj/110.77/ml-lpt.tgz) = eff30e6a3c4afb7f8265650e3e1cc83a8ff252ed19f22b30c2c431c9beca126e +SIZE (smlnj/110.77/ml-lpt.tgz) = 266511 +SHA256 (smlnj/110.77/ml-yacc.tgz) = 24a2b1d955e990c6f2a64d6be4df0c7d9bf430f56501587ecf95d30732cf266c +SIZE (smlnj/110.77/ml-yacc.tgz) = 103554 +SHA256 (smlnj/110.77/nlffi.tgz) = 8729d2aa203329fa76f9a7dccafe6fe88d0f397f1238727fea8fa1c67ae38cf0 +SIZE (smlnj/110.77/nlffi.tgz) = 79026 +SHA256 (smlnj/110.77/pgraph.tgz) = 5b46d4d9668f27b7538b5a8f6b62d9cd2c5797118e303aa691266df67f6e818c +SIZE (smlnj/110.77/pgraph.tgz) = 5907 +SHA256 (smlnj/110.77/runtime.tgz) = 8e40aa7d39c806d36360174d36bc376fa53662b5ac4f0a4add120c8c2fe67f2b +SIZE (smlnj/110.77/runtime.tgz) = 349470 +SHA256 (smlnj/110.77/smlnj-c.tgz) = 6de6f0d5a41e7fe097f3fae2815829c4bb14729145efa293fc74bd138180f01d +SIZE (smlnj/110.77/smlnj-c.tgz) = 11462 +SHA256 (smlnj/110.77/smlnj-lib.tgz) = 9232f7cf61a9a7a859dc9249a47a77b954a746137e8d8f6e57236f8c030677e7 +SIZE (smlnj/110.77/smlnj-lib.tgz) = 434946 +SHA256 (smlnj/110.77/system.tgz) = 367cce5e0ab848d28bc019862a30c2b5b774fd4733301bb72fec811d8e9d7f54 +SIZE (smlnj/110.77/system.tgz) = 246164 +SHA256 (smlnj/110.77/trace-debug-profile.tgz) = e6c7a4ed96de076b8d27af44eb8bfc1121e32f915d9a0b8fc356b5a27c761908 +SIZE (smlnj/110.77/trace-debug-profile.tgz) = 4329 Modified: head/lang/smlnj/files/patch-config___arch-n-opsys ============================================================================== --- head/lang/smlnj/files/patch-config___arch-n-opsys Mon Oct 13 19:03:24 2014 (r370815) +++ head/lang/smlnj/files/patch-config___arch-n-opsys Mon Oct 13 19:33:54 2014 (r370816) @@ -1,6 +1,6 @@ ---- config/_arch-n-opsys.orig 2012-07-28 05:32:38.000000000 +0200 -+++ config/_arch-n-opsys 2013-06-12 21:46:19.925992679 +0200 -@@ -83,6 +83,8 @@ +--- config/_arch-n-opsys.orig 2014-08-22 15:20:03.000000000 +0200 ++++ config/_arch-n-opsys 2014-08-23 14:19:47.056122710 +0200 +@@ -85,6 +85,8 @@ HEAP_OPSYS=bsd case `uname -m` in *86) ARCH=x86;; Modified: head/lang/smlnj/files/patch-config___heap2exec ============================================================================== --- head/lang/smlnj/files/patch-config___heap2exec Mon Oct 13 19:03:24 2014 (r370815) +++ head/lang/smlnj/files/patch-config___heap2exec Mon Oct 13 19:33:54 2014 (r370816) @@ -1,4 +1,4 @@ ---- config/_heap2exec 2006-04-20 17:28:53.000000000 +0200 +--- config/_heap2exec.orig 2006-04-20 17:28:53.000000000 +0200 +++ config/_heap2exec 2013-06-14 22:18:55.050990989 +0200 @@ -83,6 +83,7 @@ A_PROG= Modified: head/lang/smlnj/files/patch-config_install.sh ============================================================================== --- head/lang/smlnj/files/patch-config_install.sh Mon Oct 13 19:03:24 2014 (r370815) +++ head/lang/smlnj/files/patch-config_install.sh Mon Oct 13 19:33:54 2014 (r370816) @@ -1,6 +1,6 @@ ---- config/install.sh.orig 2012-03-02 23:57:26.000000000 +0100 -+++ config/install.sh 2014-07-14 20:12:56.000000000 +0200 -@@ -18,6 +18,8 @@ +--- config/install.sh.orig 2014-08-22 15:20:03.000000000 +0200 ++++ config/install.sh 2014-08-23 14:19:47.061124086 +0200 +@@ -17,6 +17,8 @@ nolib=false fi @@ -9,7 +9,7 @@ if [ x${INSTALL_QUIETLY} = xtrue ] ; then export CM_VERBOSE CM_VERBOSE=false -@@ -38,6 +40,28 @@ +@@ -37,6 +39,28 @@ exit 1 } @@ -38,7 +38,7 @@ this=$0 -@@ -97,7 +121,28 @@ +@@ -96,7 +120,28 @@ # Especially important is CM_PATHCONFIG. # export CM_PATHCONFIG @@ -68,7 +68,7 @@ # # the release version that we are installing # -@@ -327,7 +372,12 @@ +@@ -326,7 +371,12 @@ # the name of the bin files directory # BOOT_ARCHIVE=boot.$ARCH-unix @@ -82,7 +82,7 @@ # # build the run-time system -@@ -336,9 +386,15 @@ +@@ -335,9 +385,15 @@ vsay $this: Run-time system already exists. else "$CONFIGDIR"/unpack "$ROOT" runtime @@ -99,7 +99,7 @@ if [ -x run.$ARCH-$OPSYS ]; then mv run.$ARCH-$OPSYS "$RUNDIR" if [ -f runx.$ARCH-$OPSYS ]; then -@@ -350,7 +406,7 @@ +@@ -349,7 +405,7 @@ if [ -f run.$ARCH-$OPSYS.a ]; then mv run.$ARCH-$OPSYS.a "$RUNDIR" fi @@ -108,7 +108,7 @@ else complain "$this: !!! Run-time system build failed for some reason." fi -@@ -376,7 +432,7 @@ +@@ -375,7 +431,7 @@ complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)." fi else @@ -117,7 +117,7 @@ fish "$ROOT"/"$BOOT_FILES"/smlnj/basis -@@ -411,7 +467,7 @@ +@@ -410,7 +466,7 @@ cd "$ROOT"/"$BOOT_FILES" for anchor in * ; do if [ -d $anchor ] ; then @@ -126,7 +126,7 @@ move $anchor "$LIBDIR"/$anchor fi done -@@ -434,6 +490,18 @@ +@@ -433,6 +489,18 @@ cd "$ROOT" @@ -143,8 +143,8 @@ +done + # - # Now do all the rest using the precompiled installer: - # + # Now do all the rest using the precompiled installer + # (see base/system/smlnj/installer for details) @@ -442,6 +510,12 @@ export ROOT INSTALLDIR CONFIGDIR BINDIR CM_TOLERATE_TOOL_FAILURES=true Modified: head/lang/smlnj/files/pkg-install.in ============================================================================== --- head/lang/smlnj/files/pkg-install.in Mon Oct 13 19:03:24 2014 (r370815) +++ head/lang/smlnj/files/pkg-install.in Mon Oct 13 19:33:54 2014 (r370816) @@ -188,6 +188,23 @@ install_self_to() { say "$myself (version $VERSION) is not newer than $target (version $oldversion)." fi fi + elif [ ! -d `dirname $target` ] + then + if [ -e `dirname $target` ] + then + die "`dirname $target` is not a directory." + else + mkdir -p `dirname $target` || die "could not create `dirname $target`" + fi + fi + if [ ! -d `dirname $CONFIG` ] + then + if [ -e `dirname $CONFIG` ] + then + die "`dirname $CONFIG` is not a directory." + else + mkdir -p `dirname $CONFIG` || die "could not create `dirname $CONFIG`" + fi fi if sed -e '/^#%%PKG-INSTALL-START%%$/,/^#%%PKG-INSTALL-END%%$/d' \ -e 's?%%SOURCEINFO-PACKAGE%%?'"$pkgname"'?g' \ @@ -217,6 +234,10 @@ deinstall_self_from() { elif rm -f "$CONFIG" then say "$CONFIG removed." + if rmdir `dirname $CONFIG` + then + say "`dirname $CONFIG` removed" + fi else warn "failed to remove $CONFIG." fi @@ -228,6 +249,10 @@ deinstall_self_from() { elif rm -f "$MYSELF_INSTALLED" then say "$MYSELF_INSTALLED removed." + if rmdir `dirname $MYSELF_INSTALLED` + then + say "`dirname $MYSELF_INSTALLED` removed" + fi else warn "failed to remove $MYSELF_INSTALLED." fi Modified: head/lang/smlnj/pkg-plist ============================================================================== --- head/lang/smlnj/pkg-plist Mon Oct 13 19:03:24 2014 (r370815) +++ head/lang/smlnj/pkg-plist Mon Oct 13 19:33:54 2014 (r370816) @@ -1,3 +1,9 @@ +man/man1/ml-antlr.1.gz +man/man1/ml-build.1.gz +man/man1/ml-makedepend.1.gz +man/man1/ml-ulex.1.gz +man/man1/sml.1.gz +man/man7/smlnj.7.gz smlnj/bin/.arch-n-opsys smlnj/bin/.heap/heap2asm.%%MLARCH%%-bsd smlnj/bin/.heap/ml-antlr.%%MLARCH%%-bsd @@ -170,168 +176,4 @@ smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-u smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/x86.cm smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm -@dirrm smlnj/bin/.heap -@dirrm smlnj/bin/.run -@dirrm smlnj/bin -@dirrm smlnj/lib/SMLNJ-BASIS/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/SMLNJ-BASIS/.cm -@dirrm smlnj/lib/SMLNJ-BASIS -@dirrm smlnj/lib/SMLNJ-LIB/Controls/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/SMLNJ-LIB/Controls/.cm -@dirrm smlnj/lib/SMLNJ-LIB/Controls -@dirrm smlnj/lib/SMLNJ-LIB/HTML/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/SMLNJ-LIB/HTML/.cm -@dirrm smlnj/lib/SMLNJ-LIB/HTML -@dirrm smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/SMLNJ-LIB/PP/.cm -@dirrm smlnj/lib/SMLNJ-LIB/PP -@dirrm smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/SMLNJ-LIB/Util/.cm -@dirrm smlnj/lib/SMLNJ-LIB/Util -@dirrm smlnj/lib/SMLNJ-LIB -@dirrm smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/SMLNJ-ML-YACC-LIB/.cm -@dirrm smlnj/lib/SMLNJ-ML-YACC-LIB -@dirrm smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/SMLNJ-MLRISC/.cm -@dirrm smlnj/lib/SMLNJ-MLRISC -@dirrm smlnj/lib/burg-ext.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/burg-ext.cm/.cm -@dirrm smlnj/lib/burg-ext.cm -@dirrm smlnj/lib/c/memory/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/c/memory/.cm -@dirrm smlnj/lib/c/memory -@dirrm smlnj/lib/c/internals/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/c/internals/.cm -@dirrm smlnj/lib/c/internals -@dirrm smlnj/lib/c/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/c/.cm -@dirrm smlnj/lib/c -@dirrm smlnj/lib/ckit-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/ckit-lib.cm/.cm -@dirrm smlnj/lib/ckit-lib.cm -@dirrm smlnj/lib/cml/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/cml/.cm -@dirrm smlnj/lib/cml -@dirrm smlnj/lib/cml-lib/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/cml-lib/.cm -@dirrm smlnj/lib/cml-lib -@dirrm smlnj/lib/dir-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/dir-tool.cm/.cm -@dirrm smlnj/lib/dir-tool.cm -%%EVERYTHING%%@dirrm smlnj/lib/eXene.cm/.cm/%%MLARCH%%-unix -%%EVERYTHING%%@dirrm smlnj/lib/eXene.cm/.cm -%%EVERYTHING%%@dirrm smlnj/lib/eXene.cm -@dirrm smlnj/lib/grm-ext.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/grm-ext.cm/.cm -@dirrm smlnj/lib/grm-ext.cm -@dirrm smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/hash-cons-lib.cm/.cm -@dirrm smlnj/lib/hash-cons-lib.cm -@dirrm smlnj/lib/html4-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/html4-lib.cm/.cm -@dirrm smlnj/lib/html4-lib.cm -@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 -@dirrm smlnj/lib/make-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/make-tool.cm/.cm -@dirrm smlnj/lib/make-tool.cm -@dirrm smlnj/lib/ml-antlr-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/ml-antlr-tool.cm/.cm -@dirrm smlnj/lib/ml-antlr-tool.cm -@dirrm smlnj/lib/ml-lpt-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/ml-lpt-lib.cm/.cm -@dirrm smlnj/lib/ml-lpt-lib.cm -@dirrm smlnj/lib/ml-ulex-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/ml-ulex-tool.cm/.cm -@dirrm smlnj/lib/ml-ulex-tool.cm -@dirrm smlnj/lib/mlburg-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/mlburg-tool.cm/.cm -@dirrm smlnj/lib/mlburg-tool.cm -@dirrm smlnj/lib/mllex-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/mllex-tool.cm/.cm -@dirrm smlnj/lib/mllex-tool.cm -%%EVERYTHING%%@dirrm smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix -%%EVERYTHING%%@dirrm smlnj/lib/mlrisc-tools/.cm -%%EVERYTHING%%@dirrm smlnj/lib/mlrisc-tools -@dirrm smlnj/lib/mlyacc-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/mlyacc-tool.cm/.cm -@dirrm smlnj/lib/mlyacc-tool.cm -@dirrm smlnj/lib/noweb-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/noweb-tool.cm/.cm -@dirrm smlnj/lib/noweb-tool.cm -@dirrm smlnj/lib/nw-ext.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/nw-ext.cm/.cm -@dirrm smlnj/lib/nw-ext.cm -%%EVERYTHING%%@dirrm smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix -%%EVERYTHING%%@dirrm smlnj/lib/pgraph-util.cm/.cm -%%EVERYTHING%%@dirrm smlnj/lib/pgraph-util.cm -@dirrm smlnj/lib/pgraph.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/pgraph.cm/.cm -@dirrm smlnj/lib/pgraph.cm -@dirrm smlnj/lib/pickle-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/pickle-lib.cm/.cm -@dirrm smlnj/lib/pickle-lib.cm -@dirrm smlnj/lib/reactive-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/reactive-lib.cm/.cm -@dirrm smlnj/lib/reactive-lib.cm -@dirrm smlnj/lib/regexp-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/regexp-lib.cm/.cm -@dirrm smlnj/lib/regexp-lib.cm -@dirrm smlnj/lib/sexp-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/sexp-lib.cm/.cm -@dirrm smlnj/lib/sexp-lib.cm -@dirrm smlnj/lib/shell-tool.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/shell-tool.cm/.cm -@dirrm smlnj/lib/shell-tool.cm -@dirrm smlnj/lib/smlnj/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/.cm -@dirrm smlnj/lib/smlnj/basis/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/basis/.cm -@dirrm smlnj/lib/smlnj/basis -@dirrm smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/MLRISC/.cm -@dirrm smlnj/lib/smlnj/MLRISC -@dirrm smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/cm/.cm -@dirrm smlnj/lib/smlnj/cm -@dirrm smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/cmb/.cm -@dirrm smlnj/lib/smlnj/cmb -@dirrm smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/compiler/.cm -@dirrm smlnj/lib/smlnj/compiler -@dirrm smlnj/lib/smlnj/init/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/init/.cm -@dirrm smlnj/lib/smlnj/init -@dirrm smlnj/lib/smlnj/internal/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/internal/.cm -@dirrm smlnj/lib/smlnj/internal -@dirrm smlnj/lib/smlnj/installer/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/installer/.cm -@dirrm smlnj/lib/smlnj/installer -@dirrm smlnj/lib/smlnj/ml-yacc/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/ml-yacc/.cm -@dirrm smlnj/lib/smlnj/ml-yacc -@dirrm smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/smlnj-lib/.cm -@dirrm smlnj/lib/smlnj/smlnj-lib -@dirrm smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj/viscomp/.cm -@dirrm smlnj/lib/smlnj/viscomp -@dirrm smlnj/lib/smlnj -@dirrm smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/smlnj-tdp/.cm -@dirrm smlnj/lib/smlnj-tdp -@dirrm smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix -@dirrm smlnj/lib/unix-lib.cm/.cm -@dirrm smlnj/lib/unix-lib.cm -@dirrm smlnj/lib -@dirrm smlnj +smlnj/lib/xml-lib.cm/.cm/%%MLARCH%%-unix/xml-lib.cm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410131933.s9DJXsSr026393>