diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2009-03-13 09:10:37 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2009-03-13 09:10:37 +0000 |
| commit | 6bd8cf27b5269393a6c7177b27d0fa03d61531fb (patch) | |
| tree | a14795ab7a21bd05532313d53f384abc0c57f405 /x11 | |
| parent | - update to 0.84 (diff) | |
- Don't try to use dolt, it is broken with bash4.
Notes
Notes:
svn path=/head/; revision=229982
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libX11/Makefile | 7 | ||||
| -rw-r--r-- | x11/libX11/files/patch-configure.ac | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index c5fbb56f32bc..dc4bcbeda0aa 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -13,13 +13,16 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X11 library -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \ + ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb XORG_CAT= lib USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ kbproto:both inputproto xf86bigfontproto xproto:both -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal +AUTOMAKE_ARGS= --add-missing CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib \ --with-xcb=yes diff --git a/x11/libX11/files/patch-configure.ac b/x11/libX11/files/patch-configure.ac new file mode 100644 index 000000000000..6acb6cb18325 --- /dev/null +++ b/x11/libX11/files/patch-configure.ac @@ -0,0 +1,10 @@ +--- configure.ac.orig 2009-03-13 11:46:25.000000000 +0300 ++++ configure.ac 2009-03-13 11:46:56.000000000 +0300 +@@ -20,7 +20,6 @@ + + # Checks for programs. + AC_PROG_LIBTOOL +-DOLT + AC_PROG_CC + XORG_CWARNFLAGS + |