Merge branch '3.3' into 3.4

5 files changed, 186 insertions, 0 deletions

diff --git a/dev86/.footprint b/dev86/.footprint
new file mode 100644
index 000000000..75adc0760
--- /dev/null
+++ b/dev86/.footprint
@@ -0,0 +1,142 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/ar86
+-rwxr-xr-x	root/root	usr/bin/bcc
+-rwxr-xr-x	root/root	usr/bin/dis86
+-rwxr-xr-x	root/root	usr/bin/makeboot
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/bcc/
+-rwxr-xr-x	root/root	usr/lib/bcc/as86_encap
+-rwxr-xr-x	root/root	usr/lib/bcc/bcc-cc1
+-rwxr-xr-x	root/root	usr/lib/bcc/bcc-cpp
+-rwxr-xr-x	root/root	usr/lib/bcc/copt
+-rw-r--r--	root/root	usr/lib/bcc/crt0.o
+drwxr-xr-x	root/root	usr/lib/bcc/i386/
+-rw-r--r--	root/root	usr/lib/bcc/i386/crt0.o
+-rw-r--r--	root/root	usr/lib/bcc/i386/libc.a
+-rw-r--r--	root/root	usr/lib/bcc/i386/rules.386
+-rw-r--r--	root/root	usr/lib/bcc/i386/rules.end
+-rw-r--r--	root/root	usr/lib/bcc/i386/rules.start
+drwxr-xr-x	root/root	usr/lib/bcc/include/
+-rw-r--r--	root/root	usr/lib/bcc/include/a.out.h
+-rw-r--r--	root/root	usr/lib/bcc/include/ar.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/arch/
+-rw-r--r--	root/root	usr/lib/bcc/include/arch/errno.h
+-rw-r--r--	root/root	usr/lib/bcc/include/arch/ioctl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/arch/stat.h
+-rw-r--r--	root/root	usr/lib/bcc/include/arch/types.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/asm/
+-rw-r--r--	root/root	usr/lib/bcc/include/asm/limits.h
+-rw-r--r--	root/root	usr/lib/bcc/include/asm/types.h
+-rw-r--r--	root/root	usr/lib/bcc/include/assert.h
+-rw-r--r--	root/root	usr/lib/bcc/include/bios.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/bsd/
+-rw-r--r--	root/root	usr/lib/bcc/include/bsd/bsd.h
+-rw-r--r--	root/root	usr/lib/bcc/include/bsd/errno.h
+-rw-r--r--	root/root	usr/lib/bcc/include/bsd/sgtty.h
+-rw-r--r--	root/root	usr/lib/bcc/include/bsd/signal.h
+-rw-r--r--	root/root	usr/lib/bcc/include/bsd/stdlib.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/bsd/sys/
+-rw-r--r--	root/root	usr/lib/bcc/include/bsd/sys/ttychars.h
+-rw-r--r--	root/root	usr/lib/bcc/include/bsd/tzfile.h
+-rw-r--r--	root/root	usr/lib/bcc/include/bsd/unistd.h
+-rw-r--r--	root/root	usr/lib/bcc/include/conio.h
+-rw-r--r--	root/root	usr/lib/bcc/include/ctype.h
+-rw-r--r--	root/root	usr/lib/bcc/include/dirent.h
+-rw-r--r--	root/root	usr/lib/bcc/include/dos.h
+-rw-r--r--	root/root	usr/lib/bcc/include/errno.h
+-rw-r--r--	root/root	usr/lib/bcc/include/fcntl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/features.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/generic/
+-rw-r--r--	root/root	usr/lib/bcc/include/generic/errno.h
+-rw-r--r--	root/root	usr/lib/bcc/include/generic/fcntl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/generic/types.h
+-rw-r--r--	root/root	usr/lib/bcc/include/getopt.h
+-rw-r--r--	root/root	usr/lib/bcc/include/grp.h
+-rw-r--r--	root/root	usr/lib/bcc/include/limits.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/linux/
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/errno.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/fcntl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/ioctl.h (EMPTY)
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/mman.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/resource.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/stat.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/termios.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/types.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/utsname.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linux/vm86.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/linuxmt/
+-rw-r--r--	root/root	usr/lib/bcc/include/linuxmt/errno.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linuxmt/fcntl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linuxmt/ioctl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linuxmt/resource.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linuxmt/stat.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linuxmt/termios.h
+-rw-r--r--	root/root	usr/lib/bcc/include/linuxmt/types.h
+-rw-r--r--	root/root	usr/lib/bcc/include/malloc.h
+-rw-r--r--	root/root	usr/lib/bcc/include/math.h (EMPTY)
+-rw-r--r--	root/root	usr/lib/bcc/include/memory.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/msdos/
+-rw-r--r--	root/root	usr/lib/bcc/include/msdos/errno.h
+-rw-r--r--	root/root	usr/lib/bcc/include/msdos/fcntl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/msdos/types.h
+-rw-r--r--	root/root	usr/lib/bcc/include/paths.h
+-rw-r--r--	root/root	usr/lib/bcc/include/pwd.h
+-rw-r--r--	root/root	usr/lib/bcc/include/regexp.h
+-rw-r--r--	root/root	usr/lib/bcc/include/regmagic.h
+-rw-r--r--	root/root	usr/lib/bcc/include/search.h
+-rw-r--r--	root/root	usr/lib/bcc/include/setjmp.h
+-rw-r--r--	root/root	usr/lib/bcc/include/signal.h
+-rw-r--r--	root/root	usr/lib/bcc/include/stdarg.h
+-rw-r--r--	root/root	usr/lib/bcc/include/stddef.h
+-rw-r--r--	root/root	usr/lib/bcc/include/stdio.h
+-rw-r--r--	root/root	usr/lib/bcc/include/stdlib.h
+-rw-r--r--	root/root	usr/lib/bcc/include/string.h
+-rw-r--r--	root/root	usr/lib/bcc/include/strings.h
+drwxr-xr-x	root/root	usr/lib/bcc/include/sys/
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/cdefs.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/errno.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/fcntl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/file.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/ioctl.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/mman.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/param.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/resource.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/signal.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/socket.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/stat.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/time.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/times.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/types.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/utsname.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/vm86.h
+-rw-r--r--	root/root	usr/lib/bcc/include/sys/wait.h
+-rw-r--r--	root/root	usr/lib/bcc/include/termcap.h
+-rw-r--r--	root/root	usr/lib/bcc/include/termio.h
+-rw-r--r--	root/root	usr/lib/bcc/include/termios.h
+-rw-r--r--	root/root	usr/lib/bcc/include/time.h
+-rw-r--r--	root/root	usr/lib/bcc/include/unistd.h
+-rw-r--r--	root/root	usr/lib/bcc/include/utime.h
+-rw-r--r--	root/root	usr/lib/bcc/include/utmp.h
+-rw-r--r--	root/root	usr/lib/bcc/include/varargs.h
+-rw-r--r--	root/root	usr/lib/bcc/libbcc.a
+-rw-r--r--	root/root	usr/lib/bcc/libbsd.a
+-rw-r--r--	root/root	usr/lib/bcc/libc.a
+-rw-r--r--	root/root	usr/lib/bcc/libc_f.a
+-rw-r--r--	root/root	usr/lib/bcc/libc_s.a
+-rw-r--r--	root/root	usr/lib/bcc/libdos.a
+-rw-r--r--	root/root	usr/lib/bcc/rules.186
+-rw-r--r--	root/root	usr/lib/bcc/rules.386
+-rw-r--r--	root/root	usr/lib/bcc/rules.86
+-rw-r--r--	root/root	usr/lib/bcc/rules.end
+-rw-r--r--	root/root	usr/lib/bcc/rules.i
+-rw-r--r--	root/root	usr/lib/bcc/rules.net
+-rw-r--r--	root/root	usr/lib/bcc/rules.start
+-rwxr-xr-x	root/root	usr/lib/bcc/unproto
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/bcc.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/dis86.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/elks.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/elksemu.1.gz
diff --git a/dev86/.md5sum b/dev86/.md5sum
new file mode 100644
index 000000000..7ccce7d29
--- /dev/null
+++ b/dev86/.md5sum
@@ -0,0 +1,2 @@
+6b96fe9d2d1c546842a4d1c7ef387e4c  Dev86src-0.16.21.tar.gz
+6ff720dfd80656026524ef8a683570ad  bin86-x86_64.patch
diff --git a/dev86/.signature b/dev86/.signature
new file mode 100644
index 000000000..765e6f904
--- /dev/null
+++ b/dev86/.signature
@@ -0,0 +1,6 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF30ukj/0MGtQ5I9+SkmEL12oM7GgfPknh0dSgI7YKmypagULjBf2WgpKblbxsS3ZrSHcRxGXZqxz+OfWjy0ZdMAQ=
+SHA256 (Pkgfile) = f9fdc867bdcd0432784217d4dc58170065a4f829833e90bd0261c229140f0bc0
+SHA256 (.footprint) = 25fa88e34c0eb228dc353c6d3a66f3ddc7c381895c3418811c3fb1a664f2544e
+SHA256 (Dev86src-0.16.21.tar.gz) = 234b110e6df9b7f6843e2ee53473127c2211243a16748f229fc0127845f68d94
+SHA256 (bin86-x86_64.patch) = 3b41a07f6b31de8124d015f4526b9c1427771c3d7c9bd3bcbf888992f966bb47
diff --git a/dev86/Pkgfile b/dev86/Pkgfile
new file mode 100644
index 000000000..ed7d1c842
--- /dev/null
+++ b/dev86/Pkgfile
@@ -0,0 +1,22 @@
+# Description: cross development C compiler environment for the production of 8086 executables.
+# URL:         http://v3.sk/~lkundrak/dev86/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+
+name=dev86
+version=0.16.21
+release=3
+source=(http://v3.sk/~lkundrak/dev86/Dev86src-$version.tar.gz
+	bin86-x86_64.patch)
+
+build() {
+	cd $name-$version
+	patch -p1 -i $SRC/bin86-x86_64.patch
+	sed -i -e 's,/man/,/share/man/,' dis88/Makefile
+
+	echo quit | make -j1 PREFIX=/usr GCCFLAG="$CFLAGS -D_POSIX_SOURCE"
+	make -j1 install-all PREFIX=/usr MANDIR=/usr/share/man DIST=$PKG
+
+	rm -f $PKG/usr/bin/{as,ld,nm,objdump,size}86
+	rm -f $PKG/usr/share/man/man1/{as,ld}86.1
+}
+
diff --git a/dev86/bin86-x86_64.patch b/dev86/bin86-x86_64.patch
new file mode 100644
index 000000000..aec13e22f
--- /dev/null
+++ b/dev86/bin86-x86_64.patch
@@ -0,0 +1,14 @@
+diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
+--- bin86-0.16.14-orig/ld/x86_aout.h    2004-11-07 20:07:31.506442000 +0100
++++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100
+@@ -12,6 +12,9 @@
+ #if defined(i386) || defined(__BCC__) || defined(MSDOS)
+ typedef long Long;
+ #define __OUT_OK 1
++#elif defined(__x86_64__)
++typedef int Long;
++#define __OUT_OK 1
+ #else
+ typedef char Long[4];
+ #endif
+