Fixed directory layout for wip/nim

[Roland Illig <roland.illig%gmx.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sun Mar 20 20:45:27 2016 +0100
Changeset:	bb1db261a8c363cfd3c2dd5a30dc6f12c5a6d4e9

Modified Files:
	nim/Makefile
	nim/PLIST
	nim/distinfo
Removed Files:
	nim/patches/patch-install.sh

Log Message:
Fixed directory layout for wip/nim

Nim relies on the exact directory layout. Otherwise it will not find its
libraries. Therefore, the original directory structure has been restored
and a wrapper has been provided. This wrapper also needs to set the _
environment variable, since nim depends on it.

Bumped PKGREVISION.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bb1db261a8c363cfd3c2dd5a30dc6f12c5a6d4e9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nim/Makefile                 |   8 +-
 nim/PLIST                    | 397 ++++++++++++++++++++++---------------------
 nim/distinfo                 |   2 +-
 nim/patches/patch-install.sh |  22 ---
 4 files changed, 207 insertions(+), 222 deletions(-)

diffs:
diff --git a/nim/Makefile b/nim/Makefile
index 7249c85..ba65b33 100644
--- a/nim/Makefile
+++ b/nim/Makefile
@@ -1,20 +1,26 @@
 # $NetBSD$
 
 DISTNAME=	nim-0.13.0
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://nim-lang.org/download/
 EXTRACT_SUFX=	.tar.xz
-LICENSE=	mit
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
 COMMENT=	The Nim programming language
+LICENSE=	mit
 
 NO_CONFIGURE=	yes
+AUTO_MKDIRS=	yes
 
 do-build:
 	cd ${WRKSRC} && sh ./build.sh
+	printf '#! %s\nexec %s _=%s/nim/bin/nim %s/nim/bin/nim "$$@"\n' \
+		"${SH}" "${SETENV}" "${PREFIX}" "${PREFIX}" \
+		> ${WRKSRC}/nim-wrapper.sh
 
 do-install:
 	cd ${WRKSRC} && sh ./install.sh ${DESTDIR}${PREFIX}
+	${INSTALL_SCRIPT} ${WRKSRC}/nim-wrapper.sh ${DESTDIR}${PREFIX}/bin/nim
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/nim/PLIST b/nim/PLIST
index 58f3a42..43a05d6 100644
--- a/nim/PLIST
+++ b/nim/PLIST
@@ -1,200 +1,201 @@
 @comment $NetBSD$
 bin/nim
-lib/nim/core/locks.nim
-lib/nim/core/macros.nim
-lib/nim/core/typeinfo.nim
-lib/nim/deprecated/core/unsigned.nim
-lib/nim/deprecated/pure/actors.nim
-lib/nim/deprecated/pure/actors.nim.cfg
-lib/nim/deprecated/pure/asyncio.nim
-lib/nim/deprecated/pure/ftpclient.nim
-lib/nim/deprecated/pure/parseurl.nim
-lib/nim/deprecated/pure/rawsockets.nim
-lib/nim/deprecated/pure/sockets.nim
-lib/nim/impure/db_mysql.nim
-lib/nim/impure/db_odbc.nim
-lib/nim/impure/db_postgres.nim
-lib/nim/impure/db_sqlite.nim
-lib/nim/impure/nre.nim
-lib/nim/impure/nre/private/util.nim
-lib/nim/impure/osinfo_posix.nim
-lib/nim/impure/osinfo_win.nim
-lib/nim/impure/rdstdin.nim
-lib/nim/impure/re.nim
-lib/nim/impure/ssl.nim
-lib/nim/js/dom.nim
-lib/nim/nimbase.h
-lib/nim/nimrtl.nim
-lib/nim/nimrtl.nim.cfg
-lib/nim/packages/docutils/highlite.nim
-lib/nim/packages/docutils/rst.nim
-lib/nim/packages/docutils/rstast.nim
-lib/nim/packages/docutils/rstgen.nim
-lib/nim/posix/epoll.nim
-lib/nim/posix/inotify.nim
-lib/nim/posix/kqueue.nim
-lib/nim/posix/linux.nim
-lib/nim/posix/posix.nim
-lib/nim/posix/termios.nim
-lib/nim/prelude.nim
-lib/nim/pure/algorithm.nim
-lib/nim/pure/asyncdispatch.nim
-lib/nim/pure/asyncdispatch.nim.cfg
-lib/nim/pure/asyncfile.nim
-lib/nim/pure/asyncftpclient.nim
-lib/nim/pure/asynchttpserver.nim
-lib/nim/pure/asyncnet.nim
-lib/nim/pure/base64.nim
-lib/nim/pure/basic2d.nim
-lib/nim/pure/basic3d.nim
-lib/nim/pure/browsers.nim
-lib/nim/pure/cgi.nim
-lib/nim/pure/collections/LockFreeHash.nim
-lib/nim/pure/collections/critbits.nim
-lib/nim/pure/collections/intsets.nim
-lib/nim/pure/collections/lists.nim
-lib/nim/pure/collections/queues.nim
-lib/nim/pure/collections/rtarrays.nim
-lib/nim/pure/collections/sequtils.nim
-lib/nim/pure/collections/sets.nim
-lib/nim/pure/collections/sharedlist.nim
-lib/nim/pure/collections/sharedstrings.nim
-lib/nim/pure/collections/sharedtables.nim
-lib/nim/pure/collections/tableimpl.nim
-lib/nim/pure/collections/tables.nim
-lib/nim/pure/colors.nim
-lib/nim/pure/complex.nim
-lib/nim/pure/concurrency/cpuinfo.nim
-lib/nim/pure/concurrency/cpuload.nim
-lib/nim/pure/concurrency/threadpool.nim
-lib/nim/pure/concurrency/threadpool.nim.cfg
-lib/nim/pure/cookies.nim
-lib/nim/pure/coro.nim
-lib/nim/pure/db_common.nim
-lib/nim/pure/dynlib.nim
-lib/nim/pure/encodings.nim
-lib/nim/pure/endians.nim
-lib/nim/pure/etcpriv.nim
-lib/nim/pure/events.nim
-lib/nim/pure/fenv.nim
-lib/nim/pure/fsmonitor.nim
-lib/nim/pure/future.nim
-lib/nim/pure/gentabs.nim
-lib/nim/pure/hashes.nim
-lib/nim/pure/htmlgen.nim
-lib/nim/pure/htmlparser.nim
-lib/nim/pure/httpclient.nim
-lib/nim/pure/httpserver.nim
-lib/nim/pure/json.nim
-lib/nim/pure/lexbase.nim
-lib/nim/pure/logging.nim
-lib/nim/pure/marshal.nim
-lib/nim/pure/matchers.nim
-lib/nim/pure/math.nim
-lib/nim/pure/md5.nim
-lib/nim/pure/memfiles.nim
-lib/nim/pure/mersenne.nim
-lib/nim/pure/mimetypes.nim
-lib/nim/pure/nativesockets.nim
-lib/nim/pure/net.nim
-lib/nim/pure/nimprof.nim
-lib/nim/pure/nimprof.nim.cfg
-lib/nim/pure/numeric.nim
-lib/nim/pure/oids.nim
-lib/nim/pure/options.nim
-lib/nim/pure/os.nim
-lib/nim/pure/ospaths.nim
-lib/nim/pure/osproc.nim
-lib/nim/pure/oswalkdir.nim
-lib/nim/pure/parsecfg.nim
-lib/nim/pure/parsecsv.nim
-lib/nim/pure/parseopt.nim
-lib/nim/pure/parseopt2.nim
-lib/nim/pure/parsesql.nim
-lib/nim/pure/parseutils.nim
-lib/nim/pure/parsexml.nim
-lib/nim/pure/pegs.nim
-lib/nim/pure/poly.nim
-lib/nim/pure/rationals.nim
-lib/nim/pure/romans.nim
-lib/nim/pure/ropes.nim
-lib/nim/pure/scgi.nim
-lib/nim/pure/securehash.nim
-lib/nim/pure/selectors.nim
-lib/nim/pure/smtp.nim
-lib/nim/pure/smtp.nim.cfg
-lib/nim/pure/stats.nim
-lib/nim/pure/streams.nim
-lib/nim/pure/strtabs.nim
-lib/nim/pure/strutils.nim
-lib/nim/pure/subexes.nim
-lib/nim/pure/terminal.nim
-lib/nim/pure/times.nim
-lib/nim/pure/typetraits.nim
-lib/nim/pure/unicode.nim
-lib/nim/pure/unidecode/unidecode.nim
-lib/nim/pure/unittest.nim
-lib/nim/pure/uri.nim
-lib/nim/pure/xmldom.nim
-lib/nim/pure/xmldomparser.nim
-lib/nim/pure/xmlparser.nim
-lib/nim/pure/xmltree.nim
-lib/nim/stdlib.nimble
-lib/nim/system.nim
-lib/nim/system/alloc.nim
-lib/nim/system/ansi_c.nim
-lib/nim/system/arithm.nim
-lib/nim/system/assign.nim
-lib/nim/system/atomics.nim
-lib/nim/system/avltree.nim
-lib/nim/system/cellsets.nim
-lib/nim/system/cgprocs.nim
-lib/nim/system/channels.nim
-lib/nim/system/chcks.nim
-lib/nim/system/debugger.nim
-lib/nim/system/deepcopy.nim
-lib/nim/system/dyncalls.nim
-lib/nim/system/embedded.nim
-lib/nim/system/endb.nim
-lib/nim/system/excpt.nim
-lib/nim/system/gc.nim
-lib/nim/system/gc2.nim
-lib/nim/system/gc_common.nim
-lib/nim/system/gc_ms.nim
-lib/nim/system/hti.nim
-lib/nim/system/inclrtl.nim
-lib/nim/system/jssys.nim
-lib/nim/system/mmdisp.nim
-lib/nim/system/nimscript.nim
-lib/nim/system/platforms.nim
-lib/nim/system/profiler.nim
-lib/nim/system/repr.nim
-lib/nim/system/reprjs.nim
-lib/nim/system/sets.nim
-lib/nim/system/sysio.nim
-lib/nim/system/syslocks.nim
-lib/nim/system/sysspawn.nim
-lib/nim/system/sysstr.nim
-lib/nim/system/threads.nim
-lib/nim/system/timers.nim
-lib/nim/system/widestrs.nim
-lib/nim/windows/winlean.nim
-lib/nim/wrappers/iup.nim
-lib/nim/wrappers/joyent_http_parser.nim
-lib/nim/wrappers/libsvm.nim
-lib/nim/wrappers/libuv.nim
-lib/nim/wrappers/linenoise/clinenoise.c
-lib/nim/wrappers/linenoise/clinenoise.h
-lib/nim/wrappers/linenoise/linenoise.nim
-lib/nim/wrappers/mysql.nim
-lib/nim/wrappers/odbcsql.nim
-lib/nim/wrappers/openssl.nim
-lib/nim/wrappers/pcre.nim
-lib/nim/wrappers/pdcurses.nim
-lib/nim/wrappers/postgres.nim
-lib/nim/wrappers/sqlite3.nim
-lib/nim/wrappers/tinyc.nim
-share/doc/nim/overview.html
-share/nim/config/nim.cfg
-share/nim/config/nimdoc.cfg
-share/nim/config/nimdoc.tex.cfg
+nim/bin/nim
+nim/config/nim.cfg
+nim/config/nimdoc.cfg
+nim/config/nimdoc.tex.cfg
+nim/doc/overview.html
+nim/lib/core/locks.nim
+nim/lib/core/macros.nim
+nim/lib/core/typeinfo.nim
+nim/lib/deprecated/core/unsigned.nim
+nim/lib/deprecated/pure/actors.nim
+nim/lib/deprecated/pure/actors.nim.cfg
+nim/lib/deprecated/pure/asyncio.nim
+nim/lib/deprecated/pure/ftpclient.nim
+nim/lib/deprecated/pure/parseurl.nim
+nim/lib/deprecated/pure/rawsockets.nim
+nim/lib/deprecated/pure/sockets.nim
+nim/lib/impure/db_mysql.nim
+nim/lib/impure/db_odbc.nim
+nim/lib/impure/db_postgres.nim
+nim/lib/impure/db_sqlite.nim
+nim/lib/impure/nre.nim
+nim/lib/impure/nre/private/util.nim
+nim/lib/impure/osinfo_posix.nim
+nim/lib/impure/osinfo_win.nim
+nim/lib/impure/rdstdin.nim
+nim/lib/impure/re.nim
+nim/lib/impure/ssl.nim
+nim/lib/js/dom.nim
+nim/lib/nimbase.h
+nim/lib/nimrtl.nim
+nim/lib/nimrtl.nim.cfg
+nim/lib/packages/docutils/highlite.nim
+nim/lib/packages/docutils/rst.nim
+nim/lib/packages/docutils/rstast.nim
+nim/lib/packages/docutils/rstgen.nim
+nim/lib/posix/epoll.nim
+nim/lib/posix/inotify.nim
+nim/lib/posix/kqueue.nim
+nim/lib/posix/linux.nim
+nim/lib/posix/posix.nim
+nim/lib/posix/termios.nim
+nim/lib/prelude.nim
+nim/lib/pure/algorithm.nim
+nim/lib/pure/asyncdispatch.nim
+nim/lib/pure/asyncdispatch.nim.cfg
+nim/lib/pure/asyncfile.nim
+nim/lib/pure/asyncftpclient.nim
+nim/lib/pure/asynchttpserver.nim
+nim/lib/pure/asyncnet.nim
+nim/lib/pure/base64.nim
+nim/lib/pure/basic2d.nim
+nim/lib/pure/basic3d.nim
+nim/lib/pure/browsers.nim
+nim/lib/pure/cgi.nim
+nim/lib/pure/collections/LockFreeHash.nim
+nim/lib/pure/collections/critbits.nim
+nim/lib/pure/collections/intsets.nim
+nim/lib/pure/collections/lists.nim
+nim/lib/pure/collections/queues.nim
+nim/lib/pure/collections/rtarrays.nim
+nim/lib/pure/collections/sequtils.nim
+nim/lib/pure/collections/sets.nim
+nim/lib/pure/collections/sharedlist.nim
+nim/lib/pure/collections/sharedstrings.nim
+nim/lib/pure/collections/sharedtables.nim
+nim/lib/pure/collections/tableimpl.nim
+nim/lib/pure/collections/tables.nim
+nim/lib/pure/colors.nim
+nim/lib/pure/complex.nim
+nim/lib/pure/concurrency/cpuinfo.nim
+nim/lib/pure/concurrency/cpuload.nim
+nim/lib/pure/concurrency/threadpool.nim
+nim/lib/pure/concurrency/threadpool.nim.cfg
+nim/lib/pure/cookies.nim
+nim/lib/pure/coro.nim
+nim/lib/pure/db_common.nim
+nim/lib/pure/dynlib.nim
+nim/lib/pure/encodings.nim
+nim/lib/pure/endians.nim
+nim/lib/pure/etcpriv.nim
+nim/lib/pure/events.nim
+nim/lib/pure/fenv.nim
+nim/lib/pure/fsmonitor.nim
+nim/lib/pure/future.nim
+nim/lib/pure/gentabs.nim
+nim/lib/pure/hashes.nim
+nim/lib/pure/htmlgen.nim
+nim/lib/pure/htmlparser.nim
+nim/lib/pure/httpclient.nim
+nim/lib/pure/httpserver.nim
+nim/lib/pure/json.nim
+nim/lib/pure/lexbase.nim
+nim/lib/pure/logging.nim
+nim/lib/pure/marshal.nim
+nim/lib/pure/matchers.nim
+nim/lib/pure/math.nim
+nim/lib/pure/md5.nim
+nim/lib/pure/memfiles.nim
+nim/lib/pure/mersenne.nim
+nim/lib/pure/mimetypes.nim
+nim/lib/pure/nativesockets.nim
+nim/lib/pure/net.nim
+nim/lib/pure/nimprof.nim
+nim/lib/pure/nimprof.nim.cfg
+nim/lib/pure/numeric.nim
+nim/lib/pure/oids.nim
+nim/lib/pure/options.nim
+nim/lib/pure/os.nim
+nim/lib/pure/ospaths.nim
+nim/lib/pure/osproc.nim
+nim/lib/pure/oswalkdir.nim
+nim/lib/pure/parsecfg.nim
+nim/lib/pure/parsecsv.nim
+nim/lib/pure/parseopt.nim
+nim/lib/pure/parseopt2.nim
+nim/lib/pure/parsesql.nim
+nim/lib/pure/parseutils.nim
+nim/lib/pure/parsexml.nim
+nim/lib/pure/pegs.nim
+nim/lib/pure/poly.nim
+nim/lib/pure/rationals.nim
+nim/lib/pure/romans.nim
+nim/lib/pure/ropes.nim
+nim/lib/pure/scgi.nim
+nim/lib/pure/securehash.nim
+nim/lib/pure/selectors.nim
+nim/lib/pure/smtp.nim
+nim/lib/pure/smtp.nim.cfg
+nim/lib/pure/stats.nim
+nim/lib/pure/streams.nim
+nim/lib/pure/strtabs.nim
+nim/lib/pure/strutils.nim
+nim/lib/pure/subexes.nim
+nim/lib/pure/terminal.nim
+nim/lib/pure/times.nim
+nim/lib/pure/typetraits.nim
+nim/lib/pure/unicode.nim
+nim/lib/pure/unidecode/unidecode.nim
+nim/lib/pure/unittest.nim
+nim/lib/pure/uri.nim
+nim/lib/pure/xmldom.nim
+nim/lib/pure/xmldomparser.nim
+nim/lib/pure/xmlparser.nim
+nim/lib/pure/xmltree.nim
+nim/lib/stdlib.nimble
+nim/lib/system.nim
+nim/lib/system/alloc.nim
+nim/lib/system/ansi_c.nim
+nim/lib/system/arithm.nim
+nim/lib/system/assign.nim
+nim/lib/system/atomics.nim
+nim/lib/system/avltree.nim
+nim/lib/system/cellsets.nim
+nim/lib/system/cgprocs.nim
+nim/lib/system/channels.nim
+nim/lib/system/chcks.nim
+nim/lib/system/debugger.nim
+nim/lib/system/deepcopy.nim
+nim/lib/system/dyncalls.nim
+nim/lib/system/embedded.nim
+nim/lib/system/endb.nim
+nim/lib/system/excpt.nim
+nim/lib/system/gc.nim
+nim/lib/system/gc2.nim
+nim/lib/system/gc_common.nim
+nim/lib/system/gc_ms.nim
+nim/lib/system/hti.nim
+nim/lib/system/inclrtl.nim
+nim/lib/system/jssys.nim
+nim/lib/system/mmdisp.nim
+nim/lib/system/nimscript.nim
+nim/lib/system/platforms.nim
+nim/lib/system/profiler.nim
+nim/lib/system/repr.nim
+nim/lib/system/reprjs.nim
+nim/lib/system/sets.nim
+nim/lib/system/sysio.nim
+nim/lib/system/syslocks.nim
+nim/lib/system/sysspawn.nim
+nim/lib/system/sysstr.nim
+nim/lib/system/threads.nim
+nim/lib/system/timers.nim
+nim/lib/system/widestrs.nim
+nim/lib/windows/winlean.nim
+nim/lib/wrappers/iup.nim
+nim/lib/wrappers/joyent_http_parser.nim
+nim/lib/wrappers/libsvm.nim
+nim/lib/wrappers/libuv.nim
+nim/lib/wrappers/linenoise/clinenoise.c
+nim/lib/wrappers/linenoise/clinenoise.h
+nim/lib/wrappers/linenoise/linenoise.nim
+nim/lib/wrappers/mysql.nim
+nim/lib/wrappers/odbcsql.nim
+nim/lib/wrappers/openssl.nim
+nim/lib/wrappers/pcre.nim
+nim/lib/wrappers/pdcurses.nim
+nim/lib/wrappers/postgres.nim
+nim/lib/wrappers/sqlite3.nim
+nim/lib/wrappers/tinyc.nim
diff --git a/nim/distinfo b/nim/distinfo
index 19114ff..21766d8 100644
--- a/nim/distinfo
+++ b/nim/distinfo
@@ -2,5 +2,5 @@ $NetBSD$
 
 SHA1 (nim-0.13.0.tar.xz) = 88450e9ffcc65625450c25e1ef73ebfb3c348955
 RMD160 (nim-0.13.0.tar.xz) = 03629c1b9be1df541023b170adc79a893382980a
+SHA512 (nim-0.13.0.tar.xz) = fd29b88146eaa7add24000b5c84b8f2dadd527bb827bbfd93e0ba7e01768bac70f2fcd5726161dc930cc5038a3f3eba7c4af86edb99bdaf20565abe92a17e9b0
 Size (nim-0.13.0.tar.xz) = 3145360 bytes
-SHA1 (patch-install.sh) = 9d19e3c7b7b5b5dce35ea2e3a8309877f6dc8691
diff --git a/nim/patches/patch-install.sh b/nim/patches/patch-install.sh
deleted file mode 100644
index 143a2c4..0000000
--- a/nim/patches/patch-install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD$
---- ./install.sh.orig	2016-02-01 19:35:39.000000000 -0800
-+++ ./install.sh	2016-02-01 19:43:27.000000000 -0800
-@@ -39,13 +39,12 @@
-       datadir=/usr/local/share/nim/data
-       ;;
-     *)
--      bindir="$1/nim/bin"
--      configdir="$1/nim/config"
--      libdir="$1/nim/lib"
--      docdir="$1/nim/doc"
--      datadir="$1/nim/data"
-+      bindir="$1/bin"
-+      configdir="$1/share/nim/config"
-+      libdir="$1/lib/nim"
-+      docdir="$1/share/doc/nim"
-+      datadir="$1/share/nim/data"
-       
--      mkdir -p $1/nim
-       mkdir -p $bindir
-       mkdir -p $configdir
-       ;;