diff options
Diffstat (limited to 'sys-freebsd/freebsd-lib/files')
7 files changed, 0 insertions, 263 deletions
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch deleted file mode 100644 index 42b64b572322..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc -index 937187a..d5277f3 100644 ---- a/lib/atf/Makefile.inc -+++ b/lib/atf/Makefile.inc -@@ -49,6 +49,24 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' - CFLAGS+= -DATF_SHELL='"/bin/sh"' - CFLAGS+= -DATF_WORKDIR='"/tmp"' - -+CXXFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -DATF_ARCH='"${MACHINE}"' -+CXXFLAGS+= -DATF_BUILD_CC='"${CC}"' -+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' -+CXXFLAGS+= -DATF_BUILD_CPP='"${CPP}"' -+CXXFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"' -+CXXFLAGS+= -DATF_BUILD_CXX='"${CXX}"' -+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' -+CXXFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"' -+CXXFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' -+CXXFLAGS+= -DATF_LIBDIR='"${LIBDIR}"' -+CXXFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' -+CXXFLAGS+= -DATF_MACHINE='"${MACHINE_ARCH}"' -+CXXFLAGS+= -DATF_M4='"/usr/bin/m4"' -+CXXFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' -+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' -+CXXFLAGS+= -DATF_WORKDIR='"/tmp"' -+ - WARNS?= 3 - - # vim: syntax=make -diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile -index 37d6073..90a2687 100644 ---- a/lib/atf/libatf-c++/Makefile -+++ b/lib/atf/libatf-c++/Makefile -@@ -40,11 +40,11 @@ LDFLAGS+= -L${.OBJDIR}/../libatf-c - .PATH: ${ATF}/atf-c++ - .PATH: ${ATF}/atf-c++/detail - --CFLAGS+= -I${ATF} --CFLAGS+= -I${.CURDIR}/../libatf-c --CFLAGS+= -I. -+CXXFLAGS+= -I${ATF} -+CXXFLAGS+= -I${.CURDIR}/../libatf-c -+CXXFLAGS+= -I. - --CFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -DHAVE_CONFIG_H - - SRCS= application.cpp \ - build.cpp \ diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch deleted file mode 100644 index 6ef3f07de0fd..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile -index 9a21dde..0815f0a 100644 ---- a/lib/libcam/Makefile -+++ b/lib/libcam/Makefile -@@ -8,6 +8,7 @@ INCS= camlib.h - - DPADD= ${LIBSBUF} - LDADD= -lsbuf -+LDFLAGS+= -L${.OBJDIR}/../libsbuf - - MAN= cam.3 cam_cdbparse.3 - -diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile -index dbd7895..607b1f6 100644 ---- a/lib/libdwarf/Makefile -+++ b/lib/libdwarf/Makefile -@@ -21,6 +21,7 @@ SRCS= \ - INCS= dwarf.h libdwarf.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf - - SHLIB_MAJOR= 3 - -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile -index 4449c06..f024cf0 100644 ---- a/lib/libproc/Makefile -+++ b/lib/libproc/Makefile -@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \ - INCS= libproc.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf - - .if ${MK_LIBCPLUSPLUS} != "no" - LDADD+= -lcxxrt -@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2 - - WITHOUT_MAN= - -+LDADD+= -lelf -+LDFLAGS+= -L${.OBJDIR}/../libelf -+ - .include <bsd.lib.mk> -diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile -index af5a775..c01aa05 100644 ---- a/lib/libprocstat/Makefile -+++ b/lib/libprocstat/Makefile -@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def - SYMBOL_MAPS= ${.CURDIR}/Symbol.map - - INCS= libprocstat.h -+CFLAGS+= -I${.CURDIR}/../libelf -+LDFLAGS+= -L${.OBJDIR}/../libelf - CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE - SHLIB_MAJOR= 1 - -diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile -index 2815a07..e992662 100644 ---- a/lib/librtld_db/Makefile -+++ b/lib/librtld_db/Makefile -@@ -10,5 +10,8 @@ SRCS= rtld_db.c - INCS= rtld_db.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf -+LDADD+= -lutil -lproc -+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc - - .include <bsd.lib.mk> -diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile -index 1cf52a0..3d25fae 100644 ---- a/lib/libtelnet/Makefile -+++ b/lib/libtelnet/Makefile -@@ -13,6 +13,8 @@ INTERNALLIB= - SRCS= genget.c getent.c misc.c - CFLAGS+= -I${TELNETDIR} - -+CFLAGS+= -I${.CURDIR}/../libmp -+ - WARNS?= 2 - - .if !defined(RELEASE_CRUNCH) -diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile -index 30a1dfb..9f8a99c 100644 ---- a/lib/libexecinfo/Makefile -+++ b/lib/libexecinfo/Makefile -@@ -10,8 +10,10 @@ SHLIB_MAJOR= 1 - INCS= execinfo.h - SRCS= backtrace.c symtab.c unwind.c - -+CFLAGS+= -I${.CURDIR}/../libelf - DPADD= ${LIBELF} - LDADD= -lelf -+LDFLAGS+= -L${.OBJDIR}/../libelf - - MAN= backtrace.3 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch deleted file mode 100644 index 55987aa44fa1..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile -index f9e01ab..15b27d8 100644 ---- a/lib/libproc/Makefile -+++ b/lib/libproc/Makefile -@@ -15,7 +15,10 @@ INCS= libproc.h - - CFLAGS+= -I${.CURDIR} - --.if ${MK_LIBCPLUSPLUS} != "no" -+.if ${CXX:T:M*-stdlib=libc++*} -+LDADD+= -lcxxrt -+DPADD+= ${LIBCXXRT} -+.elif ${CXXFLAGS:T:M*-stdlib=libc++*} - LDADD+= -lcxxrt - DPADD+= ${LIBCXXRT} - .else 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 deleted file mode 100644 index 303f422651f3..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index b08d95f714f3..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch deleted file mode 100644 index 813a42b50171..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile -index 88ec3fe..076b8d4 100644 ---- a/lib/libusb/Makefile -+++ b/lib/libusb/Makefile -@@ -38,7 +38,7 @@ SRCS+= libusb10_io.c - CFLAGS+= -DCOMPAT_32BIT - .else - FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc --FILESDIR= ${LIBDATADIR}/pkgconfig -+FILESDIR= ${LIBDIR}/pkgconfig - .endif - - # diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch deleted file mode 100644 index d90aa3163dae..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile -index e3bfe00..51fc5f0 100644 ---- a/lib/libsysdecode/Makefile -+++ b/lib/libsysdecode/Makefile -@@ -8,7 +8,7 @@ LIB= sysdecode - SRCS= errno.c ioctl.c syscallnames.c utrace.c - INCS= sysdecode.h - --CFLAGS+= -I${.CURDIR}/../../sys -+CFLAGS+= -I${.CURDIR}/../../sys -I${.CURDIR} - - MAN+= sysdecode.3 \ - sysdecode_abi_to_freebsd_errno.3 \ -@@ -37,7 +37,7 @@ CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} - - ioctl.c: mkioctls - env MACHINE=${MACHINE} CPP="${CPP}" \ -- /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} -+ /bin/sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} - - beforedepend: ioctl.c - |