diff options
| author | Alejandro Pulver <alepulver@FreeBSD.org> | 2006-11-05 15:49:16 +0000 |
|---|---|---|
| committer | Alejandro Pulver <alepulver@FreeBSD.org> | 2006-11-05 15:49:16 +0000 |
| commit | 6d2e101be7cee576e7e1aaa3176eb4d6a7c97d38 (patch) | |
| tree | 6e1bdc3803125caaff3d3f6111402d63ed9abed3 /x11/libxcb | |
| parent | - Remove USE_TK/USE_TK_BUILD (can only be used before bsd.port.pre.mk). (diff) | |
- Fix building on 4.x.
Reported by: pointyhat
Notes
Notes:
svn path=/head/; revision=176507
Diffstat (limited to 'x11/libxcb')
| -rw-r--r-- | x11/libxcb/Makefile | 9 | ||||
| -rw-r--r-- | x11/libxcb/files/extra-patch-src__xcb.h | 11 | ||||
| -rw-r--r-- | x11/libxcb/files/extra-patch-src__xcb_auth.c | 10 |
3 files changed, 29 insertions, 1 deletions
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index 53856e596548..bbc6de655626 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -43,7 +43,14 @@ XDMCP_LIBS= -L${X11BASE}/lib -lXdmcp XPROTO_CFLAGS= -I${X11BASE}/include XPROTO_LIBS= -L${X11BASE}/lib +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__xcb.h \ + ${FILESDIR}/extra-patch-src__xcb_auth.c +.endif + post-build: DISPLAY= ${GMAKE} -C ${WRKSRC} check -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/libxcb/files/extra-patch-src__xcb.h b/x11/libxcb/files/extra-patch-src__xcb.h new file mode 100644 index 000000000000..bfaacdee86e6 --- /dev/null +++ b/x11/libxcb/files/extra-patch-src__xcb.h @@ -0,0 +1,11 @@ +--- ./src/xcb.h.orig Sat Oct 7 22:31:54 2006 ++++ ./src/xcb.h Sun Nov 5 12:22:13 2006 +@@ -29,7 +29,7 @@ + #define __XCB_H__ + #include <sys/types.h> + +-#if defined(__solaris__) ++#if defined(__solaris__) || __FreeBSD__ < 5 + #include <inttypes.h> + #else + #include <stdint.h> diff --git a/x11/libxcb/files/extra-patch-src__xcb_auth.c b/x11/libxcb/files/extra-patch-src__xcb_auth.c new file mode 100644 index 000000000000..053b4ec8a8c1 --- /dev/null +++ b/x11/libxcb/files/extra-patch-src__xcb_auth.c @@ -0,0 +1,10 @@ +--- ./src/xcb_auth.c.orig Sat Oct 7 18:43:12 2006 ++++ ./src/xcb_auth.c Sun Nov 5 03:44:33 2006 +@@ -27,6 +27,7 @@ + + #include <assert.h> + #include <X11/Xauth.h> ++#include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <sys/un.h> |