Sun Jan 8 00:33:34 2012 UTC ()
This file has a backslash-escaped trailing space after the login
prompt string, which I assume is there on purpose. Unfortunately, it
seems that when run through modern gcc's cpp, as at least Dragonfly's
current X resources processing pipeline apparently does, cpp treats
this as backslash-newline and splices on the next line, which causes
everything to go wahooni-shaped.

As a hack/workaround, insert a blank line after this line, so if the
next line does get spliced on it won't break things.

Reported by Artem Falcon.


(dholland)
diff -r1.24 -r1.25 pkgsrc/x11/xdm3d/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/xdm3d/distinfo
diff -r0 -r1.1 pkgsrc/x11/xdm3d/patches/patch-Xresources_3D
cvs diff -r1.24 -r1.25 pkgsrc/x11/xdm3d/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xdm3d/Makefile 2011/12/20 05:00:58 1.24
+++ pkgsrc/x11/xdm3d/Makefile 2012/01/08 00:33:34 1.25
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.24 2011/12/20 05:00:58 dholland Exp $ 1# $NetBSD: Makefile,v 1.25 2012/01/08 00:33:34 dholland Exp $
2 2
3DISTNAME= xdm3d-1.0 3DISTNAME= xdm3d-1.0
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_LOCAL} 6MASTER_SITES= ${MASTER_SITE_LOCAL}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.hijinks.com/~spade/linux/XBanner/ 9HOMEPAGE= http://www.hijinks.com/~spade/linux/XBanner/
10COMMENT= Replacement for xdm with 3D effects 10COMMENT= Replacement for xdm with 3D effects
11 11
12WRKSRC= ${WRKDIR}/xdm 12WRKSRC= ${WRKDIR}/xdm
13NO_INSTALL_MANPAGES= yes 13NO_INSTALL_MANPAGES= yes
14USE_IMAKE= yes 14USE_IMAKE= yes
15 15
16PLIST_SRC= ${WRKDIR}/PLIST-src 16PLIST_SRC= ${WRKDIR}/PLIST-src
17INSTALLATION_DIRS= bin 17INSTALLATION_DIRS= bin
cvs diff -r1.8 -r1.9 pkgsrc/x11/xdm3d/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xdm3d/distinfo 2011/12/13 04:40:31 1.8
+++ pkgsrc/x11/xdm3d/distinfo 2012/01/08 00:33:34 1.9
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.8 2011/12/13 04:40:31 dholland Exp $ 1$NetBSD: distinfo,v 1.9 2012/01/08 00:33:34 dholland Exp $
2 2
3SHA1 (xdm3d-1.0.tar.gz) = 494a33aefee0c1545331b657bf47b90634b69648 3SHA1 (xdm3d-1.0.tar.gz) = 494a33aefee0c1545331b657bf47b90634b69648
4RMD160 (xdm3d-1.0.tar.gz) = 6a60c3afaf0756fc2c04256a79c61d413ee1a473 4RMD160 (xdm3d-1.0.tar.gz) = 6a60c3afaf0756fc2c04256a79c61d413ee1a473
5Size (xdm3d-1.0.tar.gz) = 157858 bytes 5Size (xdm3d-1.0.tar.gz) = 157858 bytes
 6SHA1 (patch-Xresources_3D) = db96d677d89ee86bad76785ac2bd254d902a0876
6SHA1 (patch-aa) = 4a86a37ad238e502352346fa86090b7578d862ee 7SHA1 (patch-aa) = 4a86a37ad238e502352346fa86090b7578d862ee
7SHA1 (patch-ab) = 512f3df37f5480203c99198760fe98e2e127ae15 8SHA1 (patch-ab) = 512f3df37f5480203c99198760fe98e2e127ae15
8SHA1 (patch-ac) = 9ea05506db86d181d9826f5c668899b7e760a8aa 9SHA1 (patch-ac) = 9ea05506db86d181d9826f5c668899b7e760a8aa
9SHA1 (patch-ad) = 99285953811fe2e67acc99b74d9f5a685c5eb978 10SHA1 (patch-ad) = 99285953811fe2e67acc99b74d9f5a685c5eb978
10SHA1 (patch-rpcauth_c) = 39e849564f5027cf0e5d5116c873ca88da92462e 11SHA1 (patch-rpcauth_c) = 39e849564f5027cf0e5d5116c873ca88da92462e
11SHA1 (patch-session_c) = fec5f1438210fbba8586bcd62391ab17d8b4a743 12SHA1 (patch-session_c) = fec5f1438210fbba8586bcd62391ab17d8b4a743
File Added: pkgsrc/x11/xdm3d/patches/patch-Xresources_3D
$NetBSD: patch-Xresources_3D,v 1.1 2012/01/08 00:33:34 dholland Exp $

Apparently at least one X resources processing chain treats the
backslash-space-newline sequence below as just backslash-newline,
which makes a mess. Insert a blank line to mitigate the effect.

Arguably this shouldn't be using backslash-space, but presumably it
wants a space after the login prompt and without the backslash there's
probably something else that will fail or drop it.

This hack should at least be harmless.

--- Xresources.3D~	1998-08-18 09:17:37.000000000 +0000
+++ Xresources.3D
@@ -6,6 +6,7 @@ xlogin*login.translations: #override\
 	<Key>Return: set-session-argument() finish-field()
 xlogin*greeting: CLIENTHOST
 xlogin*namePrompt: login:\ 
+
 xlogin*fail: Login incorrect
 xlogin*y: 380
 #ifdef COLOR