diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2012-09-27 09:45:38 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2012-09-27 09:45:38 +0000 |
| commit | 47ad784422cc954b19911e16ba628e7d2b6db88e (patch) | |
| tree | 81b58110a9624f1186cdc6d4722dd9b72cd2cfb6 /x11/xdm | |
| parent | - Update to 1.0000 (diff) | |
Fix build when clang is installed as cc (more specifically when clang-cpp is
installed as cpp).
This is done in a similar way as in other x11 ports with the same issue, see
r301687 for details.
PR: ports/172100
Submitted by: Oliver Pinter <oliver.pntr@gmail.com> (pr)
Jan Beich <jbeich@tormail.org> (patch, based on)
Approved by: miwi (mentor)
Obtained from: xorg staging area
Notes
Notes:
svn path=/head/; revision=304953
Diffstat (limited to 'x11/xdm')
| -rw-r--r-- | x11/xdm/Makefile | 2 | ||||
| -rw-r--r-- | x11/xdm/files/patch-config-Makefile.in | 11 | ||||
| -rw-r--r-- | x11/xdm/files/patch-config-Xresources.cpp | 14 |
3 files changed, 27 insertions, 0 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 51dbe090bd27..66f4539a1973 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -38,6 +38,8 @@ PLIST_SUB+= XDMSHELL="@comment " .endif post-patch: + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \ -e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \ ${WRKSRC}/config/xdm-config.cpp \ diff --git a/x11/xdm/files/patch-config-Makefile.in b/x11/xdm/files/patch-config-Makefile.in new file mode 100644 index 000000000000..9a59bfc79d9b --- /dev/null +++ b/x11/xdm/files/patch-config-Makefile.in @@ -0,0 +1,11 @@ +--- config/Makefile.in.orig 2012-09-27 10:37:59.000000000 +0200 ++++ config/Makefile.in 2012-09-27 10:38:41.000000000 +0200 +@@ -296,7 +296,7 @@ + # output lines with trailing backslashes. + # Allow XHASH to always be substituted, even in cases where XCOMM isn't. + CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ +- -e '/^\#line *[0-9][0-9]* *.*$$/d' \ ++ -e '/^$$/d' \ + -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ + -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ + -e '/^[ ]*XHASH/s/XHASH/\#/' \ diff --git a/x11/xdm/files/patch-config-Xresources.cpp b/x11/xdm/files/patch-config-Xresources.cpp new file mode 100644 index 000000000000..4e727341b442 --- /dev/null +++ b/x11/xdm/files/patch-config-Xresources.cpp @@ -0,0 +1,14 @@ +--- config/Xresources.cpp.orig 2012-09-27 10:41:28.000000000 +0200 ++++ config/Xresources.cpp 2012-09-27 10:41:56.000000000 +0200 +@@ -60,9 +60,9 @@ + XHASHendif + #ifdef XPM + XHASHif PLANES >= 8 +-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP ++xlogin*logoFileName: BITMAPDIR/XDM_PIXMAP + XHASHelse +-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP ++xlogin*logoFileName: BITMAPDIR/XDM_BWPIXMAP + XHASHendif + xlogin*useShape: true + xlogin*logoPadding: 10 |