Date: Thu, 27 Sep 2012 03:50:11 GMT From: Jan Beich <jbeich@tormail.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/172100: [PATCH] xdm build error with clang-cpp Message-ID: <201209270350.q8R3oBUd088638@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/172100; it has been noted by GNATS.
From: Jan Beich <jbeich@tormail.org>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/172100: [PATCH] xdm build error with clang-cpp
Date: Thu, 27 Sep 2012 14:41:16 +1100
--=-=-=
Content-Type: text/plain
Content-Disposition: inline
Oops, extra newlines before shebang in scripts are hazardous.
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=clang-cpp.diff
Index: x11/xdm/Makefile
===================================================================
--- x11/xdm/Makefile (revision 304222)
+++ x11/xdm/Makefile (working copy)
@@ -38,6 +39,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 \
Index: x11/xdm/files/patch-config-Makefile.in
===================================================================
--- x11/xdm/files/patch-config-Makefile.in (revision 0)
+++ x11/xdm/files/patch-config-Makefile.in (working copy)
@@ -0,0 +1,10 @@
+--- config/Makefile.in~
++++ config/Makefile.in
+@@ -297,6 +297,7 @@ WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
+ # 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/\#/' \
Index: x11/xdm/files/patch-config-Xresources.cpp
===================================================================
--- x11/xdm/files/patch-config-Xresources.cpp (revision 0)
+++ x11/xdm/files/patch-config-Xresources.cpp (working copy)
@@ -0,0 +1,14 @@
+--- config/Xresources.cpp~
++++ config/Xresources.cpp
+@@ -60,9 +60,9 @@ xlogin*hiColor: black
+ 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
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209270350.q8R3oBUd088638>