diff options
| author |   Yuta Satoh <nigoro@gentoo.gr.jp> | 2015-08-15 09:17:25 +0900 |
|---|---|---|
| committer | Yuta Satoh <nigoro@gentoo.gr.jp> | 2015-08-19 20:59:34 +0900 |
| commit | 04ea81a5482d728d42d14e89ea3bae4275b13959 (patch) | |
| tree | 5f26f99d07677da0d10264d532ec50e540a73bb5 /sys-freebsd/freebsd-lib/files | |
| parent | app-admin/keepass: remove old (diff) | |
| download | gentoo-04ea81a5482d728d42d14e89ea3bae4275b13959.tar.gz gentoo-04ea81a5482d728d42d14e89ea3bae4275b13959.tar.bz2 gentoo-04ea81a5482d728d42d14e89ea3bae4275b13959.zip | |
sys-freebsd: Bump to 10.2.
Diffstat (limited to 'sys-freebsd/freebsd-lib/files')
| -rw-r--r-- | sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch | 39 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch | 26 |
2 files changed, 65 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch new file mode 100644 index 000000000000..303f422651f3 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch @@ -0,0 +1,39 @@ +diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile +index bbfb57b..a7c17e3 100644 +--- a/lib/libgeom/Makefile ++++ b/lib/libgeom/Makefile +@@ -13,7 +13,7 @@ CFLAGS += -I${.CURDIR} + + WARNS?= 3 + +-DPADD= ${LIBBSDXML} ${LIBSBUF} ++DPADD= ${LIBSBUF} + LDADD= -lbsdxml -lsbuf + + MAN= libgeom.3 +diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c +index 9dedb8e..d96420c 100644 +--- a/lib/libgeom/geom_xml2tree.c ++++ b/lib/libgeom/geom_xml2tree.c +@@ -43,7 +43,7 @@ + #include <sys/sbuf.h> + #include <sys/sysctl.h> + #include <err.h> +-#include <bsdxml.h> ++#include <expat.h> + #include <libgeom.h> + + struct mystate { +diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c +index d1fc0b1..89ac55e 100644 +--- a/lib/libmt/mtlib.c ++++ b/lib/libmt/mtlib.c +@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken + #include <unistd.h> + #include <stdint.h> + #include <errno.h> +-#include <bsdxml.h> ++#include <expat.h> + #include <mtlib.h> + + /* diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch new file mode 100644 index 000000000000..b08d95f714f3 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch @@ -0,0 +1,26 @@ +diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile +index cb1da71..43de5a5 100644 +--- a/lib/libmt/Makefile ++++ b/lib/libmt/Makefile +@@ -5,6 +5,7 @@ SHLIBDIR?= /lib + SRCS= mtlib.c + INCS= mtlib.h + ++CFLAGS+= -I${.CURDIR} + DPADD= ${LIBSBUF} + LDADD= -lsbuf + +diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile +index e9384b7..085ef62 100644 +--- a/lib/libdpv/Makefile ++++ b/lib/libdpv/Makefile +@@ -11,7 +11,8 @@ LDADD= -ldialog -lfigpar -lncursesw -lutil + + SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c + +-CFLAGS+= -I${.CURDIR} ++CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libfigpar ++LDFLAGS+= -L${.OBJDIR}/../libfigpar + + WARNS?= 6 + |