From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 27 03:50:12 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 738BA106566B for ; Thu, 27 Sep 2012 03:50:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 441B68FC0A for ; Thu, 27 Sep 2012 03:50:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8R3oBa7088643 for ; Thu, 27 Sep 2012 03:50:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8R3oBUd088638; Thu, 27 Sep 2012 03:50:11 GMT (envelope-from gnats) Date: Thu, 27 Sep 2012 03:50:11 GMT Message-Id: <201209270350.q8R3oBUd088638@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Jan Beich Cc: Subject: Re: ports/172100: [PATCH] xdm build error with clang-cpp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jan Beich List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 03:50:12 -0000 The following reply was made to PR ports/172100; it has been noted by GNATS. From: Jan Beich 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 --=-=-=--