Permalink
Browse files

Improvements to btxld ebuild

  • Loading branch information...
1 parent b5bab11 commit 27ed9c0274b279b7fffded6f279be8acbdf0e29a @ryao committed Apr 29, 2012
@@ -6,7 +6,7 @@ EAPI=4
inherit eutils
-DESCRIPTION="Support library for standalone executables from FreeBSD"
+DESCRIPTION="Link editor for BTX clients from FreeBSD"
HOMEPAGE="http://www.freebsd.org/"
SRC_URI="mirror://gentoo/freebsd-usbin-${PV}.tar.bz2
mirror://gentoo/freebsd-sys-${PV}.tar.bz2"
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"
src_prepare() {
- epatch "${FILESDIR}/${P}-endian.patch"
+ epatch "${FILESDIR}/${P}-libbsd-headers.patch"
sed -i 's/a_midmag/a_info/g' "${S}/sys/sys/imgact_aout.h"
sed -i 's/#include <sys\/elf_common.h>/&\n#include <stdint.h>/' "${S}/sys/sys/elf32.h"
@@ -1,5 +1,5 @@
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
-index d0ceb4d..4bfd0cb 100644
+index d0ceb4d..f86f94d 100644
--- a/usr.sbin/btxld/btxld.c
+++ b/usr.sbin/btxld/btxld.c
@@ -30,7 +30,7 @@ static const char rcsid[] =
@@ -11,6 +11,26 @@ index d0ceb4d..4bfd0cb 100644
#include <sys/stat.h>
#include <sys/mman.h>
+@@ -42,14 +42,14 @@ static const char rcsid[] =
+ #include <netinet/in.h>
+
+ #include <a.out.h>
+-#include <err.h>
++#include <bsd/err.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdarg.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <unistd.h>
++#include <bsd/stdio.h>
++#include <bsd/stdlib.h>
++#include <bsd/string.h>
++#include <bsd/unistd.h>
+
+ #include "btx.h"
+ #include "elfh.h"
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index 82ff0e1..3e89705 100644
--- a/usr.sbin/btxld/elfh.c

0 comments on commit 27ed9c0

Please sign in to comment.