Date: Wed, 11 Jul 2007 22:18:14 -0700 From: vehemens <vehemens@verizon.net> To: freebsd-x11@freebsd.org Subject: Re: problem with x11/xdm (xdm-1.1.4) Message-ID: <200707112218.14504.vehemens@verizon.net>
next in thread | raw e-mail | index | archive | help
On Wed Jul 11 22:29:40 UTC 2007 Tom Uffner wrote:
> port installs GiveConsole and other files from config into / instead
> of /usr/local/share/examples/xdm then fails when copying from there to
> /usr/local/lib/X11/xdm/
The file names case changed. Here's what I did:
--- x11/xdm/Makefile.orig 2007-07-02 17:12:28.000000000 -0700
+++ x11/xdm/Makefile 2007-07-05 14:26:51.000000000 -0700
@@ -19,8 +19,8 @@
MAN1= xdm.1
-CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \
- Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
+CFFILES= GiveConsole TakeConsole Xaccess Xresources Xservers\
+ xreset xsession xsetup_0 xstartup xwilling xdm-config
post-patch:
${REINPLACE_CMD} -e "s,XDMCONFIGDIR,${PREFIX}/lib/X11/xdm,g"
${WRKSRC}/config/Xreset.cpp ${WRKSRC}/config/Xstartup.cpp
--- x11/xdm/pkg-plist.orig 2007-07-02 17:12:28.000000000 -0700
+++ x11/xdm/pkg-plist 2007-07-05 14:24:29.000000000 -0700
@@ -11,35 +11,35 @@
@unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole;
then rm -f %D/lib/X11/xdm/GiveConsole; fi
@unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole;
then rm -f %D/lib/X11/xdm/TakeConsole; fi
@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess; then
rm -f %D/lib/X11/xdm/Xaccess; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset; then
rm -f %D/lib/X11/xdm/Xreset; fi
@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources;
then rm -f %D/lib/X11/xdm/Xresources; fi
@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers; then
rm -f %D/lib/X11/xdm/Xservers; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession; then
rm -f %D/lib/X11/xdm/Xsession; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0; then
rm -f %D/lib/X11/xdm/Xsetup_0; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup; then
rm -f %D/lib/X11/xdm/Xstartup; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling; then
rm -f %D/lib/X11/xdm/Xwilling; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/xreset %D/lib/X11/xdm/xreset; then
rm -f %D/lib/X11/xdm/xreset; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/xsession %D/lib/X11/xdm/xsession; then
rm -f %D/lib/X11/xdm/xsession; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/xsetup_0 %D/lib/X11/xdm/xsetup_0; then
rm -f %D/lib/X11/xdm/xsetup_0; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/xstartup %D/lib/X11/xdm/xstartup; then
rm -f %D/lib/X11/xdm/xstartup; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/xwilling %D/lib/X11/xdm/xwilling; then
rm -f %D/lib/X11/xdm/xwilling; fi
@unexec if cmp -s %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config;
then rm -f %D/lib/X11/xdm/xdm-config; fi
%%EXAMPLESDIR%%/GiveConsole
%%EXAMPLESDIR%%/TakeConsole
%%EXAMPLESDIR%%/Xaccess
-%%EXAMPLESDIR%%/Xreset
%%EXAMPLESDIR%%/Xresources
%%EXAMPLESDIR%%/Xservers
-%%EXAMPLESDIR%%/Xsession
-%%EXAMPLESDIR%%/Xsetup_0
-%%EXAMPLESDIR%%/Xstartup
-%%EXAMPLESDIR%%/Xwilling
+%%EXAMPLESDIR%%/xreset
+%%EXAMPLESDIR%%/xsession
+%%EXAMPLESDIR%%/xsetup_0
+%%EXAMPLESDIR%%/xstartup
+%%EXAMPLESDIR%%/xwilling
%%EXAMPLESDIR%%/xdm-config
@exec cp -n %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole
@exec cp -n %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole
@exec cp -n %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess
-@exec cp -n %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset
@exec cp -n %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources
@exec cp -n %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers
-@exec cp -n %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession
-@exec cp -n %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0
-@exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
-@exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
+@exec cp -n %D/%%EXAMPLESDIR%%/xreset %D/lib/X11/xdm/xreset
+@exec cp -n %D/%%EXAMPLESDIR%%/xsession %D/lib/X11/xdm/xsession
+@exec cp -n %D/%%EXAMPLESDIR%%/xsetup_0 %D/lib/X11/xdm/xsetup_0
+@exec cp -n %D/%%EXAMPLESDIR%%/xstartup %D/lib/X11/xdm/xstartup
+@exec cp -n %D/%%EXAMPLESDIR%%/xwilling %D/lib/X11/xdm/xwilling
@exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707112218.14504.vehemens>