dev86: new maintainer. fix mandir. add bin86 fix.

Update mandir to usr/share/man.
Remove unnecessary copt patch. Was fixed in v0.16.20.
Add core/bin86 patch for ld86. It could be used by the build time
 bcc (ncc), so incorporate it here.

6 files changed, 38 insertions, 31 deletions

diff --git a/dev86/.footprint b/dev86/.footprint
index bc44be0e2..75adc0760 100644
--- a/dev86/.footprint
+++ b/dev86/.footprint
@@ -133,9 +133,10 @@ drwxr-xr-x	root/root	usr/lib/bcc/include/sys/
 -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/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/bcc.1.gz
--rw-r--r--	root/root	usr/man/man1/dis86.1.gz
--rw-r--r--	root/root	usr/man/man1/elks.1.gz
--rw-r--r--	root/root	usr/man/man1/elksemu.1.gz
+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
index 16c614baa..7ccce7d29 100644
--- a/dev86/.md5sum
+++ b/dev86/.md5sum
@@ -1 +1,2 @@
 6b96fe9d2d1c546842a4d1c7ef387e4c  Dev86src-0.16.21.tar.gz
+6ff720dfd80656026524ef8a683570ad  bin86-x86_64.patch
diff --git a/dev86/.signature b/dev86/.signature
index fcbd120af..418930e33 100644
--- a/dev86/.signature
+++ b/dev86/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zkQ6iGhetWECCpj4ROBlSunOrukXd+b/51aa1f2iCgVB6llZatL3Dw8eWooLtmxhHPdvvfC6jDLXDSDcCHgwg4=
-SHA256 (Pkgfile) = f51aec08726db89cf2b3fba6a00f43494f2882cf718ba8626f77ea9baef11e0c
-SHA256 (.footprint) = 8c5fdf0e75a0bb3d9346b81cc4c81e2087a86fca5fcea81e80c2c4aae6e7abde
+RWSagIOpLGJF38Uv4QA2zAmdT1k6qNLVG+SIC2Hj6GDfTO6coP2v5eRkAK75q/sZTv7S7v8/6FFBwSNBs5VgTaZuwGW6Gm+u3w8=
+SHA256 (Pkgfile) = a45274b0245eaccf87f441dec08d9b71304699d9a2def16fdc9f63d35a421492
+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
index 6014693a5..cc35c5c0a 100644
--- a/dev86/Pkgfile
+++ b/dev86/Pkgfile
@@ -1,21 +1,22 @@
 # Description: cross development C compiler environment for the production of 8086 executables.
-# URL: http://homepage.ntlworld.com/robert.debath/dev86/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Jose V Beneyto, sepen at crux dot nu
-# Depends on:
+# URL:         http://v3.sk/~lkundrak/dev86/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 
 name=dev86
 version=0.16.21
-release=1
-source=(http://v3.sk/~lkundrak/dev86/Dev86src-$version.tar.gz)
+release=2
+source=(http://v3.sk/~lkundrak/dev86/Dev86src-$version.tar.gz
+	bin86-x86_64.patch)
 
 build() {
-  cd $name-$version
+	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"
-  make -j1 install-all DIST=$PKG
+	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/man/man1/{as,ld}86.1
+	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
+
diff --git a/dev86/dev86-copt.patch b/dev86/dev86-copt.patch
deleted file mode 100644
index d239b999a..000000000
--- a/dev86/dev86-copt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- copt/copt.c.orig	2003-10-08 04:46:35.000000000 +0900
-+++ copt/copt.c	2010-10-12 12:30:25.000000000 +0900
-@@ -174,7 +174,7 @@ static char *readline(FILE *fp)
-   /* Delete leading white spaces */
-   for (cp = buf; *cp && isspace(*cp); cp++) ;
-   if (cp != buf && *cp)
--	strcpy(buf, cp);
-+	memmove(buf, cp, strlen(cp) + 1);
- 
-   return(buf);
- }