From 4d14f86786eb0f06ee69ee59c1bc8842ff1f5cdc Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 23 Oct 2008 16:56:23 +0000 Subject: [PATCH] Remove more stuff: ports/, root_skels/ (which we maintain in nrelease/), scripts/ and src/lib/lua. --- contrib/bsdinstaller-1.1.6/README.DELETED | 118 +++ .../ports/devel/libaura/.cvsignore | 1 - .../ports/devel/libaura/Makefile | 57 -- .../ports/devel/libaura/pkg-descr | 10 - .../ports/devel/lua50-app/Makefile | 50 -- .../ports/devel/lua50-app/pkg-descr | 3 - .../ports/devel/lua50-compat51/Makefile | 41 - .../ports/devel/lua50-compat51/distinfo | 2 - .../devel/lua50-compat51/files/lua50c51.sh | 3 - .../lua50-compat51/files/patch-compat-5.1.c | 12 - .../ports/devel/lua50-compat51/pkg-descr | 4 - .../ports/devel/lua50-curses/Makefile | 31 - .../devel/lua50-curses/files/patch-Makefile | 11 - .../ports/devel/lua50-curses/pkg-descr | 1 - .../ports/devel/lua50-dfui/Makefile | 51 -- .../ports/devel/lua50-dfui/pkg-descr | 1 - .../ports/devel/lua50-filename/Makefile | 49 -- .../ports/devel/lua50-filename/pkg-descr | 1 - .../ports/devel/lua50-filesystem/Makefile | 32 - .../devel/lua50-filesystem/files/patch-config | 30 - .../ports/devel/lua50-filesystem/pkg-descr | 1 - .../ports/devel/lua50-gettext/Makefile | 48 -- .../ports/devel/lua50-gettext/pkg-descr | 1 - .../ports/devel/lua50-posix/Makefile | 35 - .../ports/devel/lua50-posix/distinfo | 2 - .../devel/lua50-posix/files/patch-Makefile | 41 - .../devel/lua50-posix/files/patch-lposix.c | 139 ---- .../devel/lua50-posix/files/patch-posix.lua | 16 - .../ports/devel/lua50-posix/pkg-descr | 2 - .../ports/devel/lua50-pty/Makefile | 47 -- .../ports/devel/lua50-pty/pkg-descr | 1 - .../ports/lang/lua50/Makefile | 50 -- .../ports/lang/lua50/distinfo | 2 - .../ports/lang/lua50/files/patch-Makefile | 33 - .../lang/lua50/files/patch-src__Makefile | 11 - .../lang/lua50/files/patch-src__lib__Makefile | 11 - .../lua50/files/patch-src__lib__lmathlib.c | 20 - .../lang/lua50/files/patch-src__lua__Makefile | 18 - .../lua50/files/patch-src__luac__Makefile | 18 - .../ports/lang/lua50/pkg-descr | 3 - .../ports/lang/lua50/pkg-plist | 12 - .../ports/net/lua50-socket/Makefile | 43 - .../ports/net/lua50-socket/distinfo | 2 - .../net/lua50-socket/files/patch-Makefile | 35 - .../ports/net/lua50-socket/pkg-descr | 2 - .../sysutils/dfuibe_installer/.cvsignore | 1 - .../ports/sysutils/dfuibe_installer/Makefile | 68 -- .../ports/sysutils/dfuibe_installer/pkg-descr | 2 - .../ports/sysutils/dfuibe_lua/.cvsignore | 1 - .../ports/sysutils/dfuibe_lua/Makefile | 142 ---- .../ports/sysutils/dfuibe_lua/pkg-descr | 5 - .../ports/sysutils/dfuife_cgi/.cvsignore | 1 - .../ports/sysutils/dfuife_cgi/Makefile | 57 -- .../ports/sysutils/dfuife_cgi/pkg-descr | 6 - .../ports/sysutils/dfuife_curses/.cvsignore | 1 - .../ports/sysutils/dfuife_curses/Makefile | 66 -- .../ports/sysutils/dfuife_curses/pkg-descr | 6 - .../ports/sysutils/dfuife_qt/.cvsignore | 1 - .../ports/sysutils/dfuife_qt/Makefile | 46 -- .../ports/sysutils/dfuife_qt/pkg-descr | 3 - .../ports/sysutils/libdfui/.cvsignore | 1 - .../ports/sysutils/libdfui/Makefile | 57 -- .../ports/sysutils/libdfui/pkg-descr | 6 - .../ports/sysutils/libinstaller/.cvsignore | 1 - .../ports/sysutils/libinstaller/Makefile | 62 -- .../ports/sysutils/libinstaller/pkg-descr | 2 - .../ports/www/thttpd-notimeout/Makefile | 92 --- .../ports/www/thttpd-notimeout/distinfo | 3 - .../files/extra-patch-config.h | 9 - .../ports/www/thttpd-notimeout/files/patch-ab | 11 - .../ports/www/thttpd-notimeout/files/patch-ac | 11 - .../ports/www/thttpd-notimeout/files/patch-ad | 11 - .../www/thttpd-notimeout/files/patch-config.h | 11 - .../thttpd-notimeout/files/patch-libhttpd.c | 12 - .../thttpd-notimeout/files/patch-libhttpd.h | 12 - .../www/thttpd-notimeout/files/patch-mmc.c | 89 --- .../www/thttpd-notimeout/files/patch-thttpd.c | 56 -- .../www/thttpd-notimeout/files/thttpd.sh | 18 - .../ports/www/thttpd-notimeout/pkg-descr | 24 - .../ports/www/thttpd-notimeout/pkg-message | 11 - .../ports/www/thttpd-notimeout/pkg-plist | 16 - .../root_skels/installer/boot/cdboot.flp.bz2 | Bin 15654 -> 0 bytes .../installer/boot/memtest86.flp.bz2 | Bin 28585 -> 0 bytes .../installer/etc/defaults/pfi.conf | 134 ---- .../root_skels/installer/etc/fstab | 12 - .../root_skels/installer/etc/issue | 7 - .../root_skels/installer/etc/master.passwd | 22 - .../root_skels/installer/etc/rc.d/pfi | 201 ----- .../root_skels/installer/etc/ttys | 307 ------- .../installer/usr/local/bin/installer | 159 ---- .../installer/usr/local/etc/dhcpd.conf | 25 - .../installer/usr/local/etc/thttpd.conf | 8 - .../scripts/build/.cvsignore | 1 - .../scripts/build/build.conf.defaults | 30 - .../scripts/build/build_installer_packages.sh | 71 -- .../scripts/build/copy_ports_to_portsdir.sh | 33 - .../build/create_installer_tarballs.sh | 49 -- .../build/install_installer_packages.sh | 88 --- .../scripts/build/make_installer_image.sh | 20 - .../scripts/build/pver.conf | 43 - .../build/remove_installer_packages.sh | 30 - .../scripts/report/gen_rel_notes.lua | 56 -- .../bsdinstaller-1.1.6/src/lib/lua/Makefile | 14 - .../src/lib/lua/app/Makefile | 10 - .../src/lib/lua/app/app.lua | 748 ------------------ .../src/lib/lua/dfui/Makefile | 41 - .../src/lib/lua/dfui/common.c | 208 ----- .../src/lib/lua/dfui/dfui.c | 649 --------------- .../src/lib/lua/dfui/dfui.lua | 190 ----- .../src/lib/lua/dfui/lua_dfui.h | 108 --- .../src/lib/lua/dfui/progress.c | 220 ------ .../src/lib/lua/filename/Makefile | 10 - .../src/lib/lua/filename/filename.lua | 143 ---- .../src/lib/lua/gettext/Makefile | 39 - .../src/lib/lua/gettext/gettext.lua | 15 - .../src/lib/lua/gettext/lua_gettext.c | 76 -- .../src/lib/lua/pty/Makefile | 36 - .../bsdinstaller-1.1.6/src/lib/lua/pty/pty.c | 380 --------- .../src/lib/lua/pty/pty.lua | 8 - 119 files changed, 118 insertions(+), 6095 deletions(-) delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/libaura/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/libaura/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/libaura/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-app/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-app/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/distinfo delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/files/lua50c51.sh delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/files/patch-compat-5.1.c delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/files/patch-Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-dfui/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-dfui/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-filename/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-filename/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/files/patch-config delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-gettext/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-gettext/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/distinfo delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-lposix.c delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-posix.lua delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-pty/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/devel/lua50-pty/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/distinfo delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lib__Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lib__lmathlib.c delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lua__Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__luac__Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/lang/lua50/pkg-plist delete mode 100644 contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/distinfo delete mode 100644 contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/files/patch-Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/distinfo delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/extra-patch-config.h delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ab delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ac delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ad delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-config.h delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-libhttpd.c delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-libhttpd.h delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-mmc.c delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-thttpd.c delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/thttpd.sh delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-descr delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-message delete mode 100644 contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-plist delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/boot/cdboot.flp.bz2 delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/boot/memtest86.flp.bz2 delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/etc/defaults/pfi.conf delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/etc/fstab delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/etc/issue delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/etc/master.passwd delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/etc/rc.d/pfi delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/etc/ttys delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/bin/installer delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/dhcpd.conf delete mode 100644 contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/thttpd.conf delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/.cvsignore delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/build.conf.defaults delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/build_installer_packages.sh delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/copy_ports_to_portsdir.sh delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/create_installer_tarballs.sh delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/install_installer_packages.sh delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/make_installer_image.sh delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/pver.conf delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/build/remove_installer_packages.sh delete mode 100644 contrib/bsdinstaller-1.1.6/scripts/report/gen_rel_notes.lua delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/app/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/app/app.lua delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/common.c delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/dfui.c delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/dfui.lua delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/lua_dfui.h delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/progress.c delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/filename/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/filename/filename.lua delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/gettext.lua delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/lua_gettext.c delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/pty/Makefile delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/pty/pty.c delete mode 100644 contrib/bsdinstaller-1.1.6/src/lib/lua/pty/pty.lua diff --git a/contrib/bsdinstaller-1.1.6/README.DELETED b/contrib/bsdinstaller-1.1.6/README.DELETED index f5544fc0dc..db28d38196 100644 --- a/contrib/bsdinstaller-1.1.6/README.DELETED +++ b/contrib/bsdinstaller-1.1.6/README.DELETED @@ -1,3 +1,104 @@ +ports/devel/libaura/.cvsignore +ports/devel/libaura/Makefile +ports/devel/libaura/pkg-descr +ports/devel/lua50-app/Makefile +ports/devel/lua50-app/pkg-descr +ports/devel/lua50-compat51/distinfo +ports/devel/lua50-compat51/files/lua50c51.sh +ports/devel/lua50-compat51/files/patch-compat-5.1.c +ports/devel/lua50-compat51/Makefile +ports/devel/lua50-compat51/pkg-descr +ports/devel/lua50-curses/files/patch-Makefile +ports/devel/lua50-curses/Makefile +ports/devel/lua50-curses/pkg-descr +ports/devel/lua50-dfui/Makefile +ports/devel/lua50-dfui/pkg-descr +ports/devel/lua50-filename/Makefile +ports/devel/lua50-filename/pkg-descr +ports/devel/lua50-filesystem/files/patch-config +ports/devel/lua50-filesystem/Makefile +ports/devel/lua50-filesystem/pkg-descr +ports/devel/lua50-gettext/Makefile +ports/devel/lua50-gettext/pkg-descr +ports/devel/lua50-posix/distinfo +ports/devel/lua50-posix/files/patch-lposix.c +ports/devel/lua50-posix/files/patch-Makefile +ports/devel/lua50-posix/files/patch-posix.lua +ports/devel/lua50-posix/Makefile +ports/devel/lua50-posix/pkg-descr +ports/devel/lua50-pty/Makefile +ports/devel/lua50-pty/pkg-descr +ports/lang/lua50/distinfo +ports/lang/lua50/files/patch-Makefile +ports/lang/lua50/files/patch-src__lib__lmathlib.c +ports/lang/lua50/files/patch-src__lib__Makefile +ports/lang/lua50/files/patch-src__luac__Makefile +ports/lang/lua50/files/patch-src__lua__Makefile +ports/lang/lua50/files/patch-src__Makefile +ports/lang/lua50/Makefile +ports/lang/lua50/pkg-descr +ports/lang/lua50/pkg-plist +ports/net/lua50-socket/distinfo +ports/net/lua50-socket/files/patch-Makefile +ports/net/lua50-socket/Makefile +ports/net/lua50-socket/pkg-descr +ports/sysutils/dfuibe_installer/.cvsignore +ports/sysutils/dfuibe_installer/Makefile +ports/sysutils/dfuibe_installer/pkg-descr +ports/sysutils/dfuibe_lua/.cvsignore +ports/sysutils/dfuibe_lua/Makefile +ports/sysutils/dfuibe_lua/pkg-descr +ports/sysutils/dfuife_cgi/.cvsignore +ports/sysutils/dfuife_cgi/Makefile +ports/sysutils/dfuife_cgi/pkg-descr +ports/sysutils/dfuife_curses/.cvsignore +ports/sysutils/dfuife_curses/Makefile +ports/sysutils/dfuife_curses/pkg-descr +ports/sysutils/dfuife_qt/.cvsignore +ports/sysutils/dfuife_qt/Makefile +ports/sysutils/dfuife_qt/pkg-descr +ports/sysutils/libdfui/.cvsignore +ports/sysutils/libdfui/Makefile +ports/sysutils/libdfui/pkg-descr +ports/sysutils/libinstaller/.cvsignore +ports/sysutils/libinstaller/Makefile +ports/sysutils/libinstaller/pkg-descr +ports/www/thttpd-notimeout/distinfo +ports/www/thttpd-notimeout/files/extra-patch-config.h +ports/www/thttpd-notimeout/files/patch-ab +ports/www/thttpd-notimeout/files/patch-ac +ports/www/thttpd-notimeout/files/patch-ad +ports/www/thttpd-notimeout/files/patch-config.h +ports/www/thttpd-notimeout/files/patch-libhttpd.c +ports/www/thttpd-notimeout/files/patch-libhttpd.h +ports/www/thttpd-notimeout/files/patch-mmc.c +ports/www/thttpd-notimeout/files/patch-thttpd.c +ports/www/thttpd-notimeout/files/thttpd.sh +ports/www/thttpd-notimeout/Makefile +ports/www/thttpd-notimeout/pkg-descr +ports/www/thttpd-notimeout/pkg-message +ports/www/thttpd-notimeout/pkg-plist +root_skels/installer/boot/cdboot.flp.bz2 +root_skels/installer/boot/memtest86.flp.bz2 +root_skels/installer/etc/defaults/pfi.conf +root_skels/installer/etc/fstab +root_skels/installer/etc/issue +root_skels/installer/etc/master.passwd +root_skels/installer/etc/rc.d/pfi +root_skels/installer/etc/ttys +root_skels/installer/usr/local/bin/installer +root_skels/installer/usr/local/etc/dhcpd.conf +root_skels/installer/usr/local/etc/thttpd.conf +scripts/build/build.conf.defaults +scripts/build/build_installer_packages.sh +scripts/build/copy_ports_to_portsdir.sh +scripts/build/create_installer_tarballs.sh +scripts/build/.cvsignore +scripts/build/install_installer_packages.sh +scripts/build/make_installer_image.sh +scripts/build/pver.conf +scripts/build/remove_installer_packages.sh +scripts/report/gen_rel_notes.lua src/backend/lua/200_install.lua src/backend/lua/400_configure.lua src/backend/lua/600_upgrade.lua @@ -105,3 +206,20 @@ src/backend/lua/upgrade/400_mount_target_system.lua src/backend/lua/upgrade/500_perform_upgrade.lua src/backend/lua/upgrade/600_unmount_target_system.lua src/backend/lua/upgrade/main.lua +src/lib/lua/app/app.lua +src/lib/lua/app/Makefile +src/lib/lua/dfui/common.c +src/lib/lua/dfui/dfui.c +src/lib/lua/dfui/dfui.lua +src/lib/lua/dfui/lua_dfui.h +src/lib/lua/dfui/Makefile +src/lib/lua/dfui/progress.c +src/lib/lua/filename/filename.lua +src/lib/lua/filename/Makefile +src/lib/lua/gettext/gettext.lua +src/lib/lua/gettext/lua_gettext.c +src/lib/lua/gettext/Makefile +src/lib/lua/Makefile +src/lib/lua/pty/Makefile +src/lib/lua/pty/pty.c +src/lib/lua/pty/pty.lua diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/libaura/.cvsignore b/contrib/bsdinstaller-1.1.6/ports/devel/libaura/.cvsignore deleted file mode 100644 index 8e15c86648..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/libaura/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -distinfo diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/libaura/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/libaura/Makefile deleted file mode 100644 index f6a2847f23..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/libaura/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# New ports collection makefile for: libaura -# Date created: July 21, 2004 -# Whom: Chris Pressey - -PORTNAME= libaura -PORTVERSION= 3.1 -INTERNAL= YES -CATEGORIES= sysutils -DISTNAME= ${PORTNAME}-${PORTVERSION} -WRKSRC= work/${PORTNAME} - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= Library of Assorted Useful Reusable Abstractions - -PLIST_FILES= lib/libaura.a \ - lib/libaura.so \ - lib/libaura.so.3 \ - include/aura/buffer.h \ - include/aura/dict.h \ - include/aura/fspred.h \ - include/aura/popen.h \ - include/aura/mem.h - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${MKDIR} -p ${LOCALBASE}/include/aura - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/libaura.a ${LOCALBASE}/lib/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/libaura.so.3 ${LOCALBASE}/lib/ - ${LN} -sf ${LOCALBASE}/lib/libaura.so.3 ${LOCALBASE}/lib/libaura.so - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/buffer.h ${LOCALBASE}/include/aura/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/dict.h ${LOCALBASE}/include/aura/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/popen.h ${LOCALBASE}/include/aura/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/fspred.h ${LOCALBASE}/include/aura/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/mem.h ${LOCALBASE}/include/aura/ - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/libaura/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/libaura/pkg-descr deleted file mode 100644 index c3bba1f703..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/libaura/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Libaura is a library of Assorted Useful Reusable Abstractions - -data structures and utilities for C language programming. At -present, they include: - -- memory allocators/deallocators -- key<->value dictionaries (hashed or sorted) -- extensible buffers -- filesystem predicates (is_dir, is_named_pipe, etc) -- popen() variation which allows the caller to know the pid of - the process on the other end of the pipe. diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-app/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-app/Makefile deleted file mode 100644 index ad93dfcf4c..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-app/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# New ports collection makefile for: lua50-app -# Date created: 23 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-app -PORTVERSION= 0.1 -INTERNAL= YES -CATEGORIES= devel -DISTNAME= luaapp-${PORTVERSION} -WRKSRC= work/app - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 \ - ${LOCALBASE}/share/lua/5.0/posix.lua:${PORTSDIR}/devel/lua50-posix \ - ${LOCALBASE}/share/lua/5.0/filename.lua:${PORTSDIR}/devel/lua50-filename - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= App framework for Lua 5.0.x - -PLIST_FILES= share/lua/5.0/app.lua - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-build: - @${ECHO} "No building required." - -do-install: - ${CP} ${WRKSRC}/app.lua ${LOCALBASE}/share/lua/5.0/app.lua - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-app/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-app/pkg-descr deleted file mode 100644 index 49c7a36346..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-app/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -App framework for Lua, inspired by several sources, primarily the -Erlang app module. - diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/Makefile deleted file mode 100644 index 60b1b1a18b..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# New ports collection makefile for: lua50-compat51 -# Date created: 10 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-compat51 -PORTVERSION= 5.1.r2 -CATEGORIES= devel -DISTNAME= compat-5.1r2 -MASTER_SITES= http://luaforge.net/frs/download.php/402/ - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= Lua 5.1 package compatibility layer for Lua 5.0.x - -PLIST_FILES= share/lua/5.0/compat-5.1.lua \ - lib/lua/${DISTNAME}/compat-5.1.c \ - lib/lua/${DISTNAME}/compat-5.1.h \ - bin/lua50c51 - -do-build: - @echo "Nothing to build." - -do-install: - ${MKDIR} -p ${PREFIX}/lib/lua/5.0 - ${MKDIR} -p ${PREFIX}/lib/lua/${DISTNAME} - ${MKDIR} -p ${PREFIX}/share/lua/5.0 - ${INSTALL_DATA} ${WRKSRC}/compat-5.1.lua ${PREFIX}/share/lua/5.0 - ${INSTALL_DATA} ${WRKSRC}/compat-5.1.c ${PREFIX}/lib/lua/${DISTNAME} - ${INSTALL_DATA} ${WRKSRC}/compat-5.1.h ${PREFIX}/lib/lua/${DISTNAME} - ${INSTALL_SCRIPT} ${FILESDIR}/lua50c51.sh ${PREFIX}/bin/lua50c51 - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/distinfo b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/distinfo deleted file mode 100644 index 42d562ba04..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (compat-5.1r2.tar.gz) = 751de141b3f6faa0b9706b757c8bc7a1 -SIZE (compat-5.1r2.tar.gz) = 2039 diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/files/lua50c51.sh b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/files/lua50c51.sh deleted file mode 100644 index a54664ddcc..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/files/lua50c51.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/local/bin/lua50 -l/usr/local/share/lua/5.0/compat-5.1.lua $* diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/files/patch-compat-5.1.c b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/files/patch-compat-5.1.c deleted file mode 100644 index a404ef0dfc..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/files/patch-compat-5.1.c +++ /dev/null @@ -1,12 +0,0 @@ ---- compat-5.1.c.orig Mon Apr 4 17:35:33 2005 -+++ compat-5.1.c Mon Apr 4 17:35:51 2005 -@@ -1,7 +1,7 @@ - #include - #include --#include "lua.h" --#include "lauxlib.h" -+#include "lua50/lua.h" -+#include "lua50/lauxlib.h" - #include "compat-5.1.h" - - static void getfield(lua_State *L, const char *name) { diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/pkg-descr deleted file mode 100644 index 46e4e06d61..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-compat51/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This is a Lua 5.1.x compatibility shim for Lua 5.0.x. It also -includes a wrapper script, lua5, which sets the LUA_PATH and -loads the compatibility layer automatically. - diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/Makefile deleted file mode 100644 index 6f255a6274..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: lua50-curses -# Date created: 10 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-curses -PORTVERSION= 0.1a -CATEGORIES= devel -DISTNAME= lcurses-0.1-devel -MASTER_SITES= http://mega.ist.utl.pt/~tngd/lua/ - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= Curses binding for Lua 5.0.x - -PLIST_FILES= lib/lua/5.0/lcurses.so - -do-install: - ${INSTALL_DATA} ${WRKSRC}/lcurses.so ${PREFIX}/lib/lua/5.0 - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/files/patch-Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/files/patch-Makefile deleted file mode 100644 index c47d650d2b..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2005-02-20 13:10:18.000000000 -0800 -+++ Makefile 2005-02-20 13:11:13.000000000 -0800 -@@ -5,7 +5,7 @@ - TMP=/tmp - - # change these to reflect your Lua installation --LUA=../lua-5.0.2 -+LUA=/usr/local - LUAINC= $(LUA)/include - LUALIB= $(LUA)/lib - LUABIN= $(LUA)/bin diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/pkg-descr deleted file mode 100644 index 0548258e0e..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-curses/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Curses bindings for Lua. diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-dfui/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-dfui/Makefile deleted file mode 100644 index 6a5cd03ffb..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-dfui/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# New ports collection makefile for: lua50-dfui -# Date created: 21 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-dfui -PORTVERSION= 0.1 -INTERNAL= YES -CATEGORIES= devel -DISTNAME= luadfui-${PORTVERSION} -WRKSRC= work/dfui - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 \ - aura.3:${PORTSDIR}/devel/libaura \ - dfui.4:${PORTSDIR}/sysutils/libdfui - -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 \ - ${LOCALBASE}/lib/lua/5.0/lposix.so:${PORTSDIR}/devel/lua50-posix - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= DFUI binding for Lua 5.0.x - -PLIST_FILES= lib/lua/5.0/ldfui.so \ - share/lua/5.0/dfui.lua - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/ldfui.so ${LOCALBASE}/lib/lua/5.0/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/dfui.lua ${LOCALBASE}/share/lua/5.0/ - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-dfui/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-dfui/pkg-descr deleted file mode 100644 index 1b6a25d460..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-dfui/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Lua bindings for DFUI. diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filename/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filename/Makefile deleted file mode 100644 index a62c2e5637..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filename/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: lua50-filename -# Date created: 28 Mar 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-filename -PORTVERSION= 0.1 -INTERNAL= YES -CATEGORIES= devel -DISTNAME= luafilename-${PORTVERSION} -WRKSRC= work/filename - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 \ - ${LOCALBASE}/share/lua/5.0/posix.lua:${PORTSDIR}/devel/lua50-posix - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= Filename-manipulating functions for Lua 5.0.x - -PLIST_FILES= share/lua/5.0/filename.lua - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-build: - @${ECHO} "No building required." - -do-install: - ${CP} ${WRKSRC}/filename.lua ${LOCALBASE}/share/lua/5.0/filename.lua - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filename/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filename/pkg-descr deleted file mode 100644 index 24096e2221..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filename/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Package of filename-manipulating functions for Lua. \ No newline at end of file diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/Makefile deleted file mode 100644 index e9ec7e47f1..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# New ports collection makefile for: lua50-filesystem -# Date created: 10 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-filesystem -PORTVERSION= 1.0 -CATEGORIES= devel -DISTNAME= luafilesystem-${PORTVERSION} -MASTER_SITES= http://luaforge.net/frs/download.php/430/ - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= Portable File System routines for Lua 5.0.x - -PLIST_FILES= lib/lua/5.0/liblfs.1.0.so \ - lib/lua/5.0/lfs.so - -ALL_TARGET= lib - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/files/patch-config b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/files/patch-config deleted file mode 100644 index 1590fffba8..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/files/patch-config +++ /dev/null @@ -1,30 +0,0 @@ ---- config.orig 2005-01-19 09:20:04.000000000 -0800 -+++ config 2005-02-20 11:18:02.000000000 -0800 -@@ -7,19 +7,19 @@ - LUA_INC= /usr/local/include/lua5 - - # OS dependent --LIB_EXT= .dylib --#LIB_EXT= .so --LIB_OPTION= -dynamiclib #for MacOS X --#LIB_OPTION= -shared #for Linux -+#LIB_EXT= .dylib -+LIB_EXT= .so -+#LIB_OPTION= -dynamiclib #for MacOS X -+LIB_OPTION= -shared #for Linux - --COMPAT_DIR= . -+COMPAT_DIR= /usr/local/share/lua/compat-5.1r2 - - # Compilation directives - # On FreeBSD systems, the following line should be commented --DLLIB= -ldl -+#DLLIB= -ldl - WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings --INCS= -I$(LUA_INC) -I$(COMPAT_DIR) --LIBS= -L$(LUA_LIBDIR) -llua -llualib -lm $(DLLIB) -+INCS= -I$(LUA_INC) -I$(COMPAT_DIR) -I/usr/local/include -+LIBS= -L$(LUA_LIBDIR) -L/usr/local/lib -llua -llualib -lm $(DLLIB) - CFLAGS= $(WARN) $(INCS) - CC= gcc - diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/pkg-descr deleted file mode 100644 index c2d132b7bc..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-filesystem/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Portable file system manipulation routines for Lua. diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-gettext/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-gettext/Makefile deleted file mode 100644 index c0ae7ed405..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-gettext/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# New ports collection makefile for: lua50-gettext -# Date created: 23 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-gettext -PORTVERSION= 0.1 -INTERNAL= YES -CATEGORIES= devel -DISTNAME= luagettext-${PORTVERSION} -WRKSRC= work/gettext - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 \ - intl.6:${PORTSDIR}/devel/gettext -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= Gettext binding for Lua 5.0.x - -PLIST_FILES= lib/lua/5.0/lgettext.so \ - share/lua/5.0/gettext.lua - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/lgettext.so ${LOCALBASE}/lib/lua/5.0/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/gettext.lua ${LOCALBASE}/share/lua/5.0/ - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-gettext/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-gettext/pkg-descr deleted file mode 100644 index 68e55f9045..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-gettext/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Lua bindings for Gettext. diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/Makefile deleted file mode 100644 index ade36091d8..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: lua50-posix -# Date created: 10 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-posix -PORTVERSION= 2005.0327 -CATEGORIES= devel -DISTNAME= lposix -WRKSRC= work/posix -MASTER_SITES= http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/ - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= POSIX bindings for Lua 5.0.x - -PLIST_FILES= lib/lua/5.0/lposix.so \ - share/lua/5.0/posix.lua - -do-install: - ${INSTALL_DATA} ${WRKSRC}/lposix.so ${PREFIX}/lib/lua/5.0/ - ${INSTALL_DATA} ${WRKSRC}/posix.lua ${PREFIX}/share/lua/5.0/ - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/distinfo b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/distinfo deleted file mode 100644 index 0348f78a18..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (lposix.tar.gz) = f22871247e444412a901d179028a0d82 -SIZE (lposix.tar.gz) = 9651 diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-Makefile deleted file mode 100644 index 758f8b1ff1..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-Makefile +++ /dev/null @@ -1,41 +0,0 @@ ---- Makefile.orig 2003-11-05 16:26:49.000000000 -0800 -+++ Makefile 2005-04-03 14:22:32.000000000 -0700 -@@ -1,30 +1,33 @@ - # makefile for POSIX library for Lua - - # change these to reflect your Lua installation --LUA= /tmp/lhf/lua-5.0 -+LUA= /usr/local - LUAINC= $(LUA)/include - LUALIB= $(LUA)/lib - LUABIN= $(LUA)/bin - - # no need to change anything below here - CFLAGS= -fPIC $(INCS) $(WARN) -O2 $G --WARN= -pedantic -Wall -+WARN= -Wall - INCS= -I$(LUAINC) - - MYNAME= posix - MYLIB= l$(MYNAME) - --OBJS= $(MYLIB).o -+OBJS= $(MYLIB).o compat-5.1.o - - T= $(MYLIB).so - --all: test -+all: $T - - test: $T - $(LUABIN)/lua -l$(MYNAME) test.lua - - $T: $(OBJS) -- $(CC) -o $@ -shared $(OBJS) -+ $(CC) -o $@ -shared $(OBJS) -L$(LUALIB) -llua50 -llualib50 -+ -+compat-5.1.c: $(LUALIB)/lua/compat-5.1r2/compat-5.1.c -+ cp $(LUALIB)/lua/compat-5.1r2/compat-5.1.? . - - $(OBJS): modemuncher.c - diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-lposix.c b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-lposix.c deleted file mode 100644 index 873bfe4718..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-lposix.c +++ /dev/null @@ -1,139 +0,0 @@ ---- lposix.c.orig Thu Nov 6 03:23:48 2003 -+++ lposix.c Mon Apr 4 17:30:55 2005 -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -24,10 +25,10 @@ - #include - - #define MYNAME "posix" --#define MYVERSION MYNAME " library for " LUA_VERSION " / Nov 2003" -+#define MYVERSION "2005.0327" - --#include "lua.h" --#include "lauxlib.h" -+#include "lua50/lua.h" -+#include "lua50/lauxlib.h" - - #ifndef MYBUFSIZ - #define MYBUFSIZ 512 -@@ -112,6 +113,20 @@ - return pusherror(L, info); - } - -+/* -+ * This function is adapted from liolib.c: push a FILE * onto the -+ * Lua stack as a file object that Lua's file module understands. -+ */ -+static void pushfileptr(lua_State *L, FILE *f) -+{ -+ FILE **pf; -+ -+ pf = (FILE **)lua_newuserdata(L, sizeof(FILE *)); -+ *pf = f; -+ luaL_getmetatable(L, "FILE*"); -+ lua_setmetatable(L, -2); -+} -+ - static void badoption(lua_State *L, int i, const char *what, int option) - { - luaL_argerror(L, 2, -@@ -312,6 +327,33 @@ - } - - -+static int Pmkstemp(lua_State *L) /** mkstemp(template) */ -+{ -+ char *tpl; -+ int fd; -+ FILE *f; -+ -+ if ((tpl = strdup(luaL_checkstring(L, 1))) == NULL) { -+ lua_pushnil(L); -+ lua_pushnumber(L, ENOMEM); -+ return(2); -+ } -+ fd = mkstemp(tpl); -+ f = fdopen(fd, "w+"); -+ if (f == NULL) { -+ lua_pushnil(L); -+ lua_pushnumber(L, errno); -+ free(tpl); -+ return(1); -+ } -+ -+ pushfileptr(L, f); -+ lua_pushstring(L, tpl); -+ free(tpl); -+ return(2); -+} -+ -+ - static int Pexec(lua_State *L) /** exec(path,[args]) */ - { - const char *path = luaL_checkstring(L, 1); -@@ -355,6 +397,40 @@ - } - - -+static int Pnanosleep(lua_State *L) /** nanosleep(secs,[nanosecs]) */ -+{ -+ double sec, nsec; -+ struct timespec ts; -+ -+ sec = lua_tonumber(L, 1); -+ nsec = lua_tonumber(L, 2); -+ -+ /* -+ * Any fractional part of the seconds value should -+ * slide over into the nanoseconds value. -+ */ -+ nsec += (sec - floor(sec)) * 1000000000.0; -+ -+ /* -+ * Don't allow overflow. -+ */ -+ if (sec > 1000000000.0) { -+ sec = 1000000000.0; -+ } -+ while (nsec > 1000000000.0) { -+ nsec -= 1000000000.0; -+ sec += 1.0; -+ } -+ -+ ts.tv_sec = sec; -+ ts.tv_nsec = nsec; -+ -+ lua_pushnumber(L, nanosleep(&ts, NULL)); -+ -+ return 1; -+} -+ -+ - static int Pputenv(lua_State *L) /** putenv(string) */ - { - size_t l; -@@ -777,6 +853,8 @@ - {"link", Plink}, - {"mkdir", Pmkdir}, - {"mkfifo", Pmkfifo}, -+ {"mkstemp", Pmkstemp}, -+ {"nanosleep", Pnanosleep}, - {"pathconf", Ppathconf}, - {"putenv", Pputenv}, - {"readlink", Preadlink}, -@@ -809,4 +887,9 @@ - lua_pushliteral(L,MYVERSION); - lua_settable(L,-3); - return 1; -+} -+ -+LUALIB_API int luaopen_lposix (lua_State *L) -+{ -+ return luaopen_posix(L); - } diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-posix.lua b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-posix.lua deleted file mode 100644 index 812965ad35..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/files/patch-posix.lua +++ /dev/null @@ -1,16 +0,0 @@ ---- posix.lua.orig 2003-06-18 05:47:44.000000000 -0700 -+++ posix.lua 2005-03-28 20:13:37.000000000 -0800 -@@ -2,9 +2,8 @@ - -- support code for posix library - -- usage lua -lposix ... - --local function so(x) -- local SOPATH= os.getenv"LUA_SOPATH" or "./" -- assert(loadlib(SOPATH.."l"..x..".so","luaopen_"..x))() --end -+module("posix") - --so"posix" -+require "lposix" -+ -+return posix diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/pkg-descr deleted file mode 100644 index 1a7b93a6b1..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-posix/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -These are POSIX bindings for lua 5.0.x. - diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-pty/Makefile b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-pty/Makefile deleted file mode 100644 index c28d701c55..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-pty/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: lua50-pty -# Date created: 3 Apr 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-pty -PORTVERSION= 0.1 -INTERNAL= YES -CATEGORIES= devel -DISTNAME= luapty-${PORTVERSION} -WRKSRC= work/pty - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= Pty (pseudo-terminal) bindings for Lua 5.0.x - -PLIST_FILES= lib/lua/5.0/lpty.so \ - share/lua/5.0/pty.lua - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${INSTALL_DATA} ${WRKSRC}/lpty.so ${PREFIX}/lib/lua/5.0 - ${INSTALL_DATA} ${WRKSRC}/pty.lua ${PREFIX}/share/lua/5.0 - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-pty/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/devel/lua50-pty/pkg-descr deleted file mode 100644 index a358d87ce9..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/devel/lua50-pty/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Lua 5.0.x bindings Pty's (pseudo-terminals.) diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/Makefile b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/Makefile deleted file mode 100644 index 8a876e8657..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# New ports collection makefile for: lua50 -# Date created: 16 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50 -PORTVERSION= 5.0.2 -CATEGORIES= lang -DISTNAME= lua-${PORTVERSION} -MASTER_SITES= http://www.lua.org/ftp/ \ - ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \ - ftp://csg.uwaterloo.ca/pub/lhf/lua/ \ - ftp://ftp.ntua.gr/pub/lang/lua/ \ - ftp://ftp.uni-trier.de/pub/languages/lua/ \ - ftp://ftp.gwdg.de/pub/languages/lua/ - -COMMENT= Maintenance (5.0.x) version of Lua - -USE_REINPLACE= yes -ALL_TARGET= all so -INSTALL_TARGET= install soinstall -INSTALLS_SHLIB= YES - -do-configure: - ${REINPLACE_CMD} \ - -e 's|^\(MYCFLAGS=\).*$$|\1 ${CFLAGS}|' \ - -e 's|^\(LOADLIB=\).*$$|\1 -DUSE_DLOPEN=1|' \ - -e 's|^\(CC=\).*$$|\1 ${CC}|' \ - -e 's|^\(STRIP=\).*$$|\1 ${STRIP_CMD}|' \ - -e 's|^\(INSTALL_ROOT=\).*$$|\1 ${PREFIX}|' \ - -e 's|^\(INSTALL_EXEC=\).*$$|\1 ${INSTALL_PROGRAM}|' \ - -e 's|^\(INSTALL_DATA=\).*$$|\1 ${INSTALL_DATA}|' \ - -e 's|^\(INSTALL_INC=\).*$$|\1 ${PREFIX}/include/lua50|' \ - -e 's|^#\(USERCONF.*READLINE.*\)$$|\1|' \ - -e 's|^\(EXTRA_LIBS=\).*$$|\1 -lm -lreadline -lhistory -lncurses|' \ - -e 's|V=5.0|V=5|' \ - ${WRKSRC}/config - -.if ${MACHINE_ARCH:L} == "amd64" -CFLAGS+= -fPIC -.endif - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/distinfo b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/distinfo deleted file mode 100644 index 77a8b267f1..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (lua-5.0.2.tar.gz) = dea74646b7e5c621fef7174df83c34b1 -SIZE (lua-5.0.2.tar.gz) = 190442 diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-Makefile b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-Makefile deleted file mode 100644 index 8ddbe4a3d9..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-Makefile +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.orig 2004-03-11 17:50:55.000000000 -0800 -+++ Makefile 2005-02-16 19:56:33.000000000 -0800 -@@ -30,17 +30,16 @@ - - # official installation - install: all strip -- mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) -+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) - $(INSTALL_EXEC) bin/* $(INSTALL_BIN) - $(INSTALL_DATA) include/*.h $(INSTALL_INC) - $(INSTALL_DATA) lib/*.a $(INSTALL_LIB) -- $(INSTALL_DATA) doc/*.1 $(INSTALL_MAN) - - # shared libraries (for Linux) - so: -- ld -o lib/liblua.so.$V -shared src/*.o -- ld -o lib/liblualib.so.$V -shared src/lib/*.o -- cd lib; ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so -+ ld -o lib/liblua50.so.$V -shared src/*.o -+ ld -o lib/liblualib50.so.$V -shared src/lib/*.o -+ cd lib; ln -fs liblua50.so.$V liblua50.so; ln -fs liblualib50.so.$V liblualib50.so - - # binaries using shared libraries - sobin: -@@ -51,7 +50,7 @@ - # install shared libraries - soinstall: - $(INSTALL_EXEC) lib/*.so.* $(INSTALL_LIB) -- cd $(INSTALL_LIB); ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so -+ cd $(INSTALL_LIB); ln -fs liblua50.so.$V liblua50.so; ln -fs liblualib50.so.$V liblualib50.so - - # clean shared libraries - soclean: diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__Makefile b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__Makefile deleted file mode 100644 index 13950f54b2..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.orig 2005-02-16 19:56:55.000000000 -0800 -+++ src/Makefile 2005-02-16 19:57:06.000000000 -0800 -@@ -67,7 +67,7 @@ - lvm.h \ - lzio.h - --T= $(LIB)/liblua.a -+T= $(LIB)/liblua50.a - - all: $T - diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lib__Makefile b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lib__Makefile deleted file mode 100644 index fef1213d7d..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lib__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/Makefile.orig 2005-02-16 20:00:23.000000000 -0800 -+++ src/lib/Makefile 2005-02-16 20:00:33.000000000 -0800 -@@ -9,7 +9,7 @@ - OBJS= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o lstrlib.o loadlib.o - SRCS= lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c ltablib.c lstrlib.c loadlib.c - --T= $(LIB)/liblualib.a -+T= $(LIB)/liblualib50.a - - all: $T - diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lib__lmathlib.c b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lib__lmathlib.c deleted file mode 100644 index 5a24cd697f..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lib__lmathlib.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/lib/lmathlib.c.orig Tue Mar 11 21:30:37 2003 -+++ src/lib/lmathlib.c Fri May 9 02:32:59 2003 -@@ -170,7 +170,7 @@ - static int math_random (lua_State *L) { - /* the `%' avoids the (rare) case of r==1, and is needed also because on - some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */ -- lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX; -+ lua_Number r = (lua_Number)(random()%RAND_MAX) / (lua_Number)RAND_MAX; - switch (lua_gettop(L)) { /* check number of arguments */ - case 0: { /* no arguments */ - lua_pushnumber(L, r); /* Number between 0 and 1 */ -@@ -196,7 +196,7 @@ - - - static int math_randomseed (lua_State *L) { -- srand(luaL_checkint(L, 1)); -+ srandom(luaL_checkint(L, 1)); - return 0; - } - diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lua__Makefile b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lua__Makefile deleted file mode 100644 index f3d87f82c2..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__lua__Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- src/lua/Makefile.orig 2003-04-08 19:07:23.000000000 -0700 -+++ src/lua/Makefile 2005-02-16 19:59:19.000000000 -0800 -@@ -8,12 +8,12 @@ - OBJS= lua.o - SRCS= lua.c - --T= $(BIN)/lua -+T= $(BIN)/lua50 - - all: $T - --$T: $(OBJS) $(LIB)/liblua.a $(LIB)/liblualib.a -- $(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB) -+$T: $(OBJS) $(LIB)/liblua50.a $(LIB)/liblualib50.a -+ $(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua50 -llualib50 $(EXTRA_LIBS) $(DLLIB) - - $(LIB)/liblua.a: - cd ..; $(MAKE) diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__luac__Makefile b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__luac__Makefile deleted file mode 100644 index f7bf2fff19..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/files/patch-src__luac__Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- src/luac/Makefile.orig 2003-10-21 04:54:08.000000000 -0700 -+++ src/luac/Makefile 2005-02-16 19:59:00.000000000 -0800 -@@ -8,12 +8,12 @@ - OBJS= luac.o print.o lopcodes.o - SRCS= luac.c print.c - --T= $(BIN)/luac -+T= $(BIN)/luac50 - - all: $T - --$T: $(OBJS) $(LIB)/liblua.a $(LIB)/liblualib.a -- $(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB) -+$T: $(OBJS) $(LIB)/liblua50.a $(LIB)/liblualib50.a -+ $(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua50 -llualib50 $(EXTRA_LIBS) $(DLLIB) - - # print.c needs opcode names from lopcodes.c - lopcodes.o: ../lopcodes.c ../lopcodes.h diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/pkg-descr deleted file mode 100644 index 7c3ffd861d..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a maintenance version of Lua, 5.0.x. - -WWW: http://www.lua.org/ diff --git a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/pkg-plist b/contrib/bsdinstaller-1.1.6/ports/lang/lua50/pkg-plist deleted file mode 100644 index ac038ae7ad..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/lang/lua50/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -bin/lua50 -bin/luac50 -include/lua50/lauxlib.h -include/lua50/lua.h -include/lua50/lualib.h -lib/liblua50.a -lib/liblua50.so -lib/liblua50.so.5 -lib/liblualib50.a -lib/liblualib50.so -lib/liblualib50.so.5 - diff --git a/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/Makefile b/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/Makefile deleted file mode 100644 index cfb7dd1204..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: lua50-socket -# Date created: 15 Feb 2005 -# Whom: Chris Pressey - -PORTNAME= lua50-socket -PORTVERSION= 2.0.b3 -CATEGORIES= net -DISTNAME= luasocket-2.0-beta3 -MASTER_SITES= http://www.cs.princeton.edu/~diego/professional/luasocket/ - -COMMENT= Socket binding for Lua 5.0.x (+5.1-compat) - -BUILD_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 -RUN_DEPENDS= ${LOCALBASE}/bin/lua50c51:${PORTSDIR}/devel/lua50-compat51 - -PLIST_FILES= lib/lua/5.0/lsocket.so \ - lib/lua/5.0/lmime.so \ - share/lua/5.0/ftp.lua \ - share/lua/5.0/http.lua \ - share/lua/5.0/ltn12.lua \ - share/lua/5.0/mime.lua \ - share/lua/5.0/smtp.lua \ - share/lua/5.0/socket.lua \ - share/lua/5.0/tp.lua \ - share/lua/5.0/url.lua - -USE_GMAKE= YES -MAKEFILE= makefile.Linux - -do-install: - ${INSTALL_DATA} ${WRKSRC}/lsocket.so ${PREFIX}/lib/lua/5.0/ - ${INSTALL_DATA} ${WRKSRC}/lmime.so ${PREFIX}/lib/lua/5.0/ - ${INSTALL_DATA} ${WRKSRC}/lua/*.lua ${PREFIX}/share/lua/5.0/ - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/distinfo b/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/distinfo deleted file mode 100644 index e00c8fbf14..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (luasocket-2.0-beta3.tar.gz) = ba32118746205cb088ce7fed06d8d1b7 -SIZE (luasocket-2.0-beta3.tar.gz) = 115472 diff --git a/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/files/patch-Makefile b/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/files/patch-Makefile deleted file mode 100644 index d00591c687..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/files/patch-Makefile +++ /dev/null @@ -1,35 +0,0 @@ ---- makefile.Linux.orig 2005-01-15 14:52:38.000000000 -0800 -+++ makefile.Linux 2005-04-08 22:07:50.000000000 -0700 -@@ -3,7 +3,7 @@ - - COMPAT=compat-5.1r2 - --LUAC=luac -+LUAC=lua50c - BIN2C=bin2c - CC=gcc - OPT=-O2 $(INC) -@@ -28,7 +28,9 @@ - mime.o \ - $(COMPAT)/compat-5.1.o - --CFLAGS=-I../../include -I$(COMPAT) $(PROF) $(OPT) $(DBG) $(DEF) -pedantic -W -Wall -+CFLAGS=-I../../include -I$(COMPAT) -I/usr/local/include/lua50 \ -+ $(PROF) $(OPT) $(DBG) $(DEF) -pedantic -W -Wall -+LDFLAGS=-L/usr/local/lib -llua50 -llualib50 - - LDYN=lsocket.so - -@@ -37,10 +39,10 @@ - all: $(LDYN) $(MDYN) - - $(LDYN): $(LOBJS) -- gcc -shared -o $(LDYN) $(LOBJS) -+ gcc -shared -o $(LDYN) $(LOBJS) $(LDFLAGS) - - $(MDYN): $(MOBJS) -- gcc -shared -o $(MDYN) $(MOBJS) -+ gcc -shared -o $(MDYN) $(MOBJS) $(LDFLAGS) - - auxiliar.o: auxiliar.c auxiliar.h - buffer.o: buffer.c buffer.h io.h timeout.h diff --git a/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/pkg-descr deleted file mode 100644 index 65708e149e..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/net/lua50-socket/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Luasocket is a socket binding for Lua 5. - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/.cvsignore b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/.cvsignore deleted file mode 100644 index 8e15c86648..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -distinfo diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/Makefile b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/Makefile deleted file mode 100644 index c6ad07c178..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# New ports collection makefile for: dfuibe_installer -# Date created: May 13, 2004 -# Whom: Chris Pressey - -PORTNAME= dfuibe_installer -PORTVERSION= 1.1.6 -INTERNAL= YES -CATEGORIES= sysutils -DISTNAME= ${PORTNAME}-${PORTVERSION} -WRKSRC= work/installer - -LIB_DEPENDS= aura.3:${PORTSDIR}/devel/libaura \ - dfui.4:${PORTSDIR}/sysutils/libdfui \ - installer.5:${PORTSDIR}/sysutils/libinstaller -.if defined(WITH_NLS) -LIB_DEPENDS:= ${LIB_DEPENDS} \ - intl.6:${PORTSDIR}/devel/gettext -.endif - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= DFUI BSD Installer backend - -SHAREDIR= ${LOCALBASE}/share/dfuibe_installer - -.if defined(WITH_NLS) -LOCALEDIR= ${LOCALBASE}/share/locale -LANGUAGES= ru -.endif - -PLIST_FILES= sbin/dfuibe_installer \ - share/dfuibe_installer/cmdnames.conf - -.if defined(WITH_NLS) -PLIST_FILES+= share/locale/ru/LC_MESSAGES/dfuibe_installer.mo -.endif - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${INSTALL_DATA} -s -o root -g wheel -m 555 ${WRKSRC}/dfuibe_installer ${LOCALBASE}/sbin - ${MKDIR} -p ${SHAREDIR} - ${INSTALL_DATA} -o root -g wheel -m 555 ${WRKSRC}/conf/cmdnames.conf ${SHAREDIR} - for _language in ${LANGUAGES}; do \ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/po/$${_language}.mo \ - ${LOCALEDIR}/$${_language}/LC_MESSAGES/${PORTNAME}.mo; \ - done - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/pkg-descr deleted file mode 100644 index 97dab99714..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_installer/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -BSD Installer backend. Uses DFUI, so one of the available -DFUI frontends must also be installed for this to be useful. diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/.cvsignore b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/.cvsignore deleted file mode 100644 index 8e15c86648..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -distinfo diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/Makefile b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/Makefile deleted file mode 100644 index 35da7526f2..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/Makefile +++ /dev/null @@ -1,142 +0,0 @@ -# New ports collection makefile for: dfuibe_lua -# Date created: Nov 27, 2004 -# Whom: Chris Pressey - -PORTNAME= dfuibe_lua -PORTVERSION= 0.4 -INTERNAL= YES -CATEGORIES= sysutils -DISTNAME= ${PORTNAME}-${PORTVERSION} -WRKSRC= work/lua - -LIB_DEPENDS= lua50.5:${PORTSDIR}/lang/lua50 - -RUN_DEPENDS= ${LOCALBASE}/lib/lua/5.0/lpty.so:${PORTSDIR}/devel/lua50-pty \ - ${LOCALBASE}/lib/lua/5.0/ldfui.so:${PORTSDIR}/devel/lua50-dfui \ - ${LOCALBASE}/share/lua/5.0/app.lua:${PORTSDIR}/devel/lua50-app -.if defined(WITH_NLS) -RUN_DEPENDS:= ${RUN_DEPENDS} \ - ${LOCALBASE}/lib/lua/5.0/lgettext.so:${PORTSDIR}/devel/lua50-gettext -.endif - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= DFUI Lua backend - -DFUIBE_LUA_DIR= ${LOCALBASE}/share/dfuibe_lua - -.if defined(WITH_NLS) -LOCALEDIR= /usr/local/share/locale -LANGUAGES= ru -.endif - -PLIST_FILES= share/dfuibe_lua/main.lua \ - share/dfuibe_lua/200_install.lua \ - share/dfuibe_lua/400_configure.lua \ - share/dfuibe_lua/600_upgrade.lua \ - share/dfuibe_lua/800_netboot.lua \ - share/dfuibe_lua/lib/bitwise.lua \ - share/dfuibe_lua/lib/cmdchain.lua \ - share/dfuibe_lua/lib/configvars.lua \ - share/dfuibe_lua/lib/fsm.lua \ - share/dfuibe_lua/lib/menu.lua \ - share/dfuibe_lua/lib/mountpoint.lua \ - share/dfuibe_lua/lib/network.lua \ - share/dfuibe_lua/lib/package.lua \ - share/dfuibe_lua/lib/storage.lua \ - share/dfuibe_lua/lib/storage_ui.lua \ - share/dfuibe_lua/lib/target_system.lua \ - share/dfuibe_lua/conf/cmdnames.lua \ - share/dfuibe_lua/conf/sources.lua \ - share/dfuibe_lua/conf/mountpoints.lua \ - share/dfuibe_lua/conf/def_pkgs.lua \ - share/dfuibe_lua/pit/main.lua \ - share/dfuibe_lua/pit/100_select_language.lua \ - share/dfuibe_lua/pit/800_configure_network.lua \ - share/dfuibe_lua/install/main.lua \ - share/dfuibe_lua/install/100_welcome.lua \ - share/dfuibe_lua/install/200_select_disk.lua \ - share/dfuibe_lua/install/250_partition_disk.lua \ - share/dfuibe_lua/install/300_select_part.lua \ - share/dfuibe_lua/install/400_select_subparts.lua \ - share/dfuibe_lua/install/450_select_packages.lua \ - share/dfuibe_lua/install/500_install_os.lua \ - share/dfuibe_lua/install/700_install_bootblocks.lua \ - share/dfuibe_lua/install/800_finished.lua \ - share/dfuibe_lua/install/900_reboot.lua \ - share/dfuibe_lua/configure/main.lua \ - share/dfuibe_lua/configure/100_choose_where_from.lua \ - share/dfuibe_lua/configure/200_select_disk.lua \ - share/dfuibe_lua/configure/300_select_part.lua \ - share/dfuibe_lua/configure/400_mount_target_system.lua \ - share/dfuibe_lua/configure/500_menu.lua \ - share/dfuibe_lua/configure/600_unmount_target_system.lua \ - share/dfuibe_lua/configure/menu/main.lua \ - share/dfuibe_lua/configure/menu/100_set_root_password.lua \ - share/dfuibe_lua/configure/menu/200_add_user.lua \ - share/dfuibe_lua/configure/menu/300_set_timezone.lua \ - share/dfuibe_lua/configure/menu/350_set_datetime.lua \ - share/dfuibe_lua/configure/menu/400_change_console_settings.lua \ - share/dfuibe_lua/configure/menu/500_install_packages.lua \ - share/dfuibe_lua/configure/menu/550_remove_packages.lua \ - share/dfuibe_lua/upgrade/main.lua \ - share/dfuibe_lua/upgrade/200_select_disk.lua \ - share/dfuibe_lua/upgrade/300_select_part.lua \ - share/dfuibe_lua/upgrade/400_mount_target_system.lua \ - share/dfuibe_lua/upgrade/500_perform_upgrade.lua \ - share/dfuibe_lua/upgrade/600_unmount_target_system.lua \ - share/dfuibe_lua/netboot/main.lua \ - share/dfuibe_lua/netboot/500_setup_server.lua - -.if defined(WITH_NLS) -PLIST_FILES+= share/locale/ru/LC_MESSAGES/dfuibe_lua.mo -.endif - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${MKDIR} -p ${DFUIBE_LUA_DIR} - ${MKDIR} -p ${DFUIBE_LUA_DIR}/lib - ${MKDIR} -p ${DFUIBE_LUA_DIR}/conf - ${MKDIR} -p ${DFUIBE_LUA_DIR}/pit - ${MKDIR} -p ${DFUIBE_LUA_DIR}/install - ${MKDIR} -p ${DFUIBE_LUA_DIR}/configure - ${MKDIR} -p ${DFUIBE_LUA_DIR}/configure/menu - ${MKDIR} -p ${DFUIBE_LUA_DIR}/upgrade - ${MKDIR} -p ${DFUIBE_LUA_DIR}/netboot - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/*.lua ${DFUIBE_LUA_DIR}/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/lib/*.lua ${DFUIBE_LUA_DIR}/lib/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/conf/*.lua ${DFUIBE_LUA_DIR}/conf/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/pit/*.lua ${DFUIBE_LUA_DIR}/pit/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/install/*.lua ${DFUIBE_LUA_DIR}/install/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/configure/*.lua ${DFUIBE_LUA_DIR}/configure/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/configure/menu/*.lua ${DFUIBE_LUA_DIR}/configure/menu/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/upgrade/*.lua ${DFUIBE_LUA_DIR}/upgrade/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/netboot/*.lua ${DFUIBE_LUA_DIR}/netboot/ -.if defined(WITH_NLS) - for _language in ${LANGUAGES}; do \ - (cd ${WRKSRC}/po && msgfmt -o $${_language}.mo $${_language}); \ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/po/$${_language}.mo \ - ${LOCALEDIR}/$${_language}/LC_MESSAGES/${PORTNAME}.mo; \ - done -.endif - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/pkg-descr deleted file mode 100644 index 3d3b1c9bf6..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuibe_lua/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Lua backend for DFUI. Most useful if one of the available -DFUI frontends is also installed. - - - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/.cvsignore b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/.cvsignore deleted file mode 100644 index 8e15c86648..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -distinfo diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/Makefile b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/Makefile deleted file mode 100644 index 4de9ab2f29..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# New ports collection makefile for: dfuife_cgi -# Date created: June 5, 2004 -# Whom: Chris Pressey - -PORTNAME= dfuife_cgi -PORTVERSION= 1.4 -INTERNAL= YES -CATEGORIES= sysutils -DISTNAME= ${PORTNAME}-${PORTVERSION} -WRKSRC= work/cgi - -LIB_DEPENDS= aura.3:${PORTSDIR}/devel/libaura \ - dfui.4:${PORTSDIR}/sysutils/libdfui - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= DFUI CGI frontend - -PLIST_FILES= www/dfuife.cgi \ - www/dfly-pg.gif \ - www/fred-bg.gif \ - www/fred.png \ - www/dfuife.css \ - www/dfuife.js \ - www/index.html - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dfuife.cgi ${PREFIX}/www - ${INSTALL_DATA} ${WRKSRC}/dfly-pg.gif ${PREFIX}/www - ${INSTALL_DATA} ${WRKSRC}/fred-bg.gif ${PREFIX}/www - ${INSTALL_DATA} ${WRKSRC}/fred.png ${PREFIX}/www - ${INSTALL_DATA} ${WRKSRC}/dfuife.css ${PREFIX}/www - ${INSTALL_DATA} ${WRKSRC}/dfuife.js ${PREFIX}/www - ${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/www - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/pkg-descr deleted file mode 100644 index af72ab3f95..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_cgi/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -DFUI CGI frontend. Allows a DFUI backend (such as a system -installer) to communicate with the user via a web browser. - -*** NOTE *** : this port will install files into ${PREFIX}/www, -probably /usr/local/www, overwriting any files you may already -have there, such as /usr/local/www/index.html. diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/.cvsignore b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/.cvsignore deleted file mode 100644 index 8e15c86648..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -distinfo diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/Makefile b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/Makefile deleted file mode 100644 index 6c30d66340..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# New ports collection makefile for: dfuife_curses -# Date created: May 13, 2004 -# Whom: Chris Pressey - -PORTNAME= dfuife_curses -PORTVERSION= 1.5 -INTERNAL= YES -CATEGORIES= sysutils -DISTNAME= ${PORTNAME}-${PORTVERSION} -WRKSRC= work/ncurses - -LIB_DEPENDS= aura.3:${PORTSDIR}/devel/libaura \ - dfui.4:${PORTSDIR}/sysutils/libdfui - -.if defined(WITH_NLS) -LIB_DEPENDS:= ${LIB_DEPENDS} \ - intl.6:${PORTSDIR}/devel/gettext -.endif - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= DFUI curses frontend - -PLIST_FILES= sbin/dfuife_curses share/dfuife_curses/fred.txt -.if defined(WITH_NLS) -PLIST_FILES+= share/locale/ru/LC_MESSAGES/dfuife_curses.mo -.endif - -.if defined(WITH_NLS) -LOCALEDIR= ${LOCALBASE}/share/locale -LANGUAGES= ru -.endif - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${MKDIR} -p ${LOCALBASE}/share/dfuife_curses - ${INSTALL_PROGRAM} -o root -g wheel ${WRKSRC}/dfuife_curses ${LOCALBASE}/sbin/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/fred.txt ${LOCALBASE}/share/dfuife_curses/ -.if defined(WITH_NLS) - for _language in ${LANGUAGES}; do \ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/po/$${_language}.mo \ - ${LOCALEDIR}/$${_language}/LC_MESSAGES/${PORTNAME}.mo; \ - done -.endif - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/pkg-descr deleted file mode 100644 index acedf466dd..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_curses/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -DFUI curses frontend. Allows a DFUI backend (such as a system -installer) to communicate with the user with an addressable text -screen-oriented ('curses') user interface. - - - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/.cvsignore b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/.cvsignore deleted file mode 100644 index 8e15c86648..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -distinfo diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/Makefile b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/Makefile deleted file mode 100644 index fc1b063e87..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# New ports collection makefile for: dfuife_qt -# Date created: Oct 19, 2004 -# Whom: Chris Pressey - -PORTNAME= dfuife_qt -PORTVERSION= 1.2 -INTERNAL= YES -CATEGORIES= sysutils -DISTNAME= ${PORTNAME}-${PORTVERSION} -WRKSRC= work/qt - -LIB_DEPENDS= dfui.4:${PORTSDIR}/sysutils/libdfui - -USE_QT_VER= 3 - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= DFUI Qt frontend - -PLIST_FILES= sbin/dfuife_qt - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${INSTALL_PROGRAM} -o root -g wheel -m 555 ${WRKSRC}/dfuife_qt ${LOCALBASE}/sbin - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/pkg-descr deleted file mode 100644 index 8e43136033..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/dfuife_qt/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -DFUI Qt frontend. Allows a DFUI backend (such as a system -installer) to communicate with the user via a graphical -user interface built with the Qt Toolkit, as seen in KDE. diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/.cvsignore b/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/.cvsignore deleted file mode 100644 index 8e15c86648..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -distinfo diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/Makefile b/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/Makefile deleted file mode 100644 index 6aa3193cce..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# New ports collection makefile for: libdfui -# Date created: May 13, 2004 -# Whom: Chris Pressey - -PORTNAME= libdfui -PORTVERSION= 4.1 -INTERNAL= YES -CATEGORIES= sysutils -DISTNAME= ${PORTNAME}-${PORTVERSION} -WRKSRC= work/${PORTNAME} - -LIB_DEPENDS= aura.3:${PORTSDIR}/devel/libaura - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= Abstract user interface protocol library - -PLIST_FILES= lib/libdfui.a \ - lib/libdfui.so \ - lib/libdfui.so.4 \ - include/dfui/dfui.h \ - include/dfui/dump.h \ - include/dfui/lang.h \ - include/dfui/system.h - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${MKDIR} -p ${LOCALBASE}/include/dfui - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/libdfui.a ${LOCALBASE}/lib/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/libdfui.so.4 ${LOCALBASE}/lib/ - ${LN} -sf ${LOCALBASE}/lib/libdfui.so.4 ${LOCALBASE}/lib/libdfui.so - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/dfui.h ${LOCALBASE}/include/dfui/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/dump.h ${LOCALBASE}/include/dfui/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/lang.h ${LOCALBASE}/include/dfui/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/system.h ${LOCALBASE}/include/dfui/ - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/pkg-descr deleted file mode 100644 index 82d953c765..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/libdfui/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -DFUI is a user interface abstraction in the form of a protocol by -which application logic (such as a system installer) in the backend -can talk to a concrete user interface (such as curses or GTK) in -the frontend. - - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/.cvsignore b/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/.cvsignore deleted file mode 100644 index 8e15c86648..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -distinfo diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/Makefile b/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/Makefile deleted file mode 100644 index a7770f56f5..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# New ports collection makefile for: libinstaller -# Date created: Aug 8, 2004 -# Whom: Chris Pressey - -PORTNAME= libinstaller -PORTVERSION= 5.1 -INTERNAL= YES -CATEGORIES= sysutils -DISTNAME= ${PORTNAME}-${PORTVERSION} -WRKSRC= work/${PORTNAME} - -LIB_DEPENDS= aura.3:${PORTSDIR}/devel/libaura \ - dfui.4:${PORTSDIR}/sysutils/libdfui - -MAINTAINER= cpressey@catseye.mine.nu -COMMENT= BSD Installer library - -PLIST_FILES= lib/libinstaller.a \ - lib/libinstaller.so \ - lib/libinstaller.so.5 \ - include/installer/commands.h \ - include/installer/confed.h \ - include/installer/diskutil.h \ - include/installer/functions.h \ - include/installer/package.h \ - include/installer/uiutil.h - -do-fetch: - @if [ ! -f ${_DISTDIR}${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Distfile ${DISTNAME}${EXTRACT_SUFX} not found!"; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "This is an 'INTERNAL' port, meaning that the distfile is not retrieved"; \ - ${ECHO_MSG} "from the Internet, but rather created from a local checkout of the"; \ - ${ECHO_MSG} "BSD Installer CVS repository. Please see the shell scripts in the"; \ - ${ECHO_MSG} "scripts/build directory of the repository for more information on how"; \ - ${ECHO_MSG} "to create these distfiles."; \ - false; \ - fi - -do-install: - ${MKDIR} -p ${LOCALBASE}/include/installer - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/libinstaller.a ${LOCALBASE}/lib/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/libinstaller.so.5 ${LOCALBASE}/lib/ - ${LN} -sf ${LOCALBASE}/lib/libinstaller.so.5 ${LOCALBASE}/lib/libinstaller.so - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/commands.h ${LOCALBASE}/include/installer/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/confed.h ${LOCALBASE}/include/installer/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/diskutil.h ${LOCALBASE}/include/installer/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/functions.h ${LOCALBASE}/include/installer/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/package.h ${LOCALBASE}/include/installer/ - ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/uiutil.h ${LOCALBASE}/include/installer/ - -OSTYPE!=sysctl -n kern.ostype - -.if ${OSTYPE} == "FreeBSD" -.include -.endif - -.if ${OSTYPE} == "DragonFly" -.include -.endif - diff --git a/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/pkg-descr deleted file mode 100644 index 307d9327c1..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/sysutils/libinstaller/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This is the library used by the BSD Installer. - diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/Makefile b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/Makefile deleted file mode 100644 index 39281f4a86..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -# New ports collection makefile for: thttpd -# Date created: 24 May 1999 -# Whom: Anders Nordby -# -# $FreeBSD: ports/www/thttpd/Makefile,v 1.35 2004/02/01 04:51:54 silby Exp $ -# - -PORTNAME= thttpd -PORTVERSION= 2.24 -PKGNAMESUFFIX= -notimeout -CATEGORIES= www ipv6 -MASTER_SITES= http://www.acme.com/software/thttpd/ \ - http://atreides.freenix.no/~anders/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} notes.html -DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= anders@FreeBSD.org -COMMENT= Tiny/turbo/throttling HTTP server - -IGNOREFILES= notes.html - -GNU_CONFIGURE= yes -USE_REINPLACE= yes - -MAN1= makeweb.1 htpasswd.1 -MAN8= thttpd.8 redirect.8 ssi.8 syslogtocern.8 - -.include - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/thttpd ${PREFIX}/sbin/ - @${INSTALL_MAN} ${WRKSRC}/thttpd.8 ${PREFIX}/man/man8 - @${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www - @${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www/data - @${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www/logs - @${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www/cgi-bin - @${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/redirect ${PREFIX}/www/cgi-bin/ - @${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/ssi ${PREFIX}/www/cgi-bin/ - @${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/phf ${PREFIX}/www/cgi-bin/ - @${INSTALL_MAN} ${WRKSRC}/cgi-src/redirect.8 ${PREFIX}/man/man8 - @${INSTALL_MAN} ${WRKSRC}/cgi-src/ssi.8 ${PREFIX}/man/man8 - @${INSTALL_PROGRAM} ${WRKSRC}/extras/makeweb ${PREFIX}/bin/ - @${INSTALL} -c -m 755 -o root -g wheel ${WRKSRC}/extras/syslogtocern ${PREFIX}/bin/ - @${INSTALL_PROGRAM} ${WRKSRC}/extras/htpasswd ${PREFIX}/bin/ - @${INSTALL_MAN} ${WRKSRC}/extras/makeweb.1 ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/extras/htpasswd.1 ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/extras/syslogtocern.8 ${PREFIX}/man/man8 - @if [ ! -f ${PREFIX}/sbin/thttpd_wrapper ]; then \ - ${ECHO} "Installing ${PREFIX}/sbin/thttpd_wrapper file."; \ - ${ECHO_CMD} "#!/bin/sh" > ${PREFIX}/sbin/thttpd_wrapper; \ - ${ECHO_CMD} "${ECHO_CMD} \$$\$$ > /var/run/thttpd_wrapper.pid" >> ${PREFIX}/sbin/thttpd_wrapper; \ - ${ECHO_CMD} "while true ; do" >> ${PREFIX}/sbin/thttpd_wrapper; \ - ${ECHO_CMD} " ${PREFIX}/sbin/thttpd -D -C ${PREFIX}/etc/thttpd.conf" >> ${PREFIX}/sbin/thttpd_wrapper; \ - ${ECHO_CMD} " sleep 10" >> ${PREFIX}/sbin/thttpd_wrapper; \ - ${ECHO_CMD} "done" >> ${PREFIX}/sbin/thttpd_wrapper; \ - ${CHMOD} 751 ${PREFIX}/sbin/thttpd_wrapper; \ - fi - @${ECHO} "Installing ${PREFIX}/etc/thttpd.conf.sample configuration file." - @${ECHO_CMD} "dir=${PREFIX}/www/data" > ${PREFIX}/etc/thttpd.conf.sample - @${ECHO_CMD} "chroot" >> ${PREFIX}/etc/thttpd.conf.sample - @${ECHO_CMD} "cgipat=*.cgi" >> ${PREFIX}/etc/thttpd.conf.sample - @${ECHO_CMD} "logfile=${PREFIX}/www/logs/thttpd.log" >> ${PREFIX}/etc/thttpd.conf.sample - @${ECHO_CMD} "pidfile=/var/run/thttpd.pid" >> ${PREFIX}/etc/thttpd.conf.sample - @${ECHO} "Installing ${PREFIX}/etc/rc.d/thttpd.sh sample startup file." - @${INSTALL_SCRIPT} -m 751 ${FILESDIR}/thttpd.sh ${PREFIX}/etc/rc.d/thttpd.sh.sample - @${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|g' ${PREFIX}/etc/rc.d/thttpd.sh.sample - -.if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/thttpd - @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/notes.html ${PREFIX}/share/doc/thttpd -.endif - -post-install: - @${CAT} ${PKGMESSAGE} - -post-configure: config-message -.if ${OSVERSION} > 502101 - @cd ${WRKSRC} && patch < ${PATCHDIR}/extra-patch-config.h -.endif - -post-build: config-message - -config-message: - @${ECHO} "=====================================================================" - @${ECHO} "" - @${ECHO} "Be sure to take a look at the options in config.h before (re)building" - @${ECHO} "if you want to tweak the server." - @${ECHO} "" - @${ECHO} "=====================================================================" - -.include diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/distinfo b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/distinfo deleted file mode 100644 index 4a24fe4c15..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (thttpd/thttpd-2.24.tar.gz) = 9e72c27986548d0cbc8ea850b7b47bdd -SIZE (thttpd/thttpd-2.24.tar.gz) = 130116 -MD5 (thttpd/notes.html) = IGNORE diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/extra-patch-config.h b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/extra-patch-config.h deleted file mode 100644 index 4eda85b272..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/extra-patch-config.h +++ /dev/null @@ -1,9 +0,0 @@ ---- config.h.old Sat Jan 31 22:17:25 2004 -+++ config.h Sat Jan 31 22:17:38 2004 -@@ -380,4 +380,6 @@ - */ - #define MIN_WOULDBLOCK_DELAY 100L - -+#define USE_SENDFILE -+ - #endif /* _CONFIG_H_ */ diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ab b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ab deleted file mode 100644 index a51144a82d..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Apr 24 19:21:06 2001 -+++ Makefile.in Tue Apr 24 19:21:33 2001 -@@ -47,7 +47,7 @@ - # You shouldn't need to edit anything below here. - - CC = @CC@ --CCOPT = @V_CCOPT@ -+CCOPT = @CFLAGS@ - DEFS = @DEFS@ - INCLS = -I. - CFLAGS = $(CCOPT) $(DEFS) $(INCLS) diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ac b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ac deleted file mode 100644 index 5c8235ba28..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- cgi-src/Makefile.in.orig Tue Apr 24 19:44:12 2001 -+++ cgi-src/Makefile.in Tue Apr 24 19:44:25 2001 -@@ -31,7 +31,7 @@ - MANDIR = @mandir@ - - CC = @CC@ --CCOPT = @V_CCOPT@ -+CCOPT = @CFLAGS@ - DEFS = @DEFS@ - INCLS = -I.. - CFLAGS = $(CCOPT) $(DEFS) $(INCLS) diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ad b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ad deleted file mode 100644 index ffbea63562..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- extras/Makefile.in.orig Tue Apr 24 19:46:03 2001 -+++ extras/Makefile.in Tue Apr 24 19:46:13 2001 -@@ -32,7 +32,7 @@ - MANDIR = @mandir@ - - CC = @CC@ --CCOPT = @V_CCOPT@ -+CCOPT = @CFLAGS@ - DEFS = @DEFS@ - INCLS = -I.. - CFLAGS = $(CCOPT) $(DEFS) $(INCLS) diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-config.h b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-config.h deleted file mode 100644 index 1c35486223..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- config.h.orig 2004-06-06 18:09:22.000000000 -0700 -+++ config.h 2004-06-06 18:09:58.000000000 -0700 -@@ -75,7 +75,7 @@ - ** or whatever. If you don't want any limit, comment this out, but that's - ** probably a really bad idea. - */ --#define CGI_TIMELIMIT 30 -+/* #define CGI_TIMELIMIT 30 */ - - /* CONFIGURE: How many seconds to allow for reading the initial request - ** on a new connection. diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-libhttpd.c b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-libhttpd.c deleted file mode 100644 index 01e0054406..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-libhttpd.c +++ /dev/null @@ -1,12 +0,0 @@ ---- libhttpd.c.orig Mon May 27 01:22:26 2002 -+++ libhttpd.c Sun Oct 20 23:49:58 2002 -@@ -3816,6 +3816,9 @@ - httpd_send_err( hc, 500, err500title, "", err500form, hc->encodedurl ); - return -1; - } -+#ifdef USE_SENDFILE -+ hc->file_fd = *((int *) hc->file_address); -+#endif - send_mime( - hc, 200, ok200title, hc->encodings, "", hc->type, hc->sb.st_size, - hc->sb.st_mtime ); diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-libhttpd.h b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-libhttpd.h deleted file mode 100644 index 329fd6ae43..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-libhttpd.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libhttpd.h.orig Sun Oct 20 23:50:43 2002 -+++ libhttpd.h Sun Oct 20 23:51:10 2002 -@@ -141,6 +141,9 @@ - struct stat sb; - int conn_fd; - char* file_address; -+#ifdef USE_SENDFILE -+ int file_fd; -+#endif - } httpd_conn; - - /* Methods. */ diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-mmc.c b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-mmc.c deleted file mode 100644 index c992a32508..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-mmc.c +++ /dev/null @@ -1,89 +0,0 @@ ---- mmc.c.orig Tue Oct 22 09:42:01 2002 -+++ mmc.c Fri Nov 14 12:26:39 2003 -@@ -74,6 +74,9 @@ - time_t ctime; - int refcount; - time_t reftime; -+#ifdef USE_SENDFILE -+ int fd; -+#endif - void* addr; - unsigned int hash; - int hash_idx; -@@ -140,7 +143,11 @@ - /* Yep. Just return the existing map */ - ++m->refcount; - m->reftime = now; -+#ifdef USE_SENDFILE -+ return (&m->fd); -+#else - return m->addr; -+#endif - } - - /* Open the file. */ -@@ -186,7 +193,9 @@ - else - { - size_t size_size = (size_t) m->size; /* loses on files >2GB */ --#ifdef HAVE_MMAP -+#ifdef USE_SENDFILE -+ m->fd = fd; -+#elif defined(HAVE_MMAP) - /* Map the file into memory. */ - m->addr = mmap( 0, size_size, PROT_READ, MAP_PRIVATE, fd, 0 ); - if ( m->addr == (void*) -1 && errno == ENOMEM ) -@@ -234,8 +243,9 @@ - } - #endif /* HAVE_MMAP */ - } -+#ifndef USE_SENDFILE - (void) close( fd ); -- -+#endif /* !USE_SENDFILE */ - /* Put the Map into the hash table. */ - if ( add_hash( m ) < 0 ) - { -@@ -253,8 +263,12 @@ - /* Update the total byte count. */ - mapped_bytes += m->size; - -+#ifdef USE_SENDFILE -+ return (&m->fd); -+#else - /* And return the address. */ - return m->addr; -+#endif - } - - -@@ -267,14 +281,18 @@ - if ( sbP != (struct stat*) 0 ) - { - m = find_hash( sbP->st_ino, sbP->st_dev, sbP->st_size, sbP->st_ctime ); -+#ifndef USE_SENDFILE - if ( m != (Map*) 0 && m->addr != addr ) - m = (Map*) 0; -+#endif - } -+#ifndef USE_SENDFILE - /* If that didn't work, try a full search. */ - if ( m == (Map*) 0 ) - for ( m = maps; m != (Map*) 0; m = m->next ) - if ( m->addr == addr ) - break; -+#endif - if ( m == (Map*) 0 ) - syslog( LOG_ERR, "mmc_unmap failed to find entry!" ); - else if ( m->refcount <= 0 ) -@@ -363,7 +381,9 @@ - m = *mm; - if ( m->size != 0 ) - { --#ifdef HAVE_MMAP -+#ifdef USE_SENDFILE -+ close(m->fd); -+#elif defined(HAVE_MMAP) - if ( munmap( m->addr, m->size ) < 0 ) - syslog( LOG_ERR, "munmap - %m" ); - #else /* HAVE_MMAP */ diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-thttpd.c b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-thttpd.c deleted file mode 100644 index fde13bd8bb..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/patch-thttpd.c +++ /dev/null @@ -1,56 +0,0 @@ ---- thttpd.c.orig Tue May 13 17:14:33 2003 -+++ thttpd.c Wed Oct 29 05:50:14 2003 -@@ -1593,12 +1593,45 @@ - if ( hc->responselen == 0 ) - { - /* No, just write the file. */ -+#ifdef USE_SENDFILE -+ off_t sbytes; -+ -+ sz = sendfile( -+ hc->file_fd, hc->conn_fd, c->bytes_sent, -+ MIN( c->bytes_to_send - c->bytes_sent, c->max_limit ), -+ NULL, &sbytes, 0 ); -+ if (sz == -1 && errno == EAGAIN) -+ sz = sbytes > 0 ? sbytes : -1; -+ else if (sz == 0) -+ sz = sbytes; -+#else - sz = write( - hc->conn_fd, &(hc->file_address[c->bytes_sent]), - MIN( c->bytes_to_send - c->bytes_sent, c->max_limit ) ); -+#endif - } - else - { -+#ifdef USE_SENDFILE -+ struct sf_hdtr sf; -+ struct iovec iv; -+ off_t sbytes; -+ -+ iv.iov_base = hc->response; -+ iv.iov_len = hc->responselen; -+ sf.headers = &iv; -+ sf.hdr_cnt = 1; -+ sf.trailers = NULL; -+ sf.trl_cnt = 0; -+ sz = sendfile( -+ hc->file_fd, hc->conn_fd, c->bytes_sent, -+ MIN( c->bytes_to_send - c->bytes_sent, c->max_limit ), -+ &sf, &sbytes, 0 ); -+ if (sz == -1 && errno == EAGAIN) -+ sz = sbytes > 0 ? sbytes : -1; -+ else if (sz == 0) -+ sz = sbytes; -+#else - /* Yes. We'll combine headers and file into a single writev(), - ** hoping that this generates a single packet. - */ -@@ -1609,6 +1642,7 @@ - iv[1].iov_base = &(hc->file_address[c->bytes_sent]); - iv[1].iov_len = MIN( c->bytes_to_send - c->bytes_sent, c->max_limit ); - sz = writev( hc->conn_fd, iv, 2 ); -+#endif - } - - if ( sz == 0 || diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/thttpd.sh b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/thttpd.sh deleted file mode 100644 index e559a172d3..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/files/thttpd.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -case "$1" in -start) - if [ -x %%PREFIX%%/sbin/thttpd_wrapper ]; then - %%PREFIX%%/sbin/thttpd_wrapper & - echo -n ' thttpd' - fi - ;; -stop) - kill `cat /var/run/thttpd_wrapper.pid` && killall thttpd && echo -n ' thttpd' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-descr b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-descr deleted file mode 100644 index d47449fb38..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ - thttpd - tiny/turbo/throttling HTTP server - -thttpd is a simple, small, portable, fast, and secure HTTP server. - -Simple: It handles only the minimum necessary to implement HTTP/1.1. - -Small: See the size comparison chart at -http://www.acme.com/software/thttpd/notes.html#sizes. It also has a -very small run-time size, since it does not fork and is very careful about -memory allocation. - -Portable: It compiles cleanly on SunOS 4.1.x, Solaris 2.x, BSD/OS 2.x, -Linux 1.2.x, and OSF/1 (on a 64-bit Alpha). - -Fast: In typical use it's about as fast as the best full-featured servers -(Apache, NCSA, Netscape). Under extreme load it's much faster. - -Secure: It goes to great lengths to protect the web server machine -against attacks and breakins from other sites. - -It also has one extremely useful feature (URL-traffic-based throttling) that -no other server currently has. - -WWW: http://www.acme.com/software/thttpd/ diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-message b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-message deleted file mode 100644 index 06a5dc7662..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -=========================================================================== - - If you want users to be able to create their own web - subdirectories off of the main web directory, you need to: - - a) add a group for www admins - b) chgrp yourgroup ${PREFIX}/bin/makeweb ${PREFIX}/www - c) chmod 2755 ${PREFIX}/bin/makeweb - d) tell them about makeweb(1) - -=========================================================================== diff --git a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-plist b/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-plist deleted file mode 100644 index a18b507f43..0000000000 --- a/contrib/bsdinstaller-1.1.6/ports/www/thttpd-notimeout/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/htpasswd -bin/makeweb -bin/syslogtocern -etc/rc.d/thttpd.sh.sample -etc/thttpd.conf.sample -sbin/thttpd -sbin/thttpd_wrapper -%%PORTDOCS%%share/doc/thttpd/notes.html -www/cgi-bin/phf -www/cgi-bin/redirect -www/cgi-bin/ssi -%%PORTDOCS%%@dirrm share/doc/thttpd -@unexec rmdir %D/www/cgi-bin 2> /dev/null || true -@unexec rmdir %D/www/data 2> /dev/null || true -@unexec rmdir %D/www/logs 2> /dev/null || true -@unexec rmdir %D/www 2> /dev/null || true diff --git a/contrib/bsdinstaller-1.1.6/root_skels/installer/boot/cdboot.flp.bz2 b/contrib/bsdinstaller-1.1.6/root_skels/installer/boot/cdboot.flp.bz2 deleted file mode 100644 index d8ee09c5aad0dd953e02543f15c5ebdca3cc3063..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15654 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 diff --git a/contrib/bsdinstaller-1.1.6/root_skels/installer/boot/memtest86.flp.bz2 b/contrib/bsdinstaller-1.1.6/root_skels/installer/boot/memtest86.flp.bz2 deleted file mode 100644 index b9ca13aad1a8df29d31437241b2e1403331c3072..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28585 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 OJB4y6ELiTIQo( /etc/pfi.conf - echo "pfi_found_on_device='$2'" >> /etc/pfi.conf - - # If the pfi.conf says to run a custom script from the pfi - # media, run it now, so that it has access to the pfi media. - - if [ -r /etc/defaults/pfi.conf ]; then - . /etc/defaults/pfi.conf - fi - . /etc/pfi.conf - if [ "$pfi_script" != "" -a -x "$1/$pfi_script" ]; then - $1/$pfi_script - fi - return 0 - else - return 1 - fi -} - -get_authorized_hosts() -{ - [ -r /root/.ssh/authorized_hosts ] && return 0 - if [ -r $1/authorized_hosts ]; then - echo "authorized_hosts found!" - mkdir -p /root/.ssh/ - tr -d "\r" < $1/authorized_hosts > /root/.ssh/authorized_hosts - fi -} - -look_for_pfi_config_msdos() -{ - [ -r /etc/pfi.conf ] && return 0 - - for try_device in da0s1 da1s1 fd0 fd1; do - echo -n "Looking for pfi.conf on /dev/${try_device}..." - if [ ! -e /dev/${try_device} ]; then - ( cd /dev && ./MAKEDEV ${try_device} ) - fi - if mount_msdos -o rdonly /dev/$try_device /mnt ; then - echo -n " /dev/$try_device ok..." - if get_pfi_config /mnt /dev/$try_device; then - get_authorized_hosts /mnt - umount /mnt - return 0 - fi - umount /mnt - fi - echo " not found" - done - return 1 -} - -look_for_pfi_config_cd9660() -{ - [ -r /etc/pfi.conf ] && return 0 - - for try_device in acd0c; do - echo -n "Looking for pfi.conf on /dev/${try_device}..." - if [ ! -e /dev/${try_device} ]; then - ( cd /dev && ./MAKEDEV ${try_device} ) - fi - if mount_cd9660 /dev/$try_device /mnt ; then - echo -n " /dev/$try_device ok..." - if get_pfi_config /mnt /dev/$try_device; then - get_authorized_hosts /mnt - umount /mnt - return 0 - fi - umount /mnt - fi - echo " not found" - done - return 1 -} - -pfi_start() -{ - echo "Starting pfi..." - - # Get the pfi.conf file off the pfi media and into /etc/pfi.conf. - - look_for_pfi_config_cd9660 - look_for_pfi_config_msdos - - # If the search was not successful, stub out a dummy pfi.conf. - - if [ ! -r /etc/pfi.conf ]; then - echo '' >/etc/pfi.conf - fi - - # Append the contents of pfi.conf onto rc.conf, so that settings - # (such as ifconfig_dc0="DHCP") will be picked up by pfi_rc_actions. - - cp /etc/rc.conf /etc/rc.conf.orig - cat /etc/pfi.conf >>/etc/rc.conf - - # Read in the pfi.conf we either found or created for ourselves. - - if [ -r /etc/defaults/pfi.conf ]; then - . /etc/defaults/pfi.conf - fi - . /etc/pfi.conf - - # We can perform any pre-install tasks here by - # examining the contents of pfi_* variables. - - # Interpret pfi_sshd_* options. These basically add settings - # to /etc/ssh/sshd_config; it is assumed "sshd" will appear - # in pfi_rc_actions to restart sshd. - - case ${pfi_sshd_permit_root_login} in - YES) - echo "PermitRootLogin yes" >> /etc/ssh/sshd_config - ;; - without-password) - echo "PermitRootLogin without-password" >> /etc/ssh/sshd_config - ;; - forced-commands-only) - echo "PermitRootLogin forced-commands-only" >> /etc/ssh/sshd_config - ;; - *) - ;; - esac - - case ${pfi_sshd_permit_empty_passwords} in - YES) - echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config - ;; - *) - ;; - esac - - # Interpret pfi_set_root_password. If it is not empty, use - # it to set root's LiveCD password. - - if [ "X$pfi_set_root_password" != "X" ]; then - echo "$pfi_set_root_password" | \ - /usr/sbin/pw usermod root -h 0 - fi - - # The most important pre-install task is to restart - # any RCNG scripts listed in pfi_rc_actions with any new - # settings that might have been set up by pfi.conf. - - if [ "X$pfi_rc_actions" != "X" ]; then - rev_actions=`reverse_list $pfi_rc_actions` - - for _rc_elem in ${rev_actions}; do - echo "Stopping ${_rc_elem}..." - rcstop ${_rc_elem} - done - for _rc_elem in ${pfi_rc_actions}; do - echo "Starting ${_rc_elem}..." - rcstart ${_rc_elem} - done - fi - - # Now restore the original pfi.conf. - - mv /etc/rc.conf.orig /etc/rc.conf - - # Set up auto-login if requested. - - if [ "X$pfi_autologin" != "XNONE" ]; then - echo 'AL.pfi:\' >> /etc/gettytab - echo " :al=${pfi_autologin}:tc=Pc:" >> /etc/gettytab - sed -i '' 's|^ttyv0.*|ttyv0 "/usr/libexec/getty AL.pfi" cons25 on secure|' /etc/ttys - fi - - # Finally, start thttpd if the user wants to use - # the cgi frontend. - - if [ "X$pfi_frontend" = "Xcgi" ]; then - echo "Starting thttpd..." - /usr/local/sbin/thttpd_wrapper & - fi -} - -load_rc_config $name -run_rc_command "$1" diff --git a/contrib/bsdinstaller-1.1.6/root_skels/installer/etc/ttys b/contrib/bsdinstaller-1.1.6/root_skels/installer/etc/ttys deleted file mode 100644 index e4a15e8ce0..0000000000 --- a/contrib/bsdinstaller-1.1.6/root_skels/installer/etc/ttys +++ /dev/null @@ -1,307 +0,0 @@ -# -# $FreeBSD: src/etc/etc.i386/ttys,v 1.8 2000/01/29 12:18:03 obrien Exp $ -# $Id: ttys,v 1.3 2005/01/08 20:34:03 cpressey Exp $ -# $DragonFly: src/contrib/bsdinstaller-1.1.6/root_skels/installer/etc/Attic/ttys,v 1.1.1.1 2008/03/12 22:15:45 dave Exp $ -# @(#)ttys 5.1 (Berkeley) 4/17/89 -# -# This file specifies various information about terminals on the system. -# It is used by several different programs. Common entries for the -# various columns include: -# -# name The name of the terminal device. -# -# getty The program to start running on the terminal. Typically a -# getty program, as the name implies. Other common entries -# include none, when no getty is needed, and xdm, to start the -# X Window System. -# -# type The initial terminal type for this port. For hardwired -# terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is cons25. Other -# common values include network for network connections on -# pseudo-terminals, dialup for incoming modem ports, and unknown -# when the terminal type cannot be predetermined. -# -# status Must be on or off. If on, init will run the getty program on -# the specified port. If the word "secure" appears, this tty -# allows root login. -# -# name getty type status comments -# -# If console is marked "insecure", then init will ask for the root password -# when going to single-user mode. -console none unknown off secure -# -ttyv0 "/usr/libexec/getty Pc" cons25 on secure -# Virtual terminals -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure -#ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure -# Serial terminals -# vt100-color seems to work best when talking to the serial port -# from a cu/tip running on an xterm. -ttyd0 "/usr/libexec/getty std.9600" vt100-color off secure -ttyd1 "/usr/libexec/getty std.9600" dialup off secure -ttyd2 "/usr/libexec/getty std.9600" dialup off secure -ttyd3 "/usr/libexec/getty std.9600" dialup off secure -# Pseudo terminals -ttyp0 none network -ttyp1 none network -ttyp2 none network -ttyp3 none network -ttyp4 none network -ttyp5 none network -ttyp6 none network -ttyp7 none network -ttyp8 none network -ttyp9 none network -ttypa none network -ttypb none network -ttypc none network -ttypd none network -ttype none network -ttypf none network -ttypg none network -ttyph none network -ttypi none network -ttypj none network -ttypk none network -ttypl none network -ttypm none network -ttypn none network -ttypo none network -ttypp none network -ttypq none network -ttypr none network -ttyps none network -ttypt none network -ttypu none network -ttypv none network -ttyq0 none network -ttyq1 none network -ttyq2 none network -ttyq3 none network -ttyq4 none network -ttyq5 none network -ttyq6 none network -ttyq7 none network -ttyq8 none network -ttyq9 none network -ttyqa none network -ttyqb none network -ttyqc none network -ttyqd none network -ttyqe none network -ttyqf none network -ttyqg none network -ttyqh none network -ttyqi none network -ttyqj none network -ttyqk none network -ttyql none network -ttyqm none network -ttyqn none network -ttyqo none network -ttyqp none network -ttyqq none network -ttyqr none network -ttyqs none network -ttyqt none network -ttyqu none network -ttyqv none network -ttyr0 none network -ttyr1 none network -ttyr2 none network -ttyr3 none network -ttyr4 none network -ttyr5 none network -ttyr6 none network -ttyr7 none network -ttyr8 none network -ttyr9 none network -ttyra none network -ttyrb none network -ttyrc none network -ttyrd none network -ttyre none network -ttyrf none network -ttyrg none network -ttyrh none network -ttyri none network -ttyrj none network -ttyrk none network -ttyrl none network -ttyrm none network -ttyrn none network -ttyro none network -ttyrp none network -ttyrq none network -ttyrr none network -ttyrs none network -ttyrt none network -ttyru none network -ttyrv none network -ttys0 none network -ttys1 none network -ttys2 none network -ttys3 none network -ttys4 none network -ttys5 none network -ttys6 none network -ttys7 none network -ttys8 none network -ttys9 none network -ttysa none network -ttysb none network -ttysc none network -ttysd none network -ttyse none network -ttysf none network -ttysg none network -ttysh none network -ttysi none network -ttysj none network -ttysk none network -ttysl none network -ttysm none network -ttysn none network -ttyso none network -ttysp none network -ttysq none network -ttysr none network -ttyss none network -ttyst none network -ttysu none network -ttysv none network -ttyP0 none network -ttyP1 none network -ttyP2 none network -ttyP3 none network -ttyP4 none network -ttyP5 none network -ttyP6 none network -ttyP7 none network -ttyP8 none network -ttyP9 none network -ttyPa none network -ttyPb none network -ttyPc none network -ttyPd none network -ttyPe none network -ttyPf none network -ttyPg none network -ttyPh none network -ttyPi none network -ttyPj none network -ttyPk none network -ttyPl none network -ttyPm none network -ttyPn none network -ttyPo none network -ttyPp none network -ttyPq none network -ttyPr none network -ttyPs none network -ttyPt none network -ttyPu none network -ttyPv none network -ttyQ0 none network -ttyQ1 none network -ttyQ2 none network -ttyQ3 none network -ttyQ4 none network -ttyQ5 none network -ttyQ6 none network -ttyQ7 none network -ttyQ8 none network -ttyQ9 none network -ttyQa none network -ttyQb none network -ttyQc none network -ttyQd none network -ttyQe none network -ttyQf none network -ttyQg none network -ttyQh none network -ttyQi none network -ttyQj none network -ttyQk none network -ttyQl none network -ttyQm none network -ttyQn none network -ttyQo none network -ttyQp none network -ttyQq none network -ttyQr none network -ttyQs none network -ttyQt none network -ttyQu none network -ttyQv none network -ttyR0 none network -ttyR1 none network -ttyR2 none network -ttyR3 none network -ttyR4 none network -ttyR5 none network -ttyR6 none network -ttyR7 none network -ttyR8 none network -ttyR9 none network -ttyRa none network -ttyRb none network -ttyRc none network -ttyRd none network -ttyRe none network -ttyRf none network -ttyRg none network -ttyRh none network -ttyRi none network -ttyRj none network -ttyRk none network -ttyRl none network -ttyRm none network -ttyRn none network -ttyRo none network -ttyRp none network -ttyRq none network -ttyRr none network -ttyRs none network -ttyRt none network -ttyRu none network -ttyRv none network -ttyS0 none network -ttyS1 none network -ttyS2 none network -ttyS3 none network -ttyS4 none network -ttyS5 none network -ttyS6 none network -ttyS7 none network -ttyS8 none network -ttyS9 none network -ttySa none network -ttySb none network -ttySc none network -ttySd none network -ttySe none network -ttySf none network -ttySg none network -ttySh none network -ttySi none network -ttySj none network -ttySk none network -ttySl none network -ttySm none network -ttySn none network -ttySo none network -ttySp none network -ttySq none network -ttySr none network -ttySs none network -ttySt none network -ttySu none network -ttySv none network diff --git a/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/bin/installer b/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/bin/installer deleted file mode 100644 index 5b0ba8b3ce..0000000000 --- a/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/bin/installer +++ /dev/null @@ -1,159 +0,0 @@ -#!/bin/sh - -# installer - start installer frontend and backend as per pfi config. -# $Id: installer,v 1.18 2005/03/19 05:31:14 cpressey Exp $ -# $DragonFly: src/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/bin/Attic/installer,v 1.1.1.1 2008/03/12 22:15:45 dave Exp $ - -### SUBS ### - -background_backend() -{ - RENDEZVOUS=$1 - TRANSPORT=$2 - cp /usr/local/sbin/dfuibe_installer /var/run/dfuibe_installer - /var/run/dfuibe_installer -r $RENDEZVOUS -t $TRANSPORT >/dev/null 2>&1 - RESULT=$? - case "$RESULT" in - 0) - ;; - 5) - $pfi_shutdown_command - ;; - *) - ;; - esac -} - -installer_start() -{ - # Console start sequence: - # - Backend (and all other logging) goes to console (ttyv0) - # - curses frontend starts on ttyv1. - # - Uses vidcontrol -s 2 to switch to ttyv1 once the frontend is up. - - echo -n "Starting installer. " - - if [ -r /etc/defaults/pfi.conf ]; then - . /etc/defaults/pfi.conf - fi - - if [ -r /etc/pfi.conf ]; then - echo "Reading /etc/pfi.conf ..." - . /etc/pfi.conf - else - echo "/etc/pfi.conf not found, starting interactive install." - fi - - # We can set up any install variables and such - # here by examining pfi_* variables. - - if [ "X$pfi_run" != "X" ]; then - pfi_frontend=none - $pfi_run - fi - - case "X$pfi_dfui_transport" in - Xcaps) - sysctl kern.caps_enabled=1 - RENDEZVOUS="installer" - ;; - Xnpipe) - RENDEZVOUS="installer" - ;; - Xtcp) - RENDEZVOUS="9999" - ;; - *) - echo "Unsupported DFUI transport '$pfi_dfui_transport'." - return - ;; - esac - - if [ "X$SERIAL" = "XYES" ]; then - background_backend $RENDEZVOUS $pfi_dfui_transport & - sleep 1 - ESCDELAY=$pfi_curses_escdelay \ - /usr/local/sbin/dfuife_curses \ - -r $RENDEZVOUS \ - -t $pfi_dfui_transport \ - -b /usr/local/share/dfuife_curses/fred.txt \ - 2>/dev/null - pfi_frontend=none - fi - - case "X$pfi_frontend" in - Xqt) - background_backend $RENDEZVOUS $pfi_dfui_transport & - sleep 1 - rcrun forcestart moused - X -configure - mv /root/xorg.conf.new /etc/X11/xorg.conf - echo "exec dfuife_qt" > /root/.xinitrc - xinit - ;; - Xcgi) - $pfi_backend -r $RENDEZVOUS -t $pfi_dfui_transport - RESULT=$? - ;; - Xcurses) - ps auwwwxxx > /tmp/ps.txt - if grep -q dfuife_curses /tmp/ps.txt; then - # Frontend is already running. - else - ESCDELAY=$pfi_curses_escdelay \ - /usr/local/sbin/dfuife_curses \ - -r $RENDEZVOUS \ - -t $pfi_dfui_transport \ - -b /usr/local/share/dfuife_curses/fred.txt \ - 2>/dev/ttyv0 /dev/ttyv1 & - fi - rm -f /tmp/ps.txt - sleep 1 - vidcontrol -s 2 - $pfi_backend -r $RENDEZVOUS -t $pfi_dfui_transport - RESULT=$? - sleep 1 - killall dfuife_curses - vidcontrol -s 1 - ;; - Xnone) - RESULT=0 - ;; - *) - echo "Unknown installer frontend '$pfi_frontend'." - return - ;; - esac - - case "$RESULT" in - 0) - ;; - 5) - $pfi_shutdown_command - ;; - *) - ;; - esac -} - -### MAIN ### - -if [ "X$1" = "Xserial" ]; then - SERIAL=YES -fi - -TTY=`w | awk '{ print $2 }' | tail -n1` -if [ "tty$TTY" = "ttyd0" ]; then - SERIAL=YES -fi - -ps auwwwxxx > /tmp/ps.txt -if grep -q dfuibe_installer /tmp/ps.txt; then - # Installer is already running. Log in normally. - rm -f /tmp/ps.txt -else - rm -f /tmp/ps.txt - installer_start -fi - -### END of installer ### diff --git a/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/dhcpd.conf b/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/dhcpd.conf deleted file mode 100644 index 851e28721d..0000000000 --- a/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/dhcpd.conf +++ /dev/null @@ -1,25 +0,0 @@ -# /usr/local/etc/dhcpd.conf -# -ddns-update-style none; - -class "pxeboot-class" { - match if substring (option vendor-class-identifier, 0, 9) = "PXEClient"; -} - -class "etherboot-class" { - match if substring (option vendor-class-identifier, 0, 9) = "Etherboot"; -} - -subnet 10.1.0.0 netmask 255.255.0.0 { - pool { - allow members of "pxeboot-class"; - allow members of "etherboot-class"; - range 10.1.0.128 10.1.0.254; - option subnet-mask 255.255.255.0; - option broadcast-address 10.1.0.255; - filename "pxeboot"; - option root-path "10.1.0.1:/cdrom"; - next-server 10.1.0.1; - } -} - diff --git a/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/thttpd.conf b/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/thttpd.conf deleted file mode 100644 index 813d9ac737..0000000000 --- a/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/thttpd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# $DragonFly: src/contrib/bsdinstaller-1.1.6/root_skels/installer/usr/local/etc/Attic/thttpd.conf,v 1.1.1.1 2008/03/12 22:15:45 dave Exp $ -# $Id: thttpd.conf,v 1.2 2005/01/09 00:11:27 cpressey Exp $ -# -dir=/usr/local/www -user=root -cgipat=*.cgi -logfile=/var/log/thttpd.log -pidfile=/var/run/thttpd.pid diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/.cvsignore b/contrib/bsdinstaller-1.1.6/scripts/build/.cvsignore deleted file mode 100644 index f32a2215d3..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -build.conf diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/build.conf.defaults b/contrib/bsdinstaller-1.1.6/scripts/build/build.conf.defaults deleted file mode 100644 index c97b5350f3..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/build.conf.defaults +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: build.conf.defaults,v 1.1 2005/02/21 22:18:55 cpressey Exp $ - -# Defaults settings for the build scripts. -# NOTE: There should be NO NEED to edit this file directly! -# Instead, create a file build.conf with your own overrides. - -CVSUSER=${CVSUSER:-cpressey} # user to `cvs update' as -LOCALUSER=${LOCALUSER:-catseye} # user who owns cvs tree -CVSDIR=${CVSDIR:-/home/${LOCALUSER}/projects} # local cvs checkout dir -CVSSITE=${CVSSITE:-216.135.66.6} # host to cvs from -CVSROOT=${CVSROOT:-cvsroot} # cvsroot dir, on host -CVSMODULE=${CVSMODULE:-installer} # cvs module name -CVSUPDATE=${CVSUPDATE:-NO} # invoke 'cvs update'? - -TMPDIR=${TMPDIR:-/tmp} # dir for temp files -SRCDIR=${SRCDIR:-/usr/src} # system source dir -PORTSDIR=${PORTSDIR:-/usr/ports} # system ports dir -DISTFILESDIR=${DISTFILESDIR:-${PORTSDIR}/distfiles} # distfiles dir -PACKAGESDIR=${PACKAGESDIR:-${PORTSDIR}/packages/All} # pkgs dir - -REMOVEOLDPKGS=${REMOVEOLDPKGS:-YES} # rm old pkgs when making new -RELEASEBUILD=${RELEASEBUILD:-NO} # NO = tack date on pkg vers -ROOTSKEL=${ROOTSKEL:-/usr/src/nrelease/installer} # root skeleton to use -EXTRA_ROOTSKELS=${EXTRA_ROOTSKELS:-} # extra root skeletons - -INSTALL_DFUIFE_QT=${INSTALL_DFUIFE_QT:-NO} # build & install Qt frontend -INSTALL_DFUIBE_LUA=${INSTALL_DFUIBE_LUA:-NO} # build & install Lua backend - -WITH_NLS=${WITH_NLS:-NO} # build pkgs with i18n -WITH_X11=${WITH_X11:-NO} # build X11 support pkgs diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/build_installer_packages.sh b/contrib/bsdinstaller-1.1.6/scripts/build/build_installer_packages.sh deleted file mode 100644 index 18c2b6151e..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/build_installer_packages.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -x - -# $Id: build_installer_packages.sh,v 1.32 2005/04/06 20:56:23 cpressey Exp $ -# Build packages for BSD Installer components. -# This script generally requires root privledges. -# copy_ports_to_portsdir.sh should generally be run first. - -SCRIPT=`realpath $0` -SCRIPTDIR=`dirname $SCRIPT` - -[ -r $SCRIPTDIR/build.conf ] && . $SCRIPTDIR/build.conf -. $SCRIPTDIR/build.conf.defaults -. $SCRIPTDIR/pver.conf - -PVERSUFFIX="" -if [ "X$RELEASEBUILD" != "XYES" ]; then - PVERSUFFIX=.`date "+%Y.%m%d"` -fi - -WITH_NLS_DEF="" -if [ "X$WITH_NLS" = "XYES" ]; then - WITH_NLS_DEF="WITH_NLS=YES" -fi - -rebuild_port() -{ - cd $PORTSDIR/$1/$2/ && \ - rm -rf work distinfo && \ - make makesum && \ - make patch && \ - chmod -R 777 work && \ - make $WITH_NLS_DEF package && \ - rm -rf work -} - -pkg_delete -f 'libaura-*' -pkg_delete -f 'libinstaller-*' -pkg_delete -f '*dfui*' -pkg_delete -f 'thttpd-notimeout-*' -pkg_delete -f 'lua50-*' -if [ "X$REMOVEOLDPKGS" = "XYES" ]; then - rm -rf $PACKAGESDIR/libaura-*.????.????.t?z - rm -rf $PACKAGESDIR/libinstaller-*.????.????.t?z - rm -rf $PACKAGESDIR/*dfui*.????.????.t?z - rm -rf $PACKAGESDIR/lua50-*.????.????.t?z -fi - -# Now, rebuild all the ports, making packages in the process. - -rebuild_port devel libaura && \ -rebuild_port sysutils libdfui && \ -rebuild_port sysutils libinstaller && \ -rebuild_port sysutils dfuibe_installer && \ -rebuild_port sysutils dfuife_curses && \ -rebuild_port sysutils dfuife_cgi && \ -rebuild_port www thttpd-notimeout && \ -if [ "X$INSTALL_DFUIFE_QT" = "XYES" ]; then - rebuild_port sysutils dfuife_qt -fi && \ -if [ "X$INSTALL_DFUIBE_LUA" = "XYES" ]; then - rebuild_port lang lua50 - rebuild_port devel lua50-compat51 - rebuild_port devel lua50-posix - rebuild_port devel lua50-pty - rebuild_port devel lua50-gettext - rebuild_port devel lua50-dfui - rebuild_port devel lua50-filename - rebuild_port devel lua50-app - rebuild_port net lua50-socket - rebuild_port sysutils dfuibe_lua -fi diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/copy_ports_to_portsdir.sh b/contrib/bsdinstaller-1.1.6/scripts/build/copy_ports_to_portsdir.sh deleted file mode 100644 index fbde24f985..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/copy_ports_to_portsdir.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -x - -# $Id: copy_ports_to_portsdir.sh,v 1.3 2005/04/05 10:37:57 den Exp $ -# Copy the ports in our CVS tree to the system-wide ports directory. -# This script generally requires root privledges. -# create_installer_tarballs.sh should generally be run first. - -SCRIPT=`realpath $0` -SCRIPTDIR=`dirname $SCRIPT` - -[ -r $SCRIPTDIR/build.conf ] && . $SCRIPTDIR/build.conf -. $SCRIPTDIR/build.conf.defaults -. $SCRIPTDIR/pver.conf - -PVERSUFFIX="" -if [ "X$RELEASEBUILD" != "XYES" ]; then - PVERSUFFIX=.`date "+%Y.%m%d"` -fi - -cd $CVSDIR/$CVSMODULE/ports && \ -rm -rf */*/work && \ -for CATEGORY in *; do - for PORT in $CATEGORY/*; do - if [ "X$CATEGORY" != "XCVS" -a "X$PORT" != "X$CATEGORY/CVS" ]; then - rm -rf $PORTSDIR/$PORT - cp -Rp $PORT $PORTSDIR/$PORT - if grep -q '^INTERNAL[[:space:]]*=[[:space:]]*YES[[:space:]]*$' $PORT/Makefile; then - sed -i '' "s/PORTVERSION=[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/PORTVERSION=\1${PVERSUFFIX}/" \ - $PORTSDIR/$PORT/Makefile - fi - fi - done -done diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/create_installer_tarballs.sh b/contrib/bsdinstaller-1.1.6/scripts/build/create_installer_tarballs.sh deleted file mode 100644 index bb855599a7..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/create_installer_tarballs.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -x - -# $Id: create_installer_tarballs.sh,v 1.30 2005/04/05 10:37:57 den Exp $ -# Create tarballs from the contents of the CVS repo. - -SCRIPT=`realpath $0` -SCRIPTDIR=`dirname $SCRIPT` - -[ -r $SCRIPTDIR/build.conf ] && . $SCRIPTDIR/build.conf -. $SCRIPTDIR/build.conf.defaults -. $SCRIPTDIR/pver.conf - -PVERSUFFIX="" -if [ "X$RELEASEBUILD" != "XYES" ]; then - PVERSUFFIX=.`date "+%Y.%m%d"` -fi - -rm -f $DISTFILESDIR/*dfui* -rm -f $DISTFILESDIR/libaura-* - -cd $CVSDIR/$CVSMODULE/src && \ - make clean && \ -(find $CVSDIR/$CVSMODULE -name '*.core' -print0 | xargs -0 rm -f) && \ -(find $CVSDIR/$CVSMODULE -name '.#*' -print0 | xargs -0 rm -f) && \ -cd $CVSDIR/$CVSMODULE/ports && \ - rm -rf `find . -name 'work' -print` && \ -if [ "X$CVSUPDATE" = "XYES" ]; then - cd $CVSDIR/$CVSMODULE && \ - cvs -d:ext:$CVSUSER@$CVSSITE:/$CVSROOT update -fi && \ -cd $CVSDIR && \ - tar zcvf $DISTFILESDIR/installer-${INSTALLER_VER}${PVERSUFFIX}.tar.gz --exclude CVS installer && \ -cd $CVSDIR/$CVSMODULE/src/lib && \ - tar zcvf $DISTFILESDIR/libaura-${LIBAURA_VER}${PVERSUFFIX}.tar.gz --exclude CVS libaura && \ - tar zcvf $DISTFILESDIR/libdfui-${LIBDFUI_VER}${PVERSUFFIX}.tar.gz --exclude CVS libdfui && \ - tar zcvf $DISTFILESDIR/libinstaller-${LIBINSTALLER_VER}${PVERSUFFIX}.tar.gz --exclude CVS libinstaller && \ -cd $CVSDIR/$CVSMODULE/src/lib/lua && \ - tar zcvf $DISTFILESDIR/luapty-${LUA50_PTY_VER}${PVERSUFFIX}.tar.gz --exclude CVS pty && \ - tar zcvf $DISTFILESDIR/luagettext-${LUA50_GETTEXT_VER}${PVERSUFFIX}.tar.gz --exclude CVS gettext && \ - tar zcvf $DISTFILESDIR/luadfui-${LUA50_DFUI_VER}${PVERSUFFIX}.tar.gz --exclude CVS dfui && \ - tar zcvf $DISTFILESDIR/luafilename-${LUA50_FILENAME_VER}${PVERSUFFIX}.tar.gz --exclude CVS filename && \ - tar zcvf $DISTFILESDIR/luaapp-${LUA50_APP_VER}${PVERSUFFIX}.tar.gz --exclude CVS app && \ -cd $CVSDIR/$CVSMODULE/src/frontends && \ - tar zcvf $DISTFILESDIR/dfuife_curses-${DFUIFE_CURSES_VER}${PVERSUFFIX}.tar.gz --exclude CVS ncurses && \ - tar zcvf $DISTFILESDIR/dfuife_cgi-${DFUIFE_CGI_VER}${PVERSUFFIX}.tar.gz --exclude CVS cgi && \ - tar zcvf $DISTFILESDIR/dfuife_qt-${DFUIFE_QT_VER}${PVERSUFFIX}.tar.gz --exclude CVS qt && \ -cd $CVSDIR/$CVSMODULE/src/backend && \ - tar zcvf $DISTFILESDIR/dfuibe_installer-${DFUIBE_INSTALLER_VER}${PVERSUFFIX}.tar.gz --exclude CVS installer && \ - tar zcvf $DISTFILESDIR/dfuibe_lua-${DFUIBE_LUA_VER}${PVERSUFFIX}.tar.gz --exclude CVS lua diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/install_installer_packages.sh b/contrib/bsdinstaller-1.1.6/scripts/build/install_installer_packages.sh deleted file mode 100644 index 39951fc3f6..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/install_installer_packages.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -x - -# $Id: install_installer_packages.sh,v 1.32 2005/04/05 10:37:57 den Exp $ -# Install packages for the installer into the ISO-to-be, using -# DragonFly's src/nrelease/Makefile. This assumes a release (or -# quickrel etc) has already been built; it simply (re)installs pkgs. -# Note that this generally requires root privledges. - -SCRIPT=`realpath $0` -SCRIPTDIR=`dirname $SCRIPT` - -[ -r $SCRIPTDIR/build.conf ] && . $SCRIPTDIR/build.conf -. $SCRIPTDIR/build.conf.defaults -. $SCRIPTDIR/pver.conf - -PVERSUFFIX="" -if [ "X$RELEASEBUILD" != "XYES" ]; then - PVERSUFFIX=.`date "+%Y.%m%d"` -fi - -INSTALLER_PACKAGES="libaura-${LIBAURA_VER}${PVERSUFFIX} - libdfui-${LIBDFUI_VER}${PVERSUFFIX} - libinstaller-${LIBINSTALLER_VER}${PVERSUFFIX} - dfuibe_installer-${DFUIBE_INSTALLER_VER}${PVERSUFFIX} - dfuife_curses-${DFUIFE_CURSES_VER}${PVERSUFFIX} - dfuife_cgi-${DFUIFE_CGI_VER}${PVERSUFFIX} - thttpd-notimeout-${THTTPD_NOTIMEOUT_VER}" - -# dfuife_qt is not installed by default, since it requires X11. -if [ "X$INSTALL_DFUIFE_QT" = "XYES" ]; then - INSTALLER_PACKAGES="$INSTALLER_PACKAGES - dfuife_qt-${DFUIFE_QT_VER}${PVERSUFFIX}" - WITH_X11="YES" -fi - -# i18n is not installed by default, only because bsd-gettext needs work. -if [ "X$WITH_NLS" = "XYES" ]; then - INSTALLER_PACKAGES="libiconv-${LIBICONV_VER} - expat-${EXPAT_VER} - gettext-${GETTEXT_VER} - $INSTALLER_PACKAGES" -fi - -# dfuibe_lua is not installed by default, since it's not ready yet. -if [ "X$INSTALL_DFUIBE_LUA" = "XYES" ]; then - INSTALLER_PACKAGES="$INSTALLER_PACKAGES - lua50-${LUA50_VER} - lua50-compat51-${LUA50_COMPAT51_VER} - lua50-posix-${LUA50_POSIX_VER} - lua50-pty-${LUA50_PTY_VER}${PVERSUFFIX} - lua50-filename-${LUA50_FILENAME_VER}${PVERSUFFIX} - lua50-app-${LUA50_APP_VER}${PVERSUFFIX} - lua50-gettext-${LUA50_GETTEXT_VER}${PVERSUFFIX} - lua50-dfui-${LUA50_DFUI_VER}${PVERSUFFIX} - lua50-socket-${LUA50_SOCKET_VER} - dfuibe_lua-${DFUIBE_LUA_VER}${PVERSUFFIX}" -fi - -if [ "X$WITH_X11" = "XYES" ]; then - INSTALLER_PACKAGES="pkgconfig-${PKGCONFIG_VER} - freetype2-${FREETYPE2_VER} - fontconfig-${FONTCONFIG_VER} - X.org-${X_ORG_VER} - png-${PNG_VER} - jpeg-${JPEG_VER} - lcms-${LCMS_VER} - libmng-${LIBMNG_VER} - qt-${QT_VER} - $INSTALLER_PACKAGES" -fi - -CLEAN_PACKAGES="" -for PKG in $INSTALLER_PACKAGES; do - ANYPKG=`echo "$PKG" | sed 's/\\-.*$/\\-\\*/'` - CLEAN_PACKAGES="$CLEAN_PACKAGES '$ANYPKG'" -done - -cd $SRCDIR/nrelease && \ -make pkgcleaniso EXTRA_PACKAGES="$CLEAN_PACKAGES" && \ -make pkgaddiso EXTRA_PACKAGES="$INSTALLER_PACKAGES" && \ -rm -rf $TMPDIR/root_installer && \ -cp -pR $ROOTSKEL $TMPDIR/root_installer && \ -chown -R root:wheel $TMPDIR/root_installer && \ -chmod -R 755 \ - $TMPDIR/root_installer/etc/rc.d \ - $TMPDIR/root_installer/usr/local/bin && \ -make customizeiso EXTRA_ROOTSKELS="$TMPDIR/root_installer $EXTRA_ROOTSKELS" && \ -rm -rf $TMPDIR/root_installer diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/make_installer_image.sh b/contrib/bsdinstaller-1.1.6/scripts/build/make_installer_image.sh deleted file mode 100644 index 91610efb90..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/make_installer_image.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -x - -# $Id: make_installer_image.sh,v 1.3 2005/04/05 10:37:57 den Exp $ -# Trivial driver script for the other four scripts. -# Generally requires root privledges. -# Assumes a 'cd /usr/src/nrelease && make realquickrel' -# (or equivalent) has recently been done. -# Can be run multiple times thereafter. - -SCRIPT=`realpath $0` -SCRIPTDIR=`dirname $SCRIPT` - -[ -r $SCRIPTDIR/build.conf ] && . $SCRIPTDIR/build.conf -. $SCRIPTDIR/build.conf.defaults - -su ${LOCALUSER} -c $SCRIPTDIR/create_installer_tarballs.sh && \ -$SCRIPTDIR/copy_ports_to_portsdir.sh && \ -$SCRIPTDIR/build_installer_packages.sh && \ -$SCRIPTDIR/install_installer_packages.sh && \ -chown -R ${LOCALUSER} ${CVSDIR} diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/pver.conf b/contrib/bsdinstaller-1.1.6/scripts/build/pver.conf deleted file mode 100644 index 3c8fad1a3f..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/pver.conf +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: pver.conf,v 1.24 2005/04/08 05:37:18 cpressey Exp $ -# Current package versions configuration file, shared by all build scripts. - -# Version of the project as a whole -# (used for the source tarball of the entire repo only:) - -INSTALLER_VER=1.1.6 - -# Versions of all the individual installer packages: - -LIBAURA_VER=3.1 -LIBDFUI_VER=4.1 -LIBINSTALLER_VER=5.1 -DFUIFE_CURSES_VER=1.5 -DFUIFE_CGI_VER=1.4 -DFUIFE_QT_VER=1.2 -DFUIBE_INSTALLER_VER=1.1.6 -DFUIBE_LUA_VER=0.4 - -# Versions of support packages: - -LUA50_VER=5.0.2 -LUA50_COMPAT51_VER=5.1.r2 -LUA50_PTY_VER=0.1 -LUA50_GETTEXT_VER=0.1 -LUA50_DFUI_VER=0.1 -LUA50_APP_VER=0.1 -LUA50_FILENAME_VER=0.1 -LUA50_SOCKET_VER=2.0.b3 -LUA50_POSIX_VER=2005.0327 -THTTPD_NOTIMEOUT_VER=2.24 -LIBICONV_VER=1.9.2_1 -EXPAT_VER=1.95.8 -GETTEXT_VER=0.14.1 -PKGCONFIG_VER=0.15.0_1 -FREETYPE2_VER=2.1.7_4 -FONTCONFIG_VER=2.2.3,1 -X_ORG_VER=6.8.1_1 -PNG_VER=1.2.8_1 -JPEG_VER=6b_3 -LCMS_VER=1.14,1 -LIBMNG_VER=1.0.8 -QT_VER=3.3.3_3 diff --git a/contrib/bsdinstaller-1.1.6/scripts/build/remove_installer_packages.sh b/contrib/bsdinstaller-1.1.6/scripts/build/remove_installer_packages.sh deleted file mode 100644 index 4198f4c3b5..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/build/remove_installer_packages.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -x - -# $Id: remove_installer_packages.sh,v 1.3 2005/04/08 07:02:24 cpressey Exp $ -# Remove all BSD Installer packages from the running system. -# Note that this generally requires root privledges. - -SCRIPT=`realpath $0` -SCRIPTDIR=`dirname $SCRIPT` - -[ -r $SCRIPTDIR/build.conf ] && . $SCRIPTDIR/build.conf -. $SCRIPTDIR/build.conf.defaults -. $SCRIPTDIR/pver.conf - -PVERSUFFIX="" -if [ "X$RELEASEBUILD" != "XYES" ]; then - PVERSUFFIX=.`date "+%Y.%m%d"` -fi - -INSTALLER_PACKAGES='libaura-* - libdfui-* - libinstaller-* - dfuibe_* - dfuife_* - thttpd-notimeout-* - lua50-*' - -for PKG in $INSTALLER_PACKAGES; do - pkg_delete -f $PKG || true -done - diff --git a/contrib/bsdinstaller-1.1.6/scripts/report/gen_rel_notes.lua b/contrib/bsdinstaller-1.1.6/scripts/report/gen_rel_notes.lua deleted file mode 100644 index 582e16d994..0000000000 --- a/contrib/bsdinstaller-1.1.6/scripts/report/gen_rel_notes.lua +++ /dev/null @@ -1,56 +0,0 @@ --- $Id: gen_rel_notes.lua,v 1.1 2005/03/03 20:29:03 cpressey Exp $ --- Lua script to generate release notes. --- Usage: lua gen_rel_notes.lua prev_release_tag this_release_tag --- e.g.: lua gen_rel_notes.lua RELENG_1_1_4 RELENG_1_1_5 - -local cvsdir = "/home/catseye/projects/installer" -local tmpdir = "/tmp" -local tmpfn = tmpdir .. "/gen_rel_notes.txt" -local old_tag, new_tag = arg[1], arg[2] -local cmd = "cd " .. cvsdir .. " && cvs log -r" .. old_tag .. ":" .. new_tag .. - " >" .. tmpfn .. " 2>&1" -os.execute(cmd) -local file = io.open(tmpfn) - -local line -local lines, logs - -logs = {} -while true do - lines = {} - line = file:read("*l") - if not line then break end - while not string.find(line, "^===================") do - line = file:read("*l") - if not line then break end - table.insert(lines, line) - end - if not line then break end - table.insert(logs, lines) -end -file:close() - -for logno, logtab in logs do - local found, len, cap - local old_rev, new_rev - if string.find(logtab[1], "^cvs log: warning: no revision") then - logs[logno] = nil - else - for k, v in logtab do - found, len, cap = string.find(logtab[k], "^\t" .. old_tag .. ": (.+)$") - if found then old_rev = cap end - found, len, cap = string.find(logtab[k], "^\t" .. new_tag .. ": (.+)$") - if found then new_rev = cap end - end - if new_rev == old_rev then - logs[logno] = nil - end - end -end - -for logno, logtab in logs do - for k, v in logtab do - print(logno, v) - end - print("") -end diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/Makefile b/contrib/bsdinstaller-1.1.6/src/lib/lua/Makefile deleted file mode 100644 index 5a4e46e389..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Make all Lua modules. -# $Id: Makefile,v 1.5 2005/04/05 20:53:46 cpressey Exp $ - -SUBDIR= app dfui filename gettext pty -TARGETS=all in_cvs clean - -.for _target in ${TARGETS} -${_target}: - @for _subdir in ${SUBDIR}; do \ - echo "===> $${_subdir}" && \ - cd ${.CURDIR}$//$${_subdir} && \ - ${MAKE} ${_target}; \ - done -.endfor diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/app/Makefile b/contrib/bsdinstaller-1.1.6/src/lib/lua/app/Makefile deleted file mode 100644 index 5a86ef3e7f..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/app/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $Id: Makefile,v 1.4 2005/04/05 20:53:46 cpressey Exp $ -# Dummy makefile. - -all: - @echo "No building required." - -in_cvs: all - -clean: - @echo "No cleaning required." diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/app/app.lua b/contrib/bsdinstaller-1.1.6/src/lib/lua/app/app.lua deleted file mode 100644 index cda7581fe2..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/app/app.lua +++ /dev/null @@ -1,748 +0,0 @@ --- app.lua --- $Id: app.lua,v 1.52 2005/04/03 20:59:42 cpressey Exp $ --- Lua-based Application Environment static object. - --- BEGIN app.lua -- - -module("app") - -local POSIX = require("posix") -local FileName = require("filename") -local Pty = require("pty") - ---[[-----]]-- ---[[ App ]]-- ---[[-----]]-- - --- Application Environment - roughly equivalent to --- InstallerContext (or i_fn_args in the C version,) but: --- --- * this version is written purely in Lua, and --- * this version is not specific to the Installer - it could just as well --- be used for any application that needs: --- --- o user interface facilities (highly abstracted) --- o configuration, possibly loaded from config files --- - locations of directories (root dir, temp dir, etc) --- - names of system commands --- - etc --- o application-wide options --- o application-wide state --- o logging --- o temporary files --- --- For simplicity, we consider this to be a singleton or --- "static object" (with a single global "instance" called App.) - -App = {} - --- --- Initialize global stuff. --- - -App.init = function() - App.defaults = { - name = "Unnamed Application", - logfile = "unnamed.log", - dir = { - root = "/", - tmp = "/tmp/" - }, - transport = "tcp", - rendezvous = "9999" - } - - App.last_log_time = -1 - App.conf_path = "" - App.current_script = arg[0] - - App.config = {} - App.option = {} - App.state = {} - - App.add_pkg_path("./lib") - App.add_pkg_path(FileName.dirname(App.current_script) .. "lib") - App.add_conf_path("./conf") - App.add_conf_path(FileName.dirname(App.current_script) .. "conf") - - arg = App.process_cmdline(arg) -end - --- --- Startup and shutdown. --- - -App.start = function(opt) - local k, v - - -- - -- Private function to create a dummy user interface adapter - -- if the App was started without one. - -- - local new_dummy_ui = function() - local method = {} - - method.start = function(method) - App.log("Dummy user interface started") - return true - end - - method.stop = function(method) - App.log("Dummy user interface stopped") - return true - end - - method.present = function(method, tab) - App.dump_table(tab) - return { - action_id = tab.actions[1].id, - datasets = tab.datasets - } - end - - method.inform = function(method, msg) - App.log("INFORM: %s", msg) - return { action_id = "ok", datasets = {} } - end - - method.confirm = function(method, msg) - App.log("CONFIRM: %s", msg) - return true - end - - method.select = function(method, msg, map) - local k, v - App.log("SELECT: %s", msg) - for k, v in map do - return v - end - end - - method.select_file = function(method, tab) - App.log("SELECT FILE: %s", tab.title or "Select File") - return "cancel" - end - - -- - -- Constructor within a constructor, here... - -- - method.new_progress_bar = function(method, tab) - local method = {} - - method.start = function(method) - App.log("START PROGRESS BAR") - return true - end - - method.set_amount = function(method, new_amount) - App.log("SET PROGRESS AMOUNT: %d", new_amount) - return true - end - - method.set_short_desc = function(method, new_short_desc) - App.log("SET PROGRESS DESC: %d", new_short_desc) - return true - end - - method.update = function(method) - App.log("PROGRESS UPDATE: %d", new_amount) - return true - end - - method.stop = function(method) - App.log("STOP PROGRESS BAR") - return true - end - - return method - end - - return method - end - - -- - -- Begin setting up the App. - -- - - -- Set up defaults. - if not opt then - opt = {} - end - - App.merge_tables(opt, App.defaults, function(key, dest_val, src_val) - if not dest_val then - return src_val - else - return dest_val - end - end) - - -- Set name of application. - App.name = opt.name - App.log_filename = opt.logfile - - -- Set up directories, and make sure each ends with a slash. - App.dir = opt.dir - for k, v in App.dir do - if string.sub(v, -1) ~= "/" then - App.dir[k] = v .. "/" - end - end - - -- Determine the operating system. - App.os = {} - App.os.name = App.determine_os_name() - -- App.os.version = App.determine_os_version() - - -- Open our logfile. - App.open_log(App.dir.tmp .. App.log_filename) - App.log(App.name .. " started") - - -- Load command names, if available. - App.cmd_names = App.load_conf("cmdnames") - - -- Set up the ${}-expansion function. - App.expand = function(str, ...) - local ltables = arg or {} - local gtables = {App.cmd_names, App.dir} - - local result = string.gsub(str, "%$%{([%w_]+)%}", function(key) - local i, tab, value - - if table.getn(ltables) > 0 then - for i, tab in ipairs(ltables) do - value = tab[key] - if value then - return value - end - end - end - - if table.getn(gtables) > 0 then - for i, tab in ipairs(gtables) do - value = tab[key] - if value then - return value - end - end - end - - App.log_warn("Could not expand `${%s}'", key) - return "${" .. key .. "}" - end) - - return result - end - - -- Set up temporary files. - App.tmpfile = {} - - -- Set up application-specific containers: - -- config: application configuration - -- option: application-wide options - -- state: application-wide state - App.config = opt.config or App.config - App.option = opt.option or App.option - App.state = opt.state or App.state - - -- Seed the random-number generator. - math.randomseed(os.time()) - - -- Set up the App's UI adapter. - App.ui = opt.ui or new_dummy_ui() - if not App.ui:start() then - App.log_fatal("Could not start user interface") - end -end - -App.stop = function() - App.clean_tmpfiles() - App.ui:stop() - App.log("Shutting down") - App.close_log() -end - -App.process_cmdline = function(arg) - local argn = 1 - local remaining_arg = {} - - while arg[argn] do - if arg[argn] == "-C" then - argn = argn + 1 - App.add_conf_path(arg[argn]) - elseif arg[argn] == "-L" then - argn = argn + 1 - App.add_pkg_path(arg[argn]) - elseif arg[argn] == "-R" then - argn = argn + 1 - local script_name = App.find_script(arg[argn]) or arg[argn] - local ok, result = App.run(script_name) - if not ok then - io.stderr:write("warning: could not run `" .. - tostring(script_name) .. "':\n") - io.stderr:write(result .. "\n") - end - elseif string.find(arg[argn], "=") then - App.set_property(arg[argn]) - else - table.insert(remaining_arg, arg[argn]) - end - - argn = argn + 1 - end - - return remaining_arg -end - --- --- Given a string in the form "foo.bar=baz", set the member "bar" of the --- subtable "foo" of the App object to "baz". --- -App.set_property = function(expr) - local found, len, k, v, c, r, i, t - - t = App.defaults - r = {} - found, len, k, v = string.find(expr, "^(.*)=(.*)$") - for c in string.gfind(k, "[^%.]+") do - table.insert(r, c) - end - for i, c in r do - if i == table.getn(r) then - t[c] = v - else - if not t[c] then - t[c] = {} - end - if type(t[c]) == "table" then - t = t[c] - else - App.log_warn("%s: not a table", tostring(c)) - end - end - end -end - --- --- Add a directory to package.path (used by compat-5.1.) --- -App.add_pkg_path = function(dir) - if package and package.path then - if package.path ~= "" then - package.path = package.path .. ";" - end - package.path = package.path .. tostring(dir) .. "/?.lua" - end -end - --- --- Add a directory to App.conf_path (used by App.load_conf().) --- -App.add_conf_path = function(dir) - if App.conf_path ~= "" then - App.conf_path = App.conf_path .. ";" - end - App.conf_path = App.conf_path .. tostring(dir) .. "/?.lua" -end - --- --- Run a Lua script. --- Note that the script name must be either relative to the --- current working directory, or fully-qualified. --- If relative to the current script, use App.find_script first. --- This function returns two values: --- the first is the success code, either true or false --- if true, the second is the result of the script --- if false, the second is an error message string. --- -App.run = function(script_name, ...) - local save_script = App.current_script - local save_args = ARG - local ok, result, fun, errmsg - - if App.option.fatal_errors then - assert(script_name and type(script_name) == "string", - "bad filename " .. tostring(script_name)) - end - if not script_name or type(script_name) ~= "string" then - return false, "bad filename " .. tostring(script_name) - end - - App.add_pkg_path(FileName.dirname(script_name) .. "lib") - App.add_conf_path(FileName.dirname(script_name) .. "conf") - - fun, errmsg = loadfile(script_name) - - if App.option.fatal_errors then - assert(fun, errmsg) - end - if not fun then - return false, errmsg - end - - App.current_script = script_name - ARG = arg - if App.option.fatal_errors then - ok = true - result = fun() - else - ok, result = pcall(fun) - end - ARG = save_args - App.current_script = save_script - - return ok, result -end - --- --- Find a Lua script. --- -App.find_script = function(script_name) - script_name = FileName.dirname(App.current_script) .. script_name - - if FileName.is_dir(script_name) then - if string.sub(script_name, -1, -1) ~= "/" then - script_name = script_name .. "/" - end - return script_name .. "main.lua" - elseif FileName.is_file(script_name) then - -- - -- Just execute that script. - -- - return script_name - else - -- - -- Couldn't find it relative to the current script. - -- - io.stderr:write("WARNING: could not find `" .. script_name .. "'\n") - return nil - end -end - --- --- Dump the contents of the given table to stdout, --- primarily intended for debugging. --- -App.dump_table = function(tab, indent) - local k, v - - if not indent then - indent = "" - end - - for k, v in tab do - if type(v) == "table" then - print(indent .. tostring(k) .. "=") - App.dump_table(v, indent .. "\t") - else - print(indent .. tostring(k) .. "=" .. tostring(v)) - end - end -end - --- --- Merge two tables by looking at each item from the second (src) --- table and putting a value into the first (dest) table based on --- the result of a provided callback function which receives the --- key and bother values, and returns the resulting value. --- --- An 'overriding' merge can be accomplished with: --- function(key, dest_val, src_val) --- return src_val --- end --- --- A 'non-overriding' merge can be accomplished with: --- function(key, dest_val, src_val) --- if dest_val == nil then --- return src_val --- else --- return dest_val --- end --- end --- -App.merge_tables = function(dest, src, fun) - local k, v - - for k, v in src do - if type(v) == "table" then - if not dest[k] then - dest[k] = {} - end - if type(dest[k]) == "table" then - App.merge_tables(dest[k], v, fun) - end - else - dest[k] = fun(k, dest[k], v) - end - end -end - --- --- Run a script. Expects the full filename (will not search.) --- Displays a nice dialog box if the script contained errors. --- -App.run_script = function(script_name, ...) - local ok, result = App.run(script_name, unpack(arg)) - if ok then - return result - end - App.log_warn("Error occurred while loading script `" .. - tostring(script_name) .. "': " .. tostring(result)) - if App.ui then - App.ui:present{ - id = "script_error", - name = "Error Loading Script", - short_desc = - "An internal Lua error occurred while " .. - "trying to run the script " .. - tostring(script_name) .. ":\n\n" .. - tostring(result), - role = "alert", - actions = { - { - id = "ok", - name = "OK" - } - } - } - end - return nil -end - --- --- Run a sub-application (a script relative to the current script.) --- -App.descend = function(script_name, ...) - return App.run_script(App.find_script(script_name), unpack(arg)) -end - --- --- Wait for a condition to come true. --- Display a (cancellable) progress bar while we wait. --- Returns two values: whether the condition eventually --- did come true, and roughly how long it took (if it --- timed out, this value will be greater than the timeout.) --- -App.wait_for = function(tab) - local predicate = tab.predicate - local timeout = tab.timeout or 30 - local frequency = tab.frequency or 2 - local title = tab.title or "Please wait..." - local short_desc = tab.short_desc or title - local pr - local time_elapsed = 0 - local cancelled = false - - assert(type(predicate) == "function") - - if predicate() then - return true - end - - pr = App.ui:new_progress_bar{ - title = title, - short_desc = short_desc - } - pr:start() - - while time_elapsed < timeout and not cancelled and not result do - POSIX.nanosleep(frequency) - time_elapsed = time_elapsed + frequency - if predicate() then - return true, time_elapsed - end - pr:set_amount((time_elapsed * 100) / timeout) - cancelled = not pr:update() - end - - pr:stop() - - return false, time_elapsed -end - --- --- Configuration file loading. --- - -App.locate_conf = function(name) - local comp - - for comp in string.gfind(App.conf_path, "[^;]+") do - comp = string.gsub(comp, "?", name) - if FileName.is_file(comp) then - return comp - end - end - - return nil -end - -App.load_conf = function(name) - local filename = App.locate_conf(name) - - if filename ~= nil then - App.log("Loading configuration file '%s'...", filename) - return App.run_script(filename) - else - App.log_warn("Could not locate configuration file '%s'!", name) - return nil - end -end - --- --- Logging. --- - -App.open_log = function(filename, mode) - if App.log_file then - return - end - if not mode then - mode = "w" - end - local fh, err = io.open(filename, mode) - App.log_file = nil - if fh then - App.log_file = fh - else - error(err) - end -end - -App.close_log = function() - if App.log_file then - App.log_file:close() - App.log_file = nil - end -end - -App.log = function(str, ...) - local stamp = math.floor(os.time()) - local line = "" - - local write_log = function(s) - s = s .. "\n" - io.stderr:write(s) - if App.log_file then - App.log_file:write(s) - App.log_file:flush() - end - end - - if stamp > App.last_log_time then - App.last_log_time = stamp - write_log("[" .. os.date() .. "]") - end - - write_log(string.format(str, unpack(arg))) -end - -App.log_warn = function(str, ...) - App.log("WARNING: " .. str, unpack(arg)) -end - -App.log_fatal = function(str, ...) - App.log(str, unpack(arg)) - error(str) -end - -App.view_log = function() - local contents = "" - local fh - - App.close_log() - - fh = io.open(App.dir.tmp .. App.log_filename, "r") - for line in fh:lines() do - contents = contents .. line .. "\n" - end - fh:close() - - App.ui:present({ - id = "app_log", - name = App.name .. ": Log", - short_desc = contents, - role = "informative", - minimum_width = "72", - monospaced = "true", - actions = { - { id = "ok", name = "OK" } - } - }) - - App.open_log(App.dir.tmp .. App.log_filename, "a") -end - --- --- Temporary file handling. --- - -App.clean_tmpfiles = function() - local filename, unused - - for filename, unused in App.tmpfile do - App.log("Deleting tmpfile: " .. filename) - os.remove(App.dir.tmp .. filename) - end -end - --- Registers that the given file (which resides in App.dir.tmp) --- is a temporary file, and may be deleted when upon exit. -App.register_tmpfile = function(filename) - App.tmpfile[filename] = 1 -end - --- Creates and opens a new temporary file (in App.dir.tmp). --- If the filename is omitted, one is chosen using the mkstemp --- system call. If the mode is omitted, updating ("w+") is --- assumed. The file object and the file name are returned. -App.open_tmpfile = function(filename, mode) - local fh, err - - if not filename then - fh, filename = POSIX.mkstemp(App.dir.tmp .. "Lua.XXXXXXXX") - filename = FileName.basename(filename) - else - fh, err = io.open(App.dir.tmp .. filename, mode or "w+") - if err then - return nil, err - end - end - App.register_tmpfile(filename) - return fh, filename -end - --- --- Operating system determination. --- NOTE: this is pretty weak - this is before we have --- loaded the command locations, and sysctl could be anywhere on path. --- Besides, this should be overridable somehow on principle. --- Perhaps even hard-coded. --- - -App.determine_os_name = function() - local pty = Pty.open("sysctl -n kern.ostype") - local osname = pty:readline() - pty:close() - return osname -end - --- --- More debugging. --- Install logging wrappers around every method in a class/object. --- -App.log_methods = function(obj_method_table) - local k, v - for k, v in pairs(obj_method_table) do - local method_name, orig_fun = k, method[k] - method[k] = function(...) - App.log("ENTERING: %s", method_name) - orig_fun(unpack(arg)) - App.log("EXITED: %s", method_name) - end - end -end - -return App - --- END of lib/app.lua -- diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/Makefile b/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/Makefile deleted file mode 100644 index ca6cd52bbf..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Makefile for luadfui. -# $Id: Makefile,v 1.6 2005/04/05 20:53:46 cpressey Exp $ - -OSTYPE!=sysctl -n kern.ostype - -COMPAT?=/usr/local/lib/lua/compat-5.1r2 - -LIB= ldfui.so -OBJS= common.o dfui.o progress.o compat-5.1.o - -WARNS= -W -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ - -Wpointer-arith -Wno-uninitialized -Wreturn-type -Wcast-qual \ - -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wchar-subscripts \ - -Winline -Wnested-externs -Wredundant-decls - -CFLAGS+=${WARNS} -.ifdef DEBUG -CFLAGS+= -DDEBUG -g -.endif -CFLAGS+=-I/usr/local/include -I${COMPAT} - -.if ${OSTYPE} == "NetBSD" -CFLAGS+=-I/usr/pkg/include -LDADD+= -L/usr/pkg/lib -.endif - -LDADD+= -L/usr/local/lib/ -ldfui -laura -lm -llua50 -llualib50 - -all: ${LIB} - -# XXX build and link to dependencies here -in_cvs: all - -${LIB}: ${OBJS} - ${CC} ${CFLAGS} ${OBJS} -static ${LDADD} -shared -o ${LIB} - -compat-5.1.o: ${COMPAT}/compat-5.1.c - ${CC} ${CFLAGS} -c ${COMPAT}/compat-5.1.c - -clean: - rm -f *.o *.so diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/common.c b/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/common.c deleted file mode 100644 index 481da2512a..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/common.c +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (c) 2004 Scott Ullrich - * Portions Copyright (c) 2004 Chris Pressey - * - * Copyright (c) 2004 The DragonFly Project. - * All rights reserved. - * - * This code is derived from software contributed to The DragonFly Project - * by Scott Ullrich and Chris Pressey (see above for e-mail addresses). - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. Neither the name of The DragonFly Project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific, prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDERS, CONTRIBUTORS OR VOICES IN THE AUTHOR'S HEAD - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * common.c - common functions for dfuibe_lua - * $Id: common.c,v 1.56 2005/04/04 13:56:37 den Exp $ - */ - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "lua50/lua.h" -#include "lua50/lauxlib.h" -#include "lua50/lualib.h" - -#include "lua_dfui.h" - -/*----------------------------- utilities ---------------------------*/ - -/* - * Given the names of two global variables, the first a regular - * 'Class' table, and the second a metatable which will be attached - * to all object 'instances': - * - add an __index property to the metatable that redirects - * all accesses on the instance to the class table; - * - add a __metatable propery to the metatable, to hide it. - */ -void -lua_set_instance_handler(lua_State *L, - const char *table_name, const char *metatable_name) -{ - int metatable_idx, methods_idx; - - lua_pushstring(L, table_name); /* name of our 'class' table */ - lua_gettable(L, LUA_GLOBALSINDEX); /* get it from globals */ - methods_idx = lua_gettop(L); /* Find its position on the stack */ - - lua_pushstring(L, metatable_name); /* name of our metatable */ - lua_gettable(L, LUA_GLOBALSINDEX); /* get it from globals */ - metatable_idx = lua_gettop(L); /* Find its position on the stack */ - - /* - * Add __index event to metatable (metatable.__index = methods). - * This lets the Lua script refer to the methods by indexing - * the instance variable like so: x:y(z). - */ - lua_pushliteral(L, "__index"); - lua_pushvalue(L, methods_idx); - lua_settable(L, metatable_idx); - - lua_pushliteral(L, "__metatable"); /* hide metatable */ - lua_pushvalue(L, methods_idx); - lua_settable(L, metatable_idx); /* metatable.__metatable = methods */ - - lua_pop(L, 2); -} - -/* - * Retrieve a string from a Lua table. - */ -const char * -lua_access_table_string(lua_State *L, int table_idx, const char *key) -{ - const char *s; - - lua_pushlstring(L, key, strlen(key)); - lua_gettable(L, table_idx); - if (lua_isstring(L, lua_gettop(L))) { - s = luaL_checkstring(L, lua_gettop(L)); - } else { - s = ""; - } - lua_pop(L, 1); - - return(s); -} - -/* - * This function is adapted from liolib.c: push a FILE * onto the - * Lua stack as a file object that Lua's file module understands. - */ -void -lua_pushfileptr(lua_State *L, FILE *f) -{ - FILE **pf; - - pf = (FILE **)lua_newuserdata(L, sizeof(FILE *)); - *pf = f; - luaL_getmetatable(L, "FILE*"); - lua_setmetatable(L, -2); -} - -void -lua_show_debug(lua_State *L) -{ - lua_Debug X; - - lua_getstack(L, 0, &X); - lua_getinfo(L, "nluS", &X); - fprintf(stderr, "--+-- BEGIN Lua Debug Info --+--\n"); - fprintf(stderr, "source: %s\n", X.short_src); - fprintf(stderr, "linedefined: %d\n", X.linedefined); - fprintf(stderr, "what: %s\n", X.what); - fprintf(stderr, "name: %s\n", X.name); - fprintf(stderr, "namewhat: %s\n", X.namewhat); - fprintf(stderr, "nups: %d\n", X.nups); - fprintf(stderr, "--+-- END Lua Debug Info --+--\n"); -} - -/*------------------------ module entry point ----------------------*/ - -LUA_API int -luaopen_ldfui(lua_State *L) -{ - int container_idx; - - /* - * Push a new table, which will contain all of our sub-packages, - * and right before it, push the name that we will give it. - */ - lua_pushstring(L, "DFUI"); - lua_newtable(L); - - /* - * Find out where the table is, so we can refer to it easily. - */ - container_idx = lua_gettop(L); - - /* - * Initialize each sub-package and push it on the stack, then - * assign it to a slot in our master table. - */ - - lua_pushliteral(L, "Connection"); - lua_dfui_register(L); - lua_settable(L, container_idx); - - lua_pushliteral(L, "Progress"); - lua_dfui_progress_register(L); - lua_settable(L, container_idx); - - /* - * Now that all that is done, put our master table into the - * globals table, using the name we gave it at the beginning. - */ - lua_settable(L, LUA_GLOBALSINDEX); - - /* - * Get our master table out of the globals and push it onto - * the stack, so we can return it to whatever script require()d us. - */ - lua_pushstring(L, "DFUI"); - lua_gettable(L, LUA_GLOBALSINDEX); - - return(1); -} diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/dfui.c b/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/dfui.c deleted file mode 100644 index 9ebea2a0df..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/dfui.c +++ /dev/null @@ -1,649 +0,0 @@ -/* - * Copyright (c) 2004 Scott Ullrich - * Portions Copyright (c) 2004 Chris Pressey - * - * Copyright (c) 2004 The DragonFly Project. - * All rights reserved. - * - * This code is derived from software contributed to The DragonFly Project - * by Scott Ullrich and Chris Pressey (see above for e-mail addresses). - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. Neither the name of The DragonFly Project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific, prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDERS, CONTRIBUTORS OR VOICES IN THE AUTHOR'S HEAD - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * dfui.c - libdfui Bindings for Lua - * $Id: dfui.c,v 1.64 2005/04/04 13:56:37 den Exp $ - */ - -#include -#include -#include - -#include "dfui/dfui.h" -#include "dfui/dump.h" -#include "dfui/system.h" - -#include "lua50/lua.h" -#include "lua50/lauxlib.h" -#include "lua50/lualib.h" - -#include "lua_dfui.h" - -LUA_CHECK_FUNCTION(dfui_connection, "DFUIConnection", struct dfui_connection *) -LUA_PUSH_FUNCTION(dfui_connection, "DFUIConnection", struct dfui_connection *) - -#define DFUI_OBJ_FORM 1 -#define DFUI_OBJ_FIELD 2 -#define DFUI_OBJ_ACTION 3 - -static void -dfui_field_options_from_lua_table(lua_State *L, struct dfui_field *fi) -{ - lua_pushnil(L); - while (lua_next(L, -2) != 0) { - if (lua_isstring(L, -1)) { - dfui_field_option_add(fi, lua_tostring(L, -1)); - } - lua_pop(L, 1); - } -} - -static void -set_dfui_properties_from_lua_table(lua_State *L, int table_idx, - int dfui_obj_type, void *dfui_obj) -{ - const char *key, *value; - - /* - * Traverse the table, looking for key->value pairs that we can use - * to modify the field. - * For each entry, if it is standard (id, name, short_desc, long_desc) - * ignore it; if it is anything else, assume it is a property. - */ - lua_pushnil(L); - while (lua_next(L, table_idx) != 0) { - if (lua_isstring(L, -2) && lua_isstring(L, -1)) { - key = lua_tostring(L, -2); - value = lua_tostring(L, -1); - - if (strcmp(key, "id") == 0 || - strcmp(key, "name") == 0 || - strcmp(key, "short_desc") == 0 || - strcmp(key, "long_desc") == 0) { - /* - * Skip it, we've already done it. - */ - } else if (strcmp(key, "multiple") == 0 && - dfui_obj_type == DFUI_OBJ_FORM) { - dfui_form_set_multiple( - (struct dfui_form *)dfui_obj, - strcmp(value, "true") == 0 - ); - } else if (strcmp(key, "extensible") == 0 && - dfui_obj_type == DFUI_OBJ_FORM) { - dfui_form_set_extensible( - (struct dfui_form *)dfui_obj, - strcmp(value, "true") == 0 - ); - } else { - /* - * It's a property. - */ - switch (dfui_obj_type) { - case DFUI_OBJ_FORM: - dfui_form_property_set( - (struct dfui_form *)dfui_obj, - key, value); - break; - case DFUI_OBJ_FIELD: - dfui_field_property_set( - (struct dfui_field *)dfui_obj, - key, value); - break; - case DFUI_OBJ_ACTION: - dfui_action_property_set( - (struct dfui_action *)dfui_obj, - key, value); - break; - } - } - } else if (lua_isstring(L, -2) && lua_istable(L, -1)) { - key = lua_tostring(L, -2); - if (strcmp(key, "options") == 0 && - dfui_obj_type == DFUI_OBJ_FIELD) { - dfui_field_options_from_lua_table(L, - (struct dfui_field *)dfui_obj - ); - } - } else { - /* - * Either the key or the value is not a string, - * so just skip it. - */ - } - - /* - * Remove the value, but leave the key for the next iteration. - */ - lua_pop(L, 1); - } -} - -/*** TRANSLATORS ***/ - -/* - * Pop a Lua table representing a DFUI action from the Lua stack, - * create a new DFUI action from it, and return it. - */ -static struct dfui_action * -dfui_action_from_lua_table(lua_State *L, int table_idx) -{ - struct dfui_action *a; - const char *id, *name, *short_desc, *long_desc; - - /* - * Get the basic properties of the action. - */ - id = lua_access_table_string(L, table_idx, "id"); - name = lua_access_table_string(L, table_idx, "name"); - short_desc = lua_access_table_string(L, table_idx, "short_desc"); - long_desc = lua_access_table_string(L, table_idx, "long_desc"); - - /* - * Create the initial action. - */ - a = dfui_action_new(id, - dfui_info_new(name, short_desc, long_desc)); - - set_dfui_properties_from_lua_table(L, table_idx, DFUI_OBJ_ACTION, a); - - lua_pop(L, 1); - return(a); -} - -/* - * Pop a Lua table representing a DFUI field from the Lua stack, - * create a new DFUI field from it, and return it. - */ -static struct dfui_field * -dfui_field_from_lua_table(lua_State *L, int table_idx) -{ - struct dfui_field *fi; - const char *id, *name, *short_desc, *long_desc; - - /* - * Get the basic properties of the field. - */ - id = lua_access_table_string(L, table_idx, "id"); - name = lua_access_table_string(L, table_idx, "name"); - short_desc = lua_access_table_string(L, table_idx, "short_desc"); - long_desc = lua_access_table_string(L, table_idx, "long_desc"); - - /* - * Create the initial field. - */ - fi = dfui_field_new(id, - dfui_info_new(name, short_desc, long_desc)); - - set_dfui_properties_from_lua_table(L, table_idx, DFUI_OBJ_FIELD, fi); - - lua_pop(L, 1); - return(fi); -} - -/* - * Pop a Lua table representing a DFUI dataset from the Lua stack, - * create a new DFUI dataset from it, and return it. - */ -static struct dfui_dataset * -dfui_dataset_from_lua_table(lua_State *L, int table_idx) -{ - struct dfui_dataset *ds; - - /* - * Create the initial dataset. - */ - ds = dfui_dataset_new(); - - /* - * Traverse the table, looking for key->value pairs that we can use. - */ - lua_pushnil(L); - while (lua_next(L, table_idx) != 0) { - if (lua_isstring(L, -2) && lua_isstring(L, -1)) { - dfui_dataset_celldata_add(ds, - lua_tostring(L, -2), lua_tostring(L, -1) - ); - } else { - /* Bogus, just skip it */ - } - - /* - * Remove the value, but leave the key for the next iteration. - */ - lua_pop(L, 1); - } - - /* - * Remove the table. - */ - lua_pop(L, 1); - return(ds); -} - -/* - * Pop a Lua table representing a DFUI form from the Lua stack, - * create a new DFUI form from it, and return it. - */ -static struct dfui_form * -dfui_form_from_lua_table(lua_State *L, int table_idx) -{ - struct dfui_form *f; - struct dfui_action *a; - struct dfui_field *fi; - struct dfui_dataset *ds; - const char *id, *name, *short_desc, *long_desc; - int list_idx, subtable_idx, counter, done; - - /* - * Get the basic properties of the form. - */ - id = lua_access_table_string(L, table_idx, "id"); - name = lua_access_table_string(L, table_idx, "name"); - short_desc = lua_access_table_string(L, table_idx, "short_desc"); - long_desc = lua_access_table_string(L, table_idx, "long_desc"); - - /* - * Create the initial form. - */ - f = dfui_form_new(id, dfui_info_new(name, short_desc, long_desc)); - - set_dfui_properties_from_lua_table(L, table_idx, DFUI_OBJ_FORM, f); - - /* - * Get the list of actions attached to the form. - */ - lua_pushliteral(L, "actions"); - lua_gettable(L, table_idx); - list_idx = lua_gettop(L); - if (lua_istable(L, list_idx)) { - /* - * Loop through all entries in this table, creating - * and attaching a new action for each one. - */ - counter = 1; - done = 0; - while (!done) { - lua_pushnumber(L, counter++); - lua_gettable(L, list_idx); - subtable_idx = lua_gettop(L); - if (lua_istable(L, subtable_idx)) { - a = dfui_action_from_lua_table(L, subtable_idx); - dfui_form_action_attach(f, a); - } else { - done = 1; - } - } - } else { - /* No actions */ - } - lua_pop(L, 1); - - /* - * Get the list of fields attached to the form. - */ - lua_pushliteral(L, "fields"); - lua_gettable(L, table_idx); - list_idx = lua_gettop(L); - if (lua_istable(L, list_idx)) { - /* - * Loop through all entries in this table, creating - * and attaching a new field for each one. - */ - counter = 1; - done = 0; - while (!done) { - lua_pushnumber(L, counter++); - lua_gettable(L, list_idx); - subtable_idx = lua_gettop(L); - if (lua_istable(L, subtable_idx)) { - fi = dfui_field_from_lua_table(L, subtable_idx); - dfui_form_field_attach(f, fi); - } else { - done = 1; - } - } - } else { - /* No fields */ - } - lua_pop(L, 1); - - /* - * Get the list of datasets attached to the form. - */ - lua_pushliteral(L, "datasets"); - lua_gettable(L, table_idx); - list_idx = lua_gettop(L); - if (lua_istable(L, list_idx)) { - /* - * Loop through all entries in this table, creating - * and attaching a new dataset for each one. - */ - counter = 1; - done = 0; - while (!done) { - lua_pushnumber(L, counter++); - lua_gettable(L, list_idx); - subtable_idx = lua_gettop(L); - if (lua_istable(L, subtable_idx)) { - ds = dfui_dataset_from_lua_table(L, subtable_idx); - dfui_form_dataset_add(f, ds); - } else { - done = 1; - } - } - } else { - /* No datasets */ - } - lua_pop(L, 1); - - /* - * Finally, delete the table representing the form by - * popping it from the top of the stack. - */ - lua_pop(L, 1); - - return(f); -} - -/* - * Push a new Lua table representing the given DFUI response - * onto the Lua stack. - */ -static int -lua_table_from_dfui_response(lua_State *L, struct dfui_response *r) -{ - int table_idx, list_idx, subtable_idx; - struct dfui_dataset *ds; - struct dfui_celldata *cd; - const char *value; - int counter = 1; - const char *f_id, *a_id; - - lua_newtable(L); - table_idx = lua_gettop(L); - - /* - * Add response id's to the table. - */ - f_id = dfui_response_get_form_id(r); - a_id = dfui_response_get_action_id(r); - - lua_pushliteral(L, "form_id"); - lua_pushlstring(L, f_id, strlen(f_id)); - lua_settable(L, table_idx); - - lua_pushliteral(L, "action_id"); - lua_pushlstring(L, a_id, strlen(a_id)); - lua_settable(L, table_idx); - - /* - * Create 'datasets' lists to the table. - */ - lua_pushliteral(L, "datasets"); - lua_newtable(L); - list_idx = lua_gettop(L); - - /* - * Add response datasets to the 'datasets' list. - */ - for (ds = dfui_response_dataset_get_first(r); ds != NULL; - ds = dfui_dataset_get_next(ds)) { - lua_pushnumber(L, counter++); - lua_newtable(L); - subtable_idx = lua_gettop(L); - /* - * Populate this subtable with the celldatas... - */ - for (cd = dfui_dataset_celldata_get_first(ds); cd != NULL; - cd = dfui_celldata_get_next(cd)) { - f_id = dfui_celldata_get_field_id(cd); - value = dfui_celldata_get_value(cd); - lua_pushlstring(L, f_id, strlen(f_id)); - lua_pushlstring(L, value, strlen(value)); - lua_settable(L, subtable_idx); - } - /* - * Add this subtable to the list - */ - lua_settable(L, list_idx); - } - - /* - * Add the 'datasets' list to the table. - */ - lua_settable(L, table_idx); - - return(table_idx); -} - -/*** CONSTRUCTOR & DESTRUCTOR ***/ - -static int -lua_dfui_connection_new(lua_State *L) -{ - const char *transport_string, *rendezvous; - int transport; - struct dfui_connection *c; - - transport_string = luaL_checkstring(L, 1); - rendezvous = luaL_checkstring(L, 2); - if (! (transport = get_transport(transport_string)) > 0) { - lua_pushnil(L); - return(1); - } - c = dfui_connection_new(transport, rendezvous); - lua_push_dfui_connection(L, c); - return(1); -} - -static int -lua_dfui_connection_destroy(lua_State *L) -{ - struct dfui_connection *c; - - c = (struct dfui_connection *)lua_unboxpointer(L, 1); - if (c != NULL) { - dfui_be_stop(c); - dfui_connection_free(c); - } - return(0); -} - -/*** BOUND METHODS ***/ - -static int -lua_dfui_be_start(lua_State *L) -{ - struct dfui_connection *c; - int result; - - c = lua_check_dfui_connection(L, 1); - result = dfui_be_start(c); - lua_pushnumber(L, result); - - return(1); -} - -static int -lua_dfui_be_stop(lua_State *L) -{ - struct dfui_connection *c; - int result; - - c = lua_check_dfui_connection(L, 1); - result = dfui_be_stop(c); - lua_pushnumber(L, result); - - return(1); -} - -static int -lua_dfui_be_present(lua_State *L) -{ - struct dfui_connection *c; - struct dfui_form *f; - struct dfui_response *r; - int response_table_idx, actions_list_idx, action_table_idx; - const char *a_a_id, *r_a_id; - - c = lua_check_dfui_connection(L, 1); - luaL_checktype(L, 2, LUA_TTABLE); - - f = dfui_form_from_lua_table(L, 2); - - if (dfui_be_present(c, f, &r)) { - response_table_idx = lua_table_from_dfui_response(L, r); - - r_a_id = dfui_response_get_action_id(r); - - /* - * Handle the 'effect' key which may be given in - * any action table within a form table. When it - * is given, it should be a function which the - * user wishes to be executed automatically when - * the response is caused by that action. This lets - * the user write simpler Lua code (c:present(f) can - * execute things directly, instead of returning an - * id code which the user must look up in a table etc.) - */ - /* - * First, look for an 'actions' list in the form table. - */ - lua_pushliteral(L, "actions"); - lua_gettable(L, 2); - actions_list_idx = lua_gettop(L); - if (lua_istable(L, actions_list_idx)) { - int i = 1; - int done = 0; - - /* - * Look in the 'actions' list for - * action tables. - */ - while (!done) { - lua_rawgeti(L, actions_list_idx, i); - action_table_idx = lua_gettop(L); - if (lua_istable(L, action_table_idx)) { - /* - * See if this action's 'id' - * is the response's action_id - * (which we saved above.) - */ - a_a_id = lua_access_table_string(L, - action_table_idx, "id"); - if (strcmp(r_a_id, a_a_id) == 0) { - /* - * It is. So, see if action - * table has an 'effect' key. - */ - lua_pushliteral(L, "result"); - lua_pushliteral(L, "effect"); - lua_gettable(L, action_table_idx); - if (lua_isfunction(L, lua_gettop(L))) { - /* - * It is, and it's a function. - * Execute it. - */ - lua_call(L, 0, 1); - lua_rawset(L, response_table_idx); - done = 1; - } else { - lua_pop(L, 2); - } - } - } else { - done = 1; - } - lua_pop(L, 1); /* remove the action table */ - i++; - } - } - lua_pop(L, 1); /* remove the 'actions' list */ - } else { - lua_pushnil(L); - } - - dfui_response_free(r); - dfui_form_free(f); - return(1); -} - -/**** Binding Tables ****/ - -const luaL_reg dfui_connection_methods[] = { - {"new", lua_dfui_connection_new }, - {"start", lua_dfui_be_start }, - {"stop", lua_dfui_be_stop }, - {"present", lua_dfui_be_present }, - {0, 0} -}; - -const luaL_reg dfui_connection_meta_methods[] = { - {"__gc", lua_dfui_connection_destroy }, - {0, 0} -}; - - -/*** REGISTRATION ***/ - -LUA_API int -lua_dfui_register(lua_State *L) -{ - luaL_openlib(L, "DFUIConnection", - dfui_connection_methods, 0); /* fill methods table */ - luaL_openlib(L, "DFUIConnectionMeta", - dfui_connection_meta_methods, 0); /* fill metatable */ - lua_pop(L, 1); - - lua_set_instance_handler(L, - "DFUIConnection", "DFUIConnectionMeta"); - - return(1); -} diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/dfui.lua b/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/dfui.lua deleted file mode 100644 index 9ab353c3a6..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/dfui.lua +++ /dev/null @@ -1,190 +0,0 @@ --- $Id: dfui.lua,v 1.32 2005/04/03 20:46:01 cpressey Exp $ --- Wrapper/helper/extra abstractions for DFUI. - ---[[------]]-- ---[[ DFUI ]]-- ---[[------]]-- - --- --- This is a wrapper object around DFUI.Connection and DFUI.Progress, --- intended to be used as a "UI adapter" for the App object. --- - -module("dfui") - -DFUI = require "ldfui" -local POSIX = require "posix" - -DFUI.log = function(fmt, ...) - print(string.format(fmt, unpack(arg))) -end - -DFUI.new = function(tab) - local dfui = {} - local transport = tab.transport or "tcp" - local rendezvous = tab.rendezvous or "9999" - local connection - - dfui.start = function(dfui) - connection = DFUI.Connection.new(transport, rendezvous) - if connection:start() == 0 then - connection:stop() - DFUI.log("Could not establish DFUI connection " .. - " on %s:%s", transport, rendezvous) - return false - end - DFUI.log("DFUI connection on %s:%s successfully established", - transport, rendezvous) - return true - end - - dfui.stop = function(dfui) - return connection:stop() - end - - dfui.present = function(dfui, tab) - return connection:present(tab) - end - - -- - -- Handy dialogs. (Perhaps a bit too handy?) - -- - - dfui.inform = function(dfui, msg) - return connection:present({ - id = "inform", - name = "Information", - short_desc = msg, - role = "informative", - actions = { - { - id = "ok", - name = "OK" - } - } - }) - end - - dfui.confirm = function(dfui, msg) - return connection:present({ - id = "confirm", - name = "Are you SURE?", - short_desc = msg, - role = "alert", - actions = { - { - id = "ok", - name = "OK" - }, - { - id = "cancel", - name = "Cancel" - } - } - }).action_id == "ok" - end - - dfui.select = function(dfui, msg, map) - local action = {} - local consequence = {} - local id_num = 0 - local k, v - - for k, v in map do - table.insert(action, { - id = tostring(id_num), - name = k - }) - consequence[tostring(id_num)] = v - id_num = id_num + 1 - end - - return consequence[connection:present({ - id = "select", - name = "Please Select", - short_desc = msg, - role = "informative", - actions = action - }).action_id] - end - - dfui.select_file = function(dfui, tab) - local title = tab.title or "Select File" - local short_desc = tab.short_desc or title - local long_desc = tab.long_desc or "" - local cancel_desc = tab.cancel_desc or "Cancel" - local dir = assert(tab.dir) - local ext = tab.ext or nil - local files, i, filename - - local form = { - id = "select_file", - name = title, - short_desc = short_desc, - long_desc = long_desc, - - role = "menu", - - actions = {} - } - - files = POSIX.dir(dir) - table.sort(files) - for i, filename in files do - if not ext or string.find(filename, "%." .. ext .. "$") then - table.insert(form.actions, { - id = filename, - name = filename - }) - end - end - - table.insert(form.actions, { - id = "cancel", - name = cancel_desc - }) - - return connection:present(form).action_id - end - - -- - -- Constructor within a constructor, here... - -- - dfui.new_progress_bar = function(dfui, tab) - local method = {} - local pr - local title = tab.title or "Working..." - local short_desc = tab.short_desc or title - local long_desc = tab.long_desc or "" - local amount = 0 - - pr = DFUI.Progress.new(connection, - title, short_desc, long_desc, amount) - - method.start = function(method) - return pr:start() - end - - method.set_amount = function(method, new_amount) - return pr:set_amount(new_amount) - end - - method.set_short_desc = function(method, new_short_desc) - return pr:set_short_desc(new_short_desc) - end - - method.update = function(method) - return pr:update() - end - - method.stop = function(method) - return pr:stop() - end - - return method - end - - return dfui -end - -return DFUI diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/lua_dfui.h b/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/lua_dfui.h deleted file mode 100644 index 2e5d704e08..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/lua_dfui.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2004 Scott Ullrich - * Portions Copyright (c) 2004 Chris Pressey - * - * Copyright (c) 2004 The DragonFly Project. - * All rights reserved. - * - * This code is derived from software contributed to The DragonFly Project - * by Scott Ullrich and Chris Pressey (see above for e-mail addresses). - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. Neither the name of The DragonFly Project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific, prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDERS, CONTRIBUTORS OR VOICES IN THE AUTHOR'S HEAD - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * lua_dfui.h - * $Id: lua_dfui.h,v 1.69 2005/02/22 07:16:48 cpressey Exp $ - */ - -#ifndef _LUA_DFUI_H_ -#define _LUA_DFUI_H_ - -/* - * Macro to define a function that checks that the Lua - * data object at `index' on Lua's stack is a userdata object - * of Lua type `sname' and C type `type'. - * If not, the function throws a Lua error, but if so, - * it returns the object. - */ -#define LUA_CHECK_FUNCTION(name, sname, type) \ -type lua_check_##name(lua_State *, int); \ -type \ -lua_check_##name(lua_State *L, int ch_index) \ -{ \ - luaL_checktype(L, ch_index, LUA_TUSERDATA); \ - lua_getmetatable(L, ch_index); \ - lua_pushliteral(L, sname "Meta"); \ - lua_rawget(L, LUA_GLOBALSINDEX); \ - if (!lua_rawequal(L, -1, -2)) \ - luaL_typerror(L, ch_index, sname); \ - lua_pop(L, 2); \ - return((type)lua_unboxpointer(L, ch_index)); \ -} - -/* - * Macro to definate a function which pushes a - * Lua `sname' object onto Lua's stack. - */ -#define LUA_PUSH_FUNCTION(name, sname, type) \ -type lua_push_##name(lua_State *, type); \ -type \ -lua_push_##name(lua_State *L, type x) \ -{ \ - lua_boxpointer(L, x); \ - lua_pushliteral(L, sname "Meta"); \ - lua_gettable(L, LUA_GLOBALSINDEX); \ - lua_setmetatable(L, -2); \ - return(x); \ -} - -struct dfui_connection; - -void lua_set_instance_handler(lua_State *L, - const char *table_name, const char *metatable_name); -const char *lua_access_table_string(lua_State *, int, const char *); -void lua_show_debug(lua_State *); -void lua_pushfileptr(lua_State *, FILE *); - -LUA_API int lua_dfui_register(lua_State *); -LUA_API int lua_dfui_progress_register(lua_State *); - -LUA_API int luaopen_ldfui(lua_State *); - -#endif /* !_DFUIBE_LUA_H_ */ diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/progress.c b/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/progress.c deleted file mode 100644 index ef0a55c1f0..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/dfui/progress.c +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright (c) 2004 Chris Pressey - * - * Copyright (c) 2004 The DragonFly Project. - * All rights reserved. - * - * This code is derived from software contributed to The DragonFly Project - * by Scott Ullrich and Chris Pressey (see above for e-mail addresses). - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. Neither the name of The DragonFly Project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific, prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDERS, CONTRIBUTORS OR VOICES IN THE AUTHOR'S HEAD - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * progress.c - libdfui Progress Bar bindings for Lua - * $Id: progress.c,v 1.16 2005/04/04 13:56:37 den Exp $ - */ - -#include -#include -#include -#include - -#include "dfui/dfui.h" - -#include "lua50/lua.h" -#include "lua50/lauxlib.h" -#include "lua50/lualib.h" - -#include "lua_dfui.h" - -/*** Prototypes ***/ - -struct dfui_connection *lua_check_dfui_connection(lua_State *, int); -struct dfui_connection *lua_push_dfui_connection(lua_State *, struct dfui_connection *); - -/*** Structures ***/ - -struct lua_dfui_progress { - struct dfui_connection *c; - struct dfui_progress *pr; -}; - -LUA_CHECK_FUNCTION(dfui_progress, "DFUIProgress", struct lua_dfui_progress *) -LUA_PUSH_FUNCTION(dfui_progress, "DFUIProgress", struct lua_dfui_progress *) - -/*** CONSTRUCTOR & DESTRUCTOR ***/ - -static int -lua_dfui_progress_new(lua_State *L) -{ - const char *name, *short_desc, *long_desc; - struct lua_dfui_progress *ldp; - int amount; - - if ((ldp = malloc(sizeof(struct lua_dfui_progress))) == NULL) { - lua_pushnil(L); - lua_pushnumber(L, ENOMEM); - return(2); - } - - ldp->c = lua_check_dfui_connection(L, 1); - name = luaL_checkstring(L, 2); - short_desc = luaL_checkstring(L, 3); - long_desc = luaL_checkstring(L, 4); - amount = lua_tonumber(L, 5); - - ldp->pr = dfui_progress_new(dfui_info_new(name, short_desc, long_desc), amount); - - lua_push_dfui_progress(L, ldp); - return(1); -} - -static int -lua_dfui_progress_destroy(lua_State *L) -{ - struct lua_dfui_progress *ldp; - - ldp = (struct lua_dfui_progress *)lua_unboxpointer(L, 1); - if (ldp != NULL) { - /* - * We didn't allocate the connection, - * so we don't free it here either. - */ - dfui_progress_free(ldp->pr); - free(ldp); - } - return(0); -} - -/*** BOUND METHODS ***/ - -static int -lua_dfui_progress_begin(lua_State *L) -{ - struct lua_dfui_progress *ldp; - - ldp = lua_check_dfui_progress(L, 1); - dfui_be_progress_begin(ldp->c, ldp->pr); - - return(0); -} - -static int -lua_dfui_progress_end(lua_State *L) -{ - struct lua_dfui_progress *ldp; - - ldp = lua_check_dfui_progress(L, 1); - dfui_be_progress_end(ldp->c); - - return(0); -} - -static int -lua_dfui_progress_update(lua_State *L) -{ - struct lua_dfui_progress *ldp; - int cancelled; - - ldp = lua_check_dfui_progress(L, 1); - dfui_be_progress_update(ldp->c, ldp->pr, &cancelled); - - lua_pushboolean(L, !cancelled); - return(1); -} - -static int -lua_dfui_progress_set_amount(lua_State *L) -{ - struct lua_dfui_progress *ldp; - int amount; - - ldp = lua_check_dfui_progress(L, 1); - amount = lua_tonumber(L, 2); - dfui_progress_set_amount(ldp->pr, amount); - - return(0); -} - -static int -lua_dfui_progress_set_short_desc(lua_State *L) -{ - struct lua_dfui_progress *ldp; - const char *short_desc; - - ldp = lua_check_dfui_progress(L, 1); - short_desc = luaL_checkstring(L, 2); - dfui_info_set_short_desc(dfui_progress_get_info(ldp->pr), short_desc); - - return(0); -} - -/**** Binding Tables ****/ - -const luaL_reg dfui_progress_methods[] = { - {"new", lua_dfui_progress_new }, - {"start", lua_dfui_progress_begin }, - {"stop", lua_dfui_progress_end }, - {"update", lua_dfui_progress_update }, - {"set_amount", lua_dfui_progress_set_amount }, - {"set_short_desc", lua_dfui_progress_set_short_desc }, - {0, 0} -}; - -const luaL_reg dfui_progress_meta_methods[] = { - {"__gc", lua_dfui_progress_destroy }, - {0, 0} -}; - - -/*** REGISTRATION ***/ - -LUA_API int -lua_dfui_progress_register(lua_State *L) -{ - luaL_openlib(L, "DFUIProgress", - dfui_progress_methods, 0); /* fill methods table */ - luaL_openlib(L, "DFUIProgressMeta", - dfui_progress_meta_methods, 0); /* fill metatable */ - lua_pop(L, 1); - - lua_set_instance_handler(L, "DFUIProgress", "DFUIProgressMeta"); - - return(1); -} diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/filename/Makefile b/contrib/bsdinstaller-1.1.6/src/lib/lua/filename/Makefile deleted file mode 100644 index dc99a0faba..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/filename/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $Id: Makefile,v 1.3 2005/04/05 20:53:46 cpressey Exp $ -# Dummy makefile. - -all: - @echo "No building required." - -in_cvs: all - -clean: - @echo "No cleaning required." diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/filename/filename.lua b/contrib/bsdinstaller-1.1.6/src/lib/lua/filename/filename.lua deleted file mode 100644 index 6bd7500194..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/filename/filename.lua +++ /dev/null @@ -1,143 +0,0 @@ --- $Id: filename.lua,v 1.1 2005/03/29 20:58:31 cpressey Exp $ - -module("filename") - -local POSIX = require("posix") - ---[[----------]]-- ---[[ FileName ]]-- ---[[----------]]-- - --- --- Package of routines for manipulating filenames. --- Also contains convenience functions for querying the --- status of files in the filesystem named by those filenames. --- - -FileName = {} - --- --- Add a trailing slash to a pathname, if needed. --- -FileName.add_trailing_slash = function(path) - if string.sub(path, -1) ~= "/" then - return path .. "/" - else - return path - end -end - --- --- Remove any leading slash from a pathname. --- -FileName.remove_leading_slash = function(path) - if string.sub(path, 1, 1) == "/" then - return string.sub(path, 2) - else - return path - end -end - --- --- Remove the trailing slash of a pathname, if present. --- -FileName.remove_trailing_slash = function(path) - if string.sub(path, -1) == "/" then - return string.sub(path, 1, string.len(path) - 1) - else - return path - end -end - --- --- Pure Lua version of dirname. --- -FileName.dirname = function(path) - while true do - if path == "" or - string.sub(path, -1) == "/" or - string.sub(path, -2) == "/." or - string.sub(path, -3) == "/.." or - (string.sub(path, -1) == "." and - string.len(path) == 1) or - (string.sub(path, -2) == ".." and - string.len(path) == 2) then - break - end - path = string.sub(path, 1, -2) - end - if path == "" then - path = "." - end - if string.sub(path, -1) ~= "/" then - path = path .. "/" - end - - return path -end - --- --- Pure Lua version of basename. --- -FileName.basename = function(path) - local i = string.len(path) - - while string.sub(path, i, i) == "/" and i > 0 do - path = string.sub(path, 1, i - 1) - i = i - 1 - end - while i > 0 do - if string.sub(path, i, i) == "/" then - break - end - i = i - 1 - end - if i > 0 then - path = string.sub(path, i + 1, -1) - end - if path == "" then - path = "/" - end - - return path -end - --- --- Query file status in the underlying file system. --- If the given file is the thing the test is asking for, return 'true'. --- If it's not that type of thing, but it does exist, return 'false'. --- If it doesn't even exist, return 'nil'. --- - -FileName.is_dir = function(path) - local stat = POSIX.stat(path) - - if not stat then - return nil - else - return stat.type == "directory" - end -end - -FileName.is_file = function(path) - local stat = POSIX.stat(path) - - if not stat then - return nil - else - return stat.type == "regular" - end -end - -FileName.is_program = function(path) - local stat = POSIX.stat(path) - - if not stat then - return nil - else - return stat.type == "regular" and - string.sub(stat.mode, 9, 9) == "x" - end -end - -return FileName diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/Makefile b/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/Makefile deleted file mode 100644 index 6ebdb4de36..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Makefile for luagettext. -# $Id: Makefile,v 1.6 2005/04/05 20:53:46 cpressey Exp $ - -OSTYPE!=sysctl -n kern.ostype - -COMPAT?=/usr/local/lib/lua/compat-5.1r2 - -OBJS= lua_gettext.o compat-5.1.o - -WARNS= -W -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ - -Wpointer-arith -Wno-uninitialized -Wreturn-type -Wcast-qual \ - -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wchar-subscripts \ - -Winline -Wnested-externs -Wredundant-decls - -CFLAGS+=${WARNS} -.ifdef DEBUG -CFLAGS+= -DDEBUG -g -.endif -CFLAGS+=-I/usr/local/include -I${COMPAT} - -.if ${OSTYPE} == "NetBSD" -CFLAGS+=-I/usr/pkg/include -LDADD+= -L/usr/pkg/lib -.endif - -LDADD+= -L/usr/local/lib/ -lintl -lm -llua50 -llualib50 - -all: lgettext.so - -in_cvs: all - -lgettext.so: ${OBJS} - ${CC} ${CFLAGS} ${OBJS} -static ${LDADD} -shared -o lgettext.so - -compat-5.1.o: ${COMPAT}/compat-5.1.c - ${CC} ${CFLAGS} -c ${COMPAT}/compat-5.1.c - -clean: - rm -f *.o *.so diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/gettext.lua b/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/gettext.lua deleted file mode 100644 index 99c50e42bc..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/gettext.lua +++ /dev/null @@ -1,15 +0,0 @@ --- gettext.lua --- $Id: gettext.lua,v 1.5 2005/02/23 20:53:17 cpressey Exp $ --- Lua wrapper functions for Lua 5.0.x gettext binding. - --- BEGIN gettext.lua -- - -GetText = require("lgettext") - -function _(str, ...) - return string.format(GetText.translate(str), unpack(arg)) -end - -return GetText - --- END of gettext.lua -- diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/lua_gettext.c b/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/lua_gettext.c deleted file mode 100644 index 5bd9fa4dce..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/gettext/lua_gettext.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * $Id: lua_gettext.c,v 1.9 2005/04/04 13:56:37 den Exp $ - */ - -#include -#include -#include - -#include "libintl.h" - -/*** Prototypes ***/ - -LUA_API int luaopen_lgettext(lua_State *); - -/*** Globals ***/ - -const char *package = ""; -const char *locale_dir = ""; - -/*** Methods ***/ - -static int -lua_gettext_init(lua_State *L __unused) -{ - setlocale(LC_ALL, ""); - bindtextdomain(package, locale_dir); - textdomain(package); - - return(0); -} - -static int -lua_gettext_set_package(lua_State *L) -{ - package = luaL_checkstring(L, 1); - - return(0); -} - -static int -lua_gettext_set_locale_dir(lua_State *L) -{ - locale_dir = luaL_checkstring(L, 1); - - return(0); -} - -static int -lua_gettext_translate(lua_State *L) -{ - lua_pushstring(L, gettext(luaL_checkstring(L, 1))); - lua_pushstring(L, luaL_checkstring(L, 1)); - - return(1); -} - -/**** Binding Tables ****/ - -const luaL_reg gettext_methods[] = { - {"init", lua_gettext_init }, - {"set_package", lua_gettext_set_package }, - {"set_locale_dir", lua_gettext_set_locale_dir }, - {"translate", lua_gettext_translate }, - - {0, 0} -}; - -/*** REGISTER ***/ - -LUA_API int -luaopen_lgettext(lua_State *L) -{ - luaL_openlib(L, "GetText", gettext_methods, 0); - - return(1); -} diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/Makefile b/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/Makefile deleted file mode 100644 index 9a07b9ab70..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: Makefile,v 1.4 2005/04/05 20:53:47 cpressey Exp $ - -OSTYPE!=sysctl -n kern.ostype - -CC?= cc -WARNS= -W -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ - -Wpointer-arith -Wno-uninitialized -Wreturn-type -Wcast-qual \ - -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wchar-subscripts \ - -Winline -Wnested-externs -Wredundant-decls -LOCALBASE?=/usr/local - -CFLAGS+=${WARNS} -.ifdef DEBUG -CFLAGS+= -DDEBUG -g -.endif -CFLAGS+=-I/usr/local/include - -.if ${OSTYPE} == "NetBSD" -CFLAGS+=-I/usr/pkg/include -LDADD+= -L/usr/pkg/lib -.endif - -LDADD+= -L/usr/local/lib/ -lutil -lm -llua50 -llualib50 - -all: lpty.so - -in_cvs: all - -lpty.so: pty.o - ${CC} ${CFLAGS} pty.o -static ${LDADD} -shared -o lpty.so - -pty.o: pty.c - ${CC} ${CFLAGS} -c pty.c -o pty.o - -clean: - rm -rf *.so *.o diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/pty.c b/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/pty.c deleted file mode 100644 index 9c40353ec7..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/pty.c +++ /dev/null @@ -1,380 +0,0 @@ -/* - * pty.c - pty bindings for Lua - * $Id: pty.c,v 1.21 2005/04/04 13:56:37 den Exp $ - * - * This file was derived in part from DragonFly BSD's - * src/usr.bin/script/script.c, which contains the following license: - */ -/* - * Copyright (c) 1980, 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "lua50/lua.h" -#include "lua50/lauxlib.h" -#include "lua50/lualib.h" - -#ifdef WEXITSTATUS -#define WEXIT_TYPE int -#else -#define WEXIT_TYPE union wait -#endif - -struct lua_pty { - FILE *stream; - pid_t child; -}; - -#define PTY_TIMEOUT -1 -#define PTY_EOF -2 - -LUA_API int luaopen_lpty(lua_State *); - -/*** UTILTIES ***/ - -/* - * Given the names of two global variables, the first a regular - * 'Class' table, and the second a metatable which will be attached - * to all object 'instances': - * - add an __index property to the metatable that redirects - * all accesses on the instance to the class table; - * - add a __metatable propery to the metatable, to hide it. - */ -static void -lua_set_instance_handler(lua_State *L, - const char *table_name, const char *metatable_name) -{ - int metatable_idx, methods_idx; - - lua_pushstring(L, table_name); /* name of our 'class' table */ - lua_gettable(L, LUA_GLOBALSINDEX); /* get it from globals */ - methods_idx = lua_gettop(L); /* Find its position on the stack */ - - lua_pushstring(L, metatable_name); /* name of our metatable */ - lua_gettable(L, LUA_GLOBALSINDEX); /* get it from globals */ - metatable_idx = lua_gettop(L); /* Find its position on the stack */ - - /* - * Add __index event to metatable (metatable.__index = methods). - * This lets the Lua script refer to the methods by indexing - * the instance variable like so: x:y(z). - */ - lua_pushliteral(L, "__index"); - lua_pushvalue(L, methods_idx); - lua_settable(L, metatable_idx); - - lua_pushliteral(L, "__metatable"); /* hide metatable */ - lua_pushvalue(L, methods_idx); - lua_settable(L, metatable_idx); /* metatable.__metatable = methods */ - - lua_pop(L, 2); -} - -/*** STACK ACCESS ***/ - -static struct lua_pty * -lua_check_pty(lua_State *L, int ch_index) -{ - luaL_checktype(L, ch_index, LUA_TUSERDATA); - lua_getmetatable(L, ch_index); - lua_pushliteral(L, "PtyMeta"); - lua_rawget(L, LUA_GLOBALSINDEX); - if (!lua_rawequal(L, -1, -2)) - luaL_typerror(L, ch_index, "Pty"); - lua_pop(L, 2); - return((struct lua_pty *)lua_unboxpointer(L, ch_index)); -} - -static struct lua_pty * -lua_push_pty(lua_State *L, struct lua_pty *x) -{ - lua_boxpointer(L, x); - lua_pushliteral(L, "PtyMeta"); - lua_gettable(L, LUA_GLOBALSINDEX); - lua_setmetatable(L, -2); - return(x); -} - -/*** CONSTRUCTOR/DESTRUCTOR ***/ - -static int -lua_pty_open(lua_State *L) -{ - struct lua_pty *pty; - int master, slave; - - pty = malloc(sizeof(struct lua_pty)); - if (pty == NULL) { - lua_pushnil(L); - lua_pushnumber(L, ENOMEM); - return(2); - } - pty->stream = NULL; - if (openpty(&master, &slave, NULL, NULL, NULL) == -1) { - lua_pushnil(L); - lua_pushnumber(L, errno); - return(2); - } - - pty->child = fork(); - if (pty->child < 0) { - lua_pushnil(L); - lua_pushnumber(L, errno); - return(2); - } - if (pty->child == 0) { - const char *shell = "/bin/sh"; - - close(master); - login_tty(slave); - execl(shell, shell, "-c", luaL_checkstring(L, 1), NULL); - /* if we made it here, an error occurred! */ - } - close(slave); - - /* - * Convert the file descriptor into a stream, or die trying. - */ - if ((pty->stream = fdopen(master, "r+")) == NULL) { - WEXIT_TYPE status; - - kill(pty->child, SIGTERM); - if (waitpid(pty->child, (int *)&status, 0) != pty->child) { - lua_pushnil(L); - lua_pushnumber(L, errno); - return(2); - } - lua_pushnil(L); - lua_pushnumber(L, errno); - return(2); - } - - lua_push_pty(L, pty); - return(1); -} - -/******* METHODS *******/ - -static int -lua_pty_readline(lua_State *L) -{ - struct lua_pty *pty; - long msec = 0; - int n, len; - char line[4096]; - fd_set rfd; - struct timeval tv; - struct timeval *tvp = NULL; - - pty = lua_check_pty(L, 1); - if (lua_isnumber(L, 2)) { - msec = lua_tonumber(L, 2); - tvp = &tv; - } - lua_pop(L, 2); - - FD_ZERO(&rfd); - FD_SET(fileno(pty->stream), &rfd); - if (tvp != NULL) { - tv.tv_sec = msec / 1000; - tv.tv_usec = (msec % 1000) * 1000; - } - n = select(fileno(pty->stream) + 1, &rfd, 0, 0, tvp); - if (n < 0) { - lua_pushnil(L); - lua_pushnumber(L, errno); - return(2); - } else if (n > 0 && FD_ISSET(fileno(pty->stream), &rfd)) { - if (fgets(line, sizeof(line) - 1, pty->stream) == NULL) { - lua_pushnil(L); - if (feof(pty->stream)) - lua_pushnumber(L, PTY_EOF); - else - lua_pushnumber(L, errno); - return(2); - } else { - len = strlen(line); - while (len > 0 && (line[len - 1] == '\n' || - line[len - 1] == '\r')) { - line[--len] = '\0'; - } - lua_pushstring(L, line); - return(1); - } - } else { - lua_pushnil(L); - lua_pushnumber(L, PTY_TIMEOUT); - return(2); - } -} - -static int -lua_pty_write(lua_State *L) -{ - struct lua_pty *pty; - const char *string; - - pty = lua_check_pty(L, 1); - string = luaL_checkstring(L, 2); - lua_pop(L, 2); - - fwrite(string, 1, strlen(string), pty->stream); - return(0); -} - -static int -lua_pty_flush(lua_State *L) -{ - struct lua_pty *pty; - int result; - - pty = lua_check_pty(L, 1); - - result = fflush(pty->stream); - lua_pushnumber(L, result); - return(1); -} - -static int -lua_pty_close(lua_State *L) -{ - struct lua_pty *pty; - WEXIT_TYPE status; - int e = 0; - - pty = lua_check_pty(L, 1); - - if (pty->stream == NULL) { - /* - * It's already been closed. - * Don't try to close it again. - */ - lua_pushnumber(L, -1); - return(1); - } - - fclose(pty->stream); - pty->stream = NULL; - - if (waitpid(pty->child, (int *)&status, 0) != pty->child) { - lua_pushnil(L); - lua_pushnumber(L, errno); - return(2); - } - - if (WIFEXITED(status)) { - e = WEXITSTATUS(status); - } else if (WIFSIGNALED(status)) { - e = WTERMSIG(status); - } else { - /* Only happens when system is out of file descriptors */ - e = 1; - } - - lua_pushnumber(L, e); - return(1); -} - -static int -lua_pty_signal(lua_State *L) -{ - struct lua_pty *pty; - int signo, result; - - pty = lua_check_pty(L, 1); - signo = luaL_checkint(L, 2); - result = kill(pty->child, signo); - lua_pushnumber(L, result); - - return(1); -} - -/**** Binding Tables ****/ - -const luaL_reg pty_methods[] = { - {"open", lua_pty_open }, - {"readline", lua_pty_readline }, - {"write", lua_pty_write }, - {"flush", lua_pty_flush }, - {"close", lua_pty_close }, - {"signal", lua_pty_signal }, - {0, 0} -}; - -const luaL_reg pty_meta_methods[] = { - {"__gc", lua_pty_close }, - {0, 0} -}; - -/*** REGISTER ***/ - -LUA_API int -luaopen_lpty(lua_State *L) -{ - int methods_idx; - - luaL_openlib(L, "Pty", pty_methods, 0); /* fill methods table */ - luaL_openlib(L, "PtyMeta", pty_meta_methods, 0); /* fill metatable */ - lua_pop(L, 1); - - lua_set_instance_handler(L, "Pty", "PtyMeta"); - - /* - * Add some symbolic constants. - */ - methods_idx = lua_gettop(L); - - lua_pushliteral(L, "TIMEOUT"); - lua_pushnumber(L, PTY_TIMEOUT); - lua_settable(L, methods_idx); - - lua_pushliteral(L, "EOF"); - lua_pushnumber(L, PTY_EOF); - lua_settable(L, methods_idx); - - lua_pushliteral(L, "SIGTERM"); - lua_pushnumber(L, SIGTERM); - lua_settable(L, methods_idx); - - return(1); -} diff --git a/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/pty.lua b/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/pty.lua deleted file mode 100644 index f9c9156814..0000000000 --- a/contrib/bsdinstaller-1.1.6/src/lib/lua/pty/pty.lua +++ /dev/null @@ -1,8 +0,0 @@ --- $Id: pty.lua,v 1.1 2005/04/03 19:52:01 cpressey Exp $ --- Lua wrapper functions for Lua 5.0.x Pty (pseudo-terminal) binding. - -module("pty") - -Pty = require("lpty") - -return Pty -- 2.41.0