diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-06-21 00:40:10 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-06-21 00:40:10 +0800 |
| commit | 4b9ced0e6d5ed6e6b359847b0438ba11119904c2 (patch) | |
| tree | 0f42bac5dff8237290dcd82e6c317998505ec0bb | |
| parent | 3294e3d226fd9f3457c7bdbc19deea330f5d4cb6 (diff) | |
| download | xorg-devel-ports-4b9ced0e6d5ed6e6b359847b0438ba11119904c2.tar xorg-devel-ports-4b9ced0e6d5ed6e6b359847b0438ba11119904c2.tar.gz xorg-devel-ports-4b9ced0e6d5ed6e6b359847b0438ba11119904c2.tar.bz2 xorg-devel-ports-4b9ced0e6d5ed6e6b359847b0438ba11119904c2.tar.lz xorg-devel-ports-4b9ced0e6d5ed6e6b359847b0438ba11119904c2.tar.xz xorg-devel-ports-4b9ced0e6d5ed6e6b359847b0438ba11119904c2.tar.zst xorg-devel-ports-4b9ced0e6d5ed6e6b359847b0438ba11119904c2.zip | |
Fix issues and make xorg compile with clang-cpp as cpp.
This patch just kills off the check for working cpp -traditional. The
result is semi-broken whitespace in some manuals and in the startx script,
but no functional or other differences.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@526 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11-drivers/xf86-video-sis/Makefile | 4 | ||||
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/libXt/Makefile | 4 | ||||
| -rw-r--r-- | x11/libX11/Makefile | 3 | ||||
| -rw-r--r-- | x11/xinit/Makefile | 1 |
5 files changed, 16 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index 2641c7c..16f7899 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -20,4 +20,8 @@ XORG_CAT= driver USE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto MAN4= sis.4x +post-patch: + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 6a76a91..3a3643b 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -151,6 +151,10 @@ pre-everything:: @${ECHO_MSG} "xorg-server_UNSET=SUID in /etc/make.conf." .endif +post-patch: + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ + ${WRKSRC}/configure + .if defined(WITH_NEW_XORG) post-install: @${MKDIR} ${PREFIX}/share/X11/xorg.conf.d diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index eb466e3..de144ad 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -286,4 +286,8 @@ MAN3= MenuPopdown.3 \ XtWindowOfObject.3 \ XtWindowToWidget.3 +post-patch: + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 20a95a8..01a55c3 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -22,6 +22,7 @@ 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 + CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \ --without-xmlto \ --disable-specs @@ -30,6 +31,8 @@ CONFIGURE_ENV+= ac_cv_path_PS2PDF="" .include "${.CURDIR}/manpages" post-patch: + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ + ${WRKSRC}/configure @${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \ s/install-specDATA//' ${WRKSRC}/nls/Makefile.in diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index 3bf4fc4..52d388f 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -24,6 +24,7 @@ PLIST_DIRS= lib/X11/xinit MAN1= startx.1 xinit.1 post-patch: + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|hexdump|/usr/bin/hexdump|' ${WRKSRC}/startx.cpp @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/man/xinit.man |