Date: Sat, 03 Nov 2001 13:08:58 +0900 From: SASAKI Katuhiro <sahiro@crest.ocn.ne.jp> To: <dd@FreeBSD.org> Cc: freebsd-ports@FreeBSD.org Subject: Re: ports/31595: kdebase2(2.2.1): $PREFIX/share/config/kdm/X* should not be in pkg-plist Message-ID: <3be36dc4.6478%sahiro@crest.ocn.ne.jp> In-Reply-To: <200110301347.f9UDlDJ77915@freefall.freebsd.org> References: <200110301347.f9UDlDJ77915@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
HI.
How is patch below? This makes x11/kdebase2 to install
configuration files for kdm whether xdm is already installed or
not. So, bulding packages with XFree86/XFree86-4 both would be
done well, I think.
Thank you.
diff -urN /usr/ports/x11/kdebase2/Makefile kdebase2/Makefile
--- /usr/ports/x11/kdebase2/Makefile Sat Nov 3 08:57:26 2001
+++ kdebase2/Makefile Sat Nov 3 08:41:12 2001
@@ -31,6 +31,8 @@
--disable-closure
USE_GMAKE= yes
+KDMCONF_FILES= Xaccess Xreset Xservers Xsession Xsetup Xstartup Xwilling kdmrc
+
.include <bsd.port.pre.mk>
.if exists(${X11BASE}/include/Xm/Xm.h)
@@ -66,5 +68,10 @@
post-install:
${CHMOD} u+s ${PREFIX}/bin/kcheckpass
+.for file in ${KDMCONF_FILES}
+.if !exists(${PREFIX}/share/config/kdm/${file})
+ @${CP} ${PREFIX}/share/config/kdm/${file}.sample ${PREFIX}/share/config/kdm/${file}
+.endif
+.endfor
.include <bsd.port.post.mk>
diff -urN /usr/ports/x11/kdebase2/files/patch-kdm::kfrontend::Makefile.in kdebase2/files/patch-kdm::kfrontend::Makefile.in
--- /usr/ports/x11/kdebase2/files/patch-kdm::kfrontend::Makefile.in Thu Jan 1 09:00:00 1970
+++ kdebase2/files/patch-kdm::kfrontend::Makefile.in Fri Nov 2 23:58:04 2001
@@ -0,0 +1,12 @@
+--- kdm/kfrontend/Makefile.in.orig Wed Oct 31 03:35:22 2001
++++ kdm/kfrontend/Makefile.in Wed Oct 31 07:30:09 2001
+@@ -686,8 +686,8 @@
+ install-data-local:
+ @if test ! -d $(DESTDIR)$(kde_confdir)/kdm; then \
+ $(mkinstalldirs) $(DESTDIR)$(kde_confdir)/kdm; \
+- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm; \
+ fi
++ ./genkdmconf --no-old --in $(DESTDIR)$(kde_confdir)/kdm
+
+ messages:
+ $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot
diff -urN /usr/ports/x11/kdebase2/files/patch-kdm::kfrontend::genkdmconf.c kdebase2/files/patch-kdm::kfrontend::genkdmconf.c
--- /usr/ports/x11/kdebase2/files/patch-kdm::kfrontend::genkdmconf.c Sat Nov 3 08:57:26 2001
+++ kdebase2/files/patch-kdm::kfrontend::genkdmconf.c Fri Nov 2 23:58:04 2001
@@ -1,5 +1,5 @@
--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
-+++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
++++ kdm/kfrontend/genkdmconf.c Wed Oct 31 03:31:51 2001
@@ -212,7 +212,7 @@
*/
@@ -9,7 +9,50 @@
# define HALT_CMD "/sbin/shutdown -h now"
# define REBOOT_CMD "/sbin/shutdown -r now"
# elif defined(__SVR4)
-@@ -1606,7 +1606,7 @@
+@@ -1481,7 +1481,7 @@
+ static void
+ genSuppFiles (void)
+ {
+- writeFile ("%s/Xaccess", 0644, "%s",
++ writeFile ("%s/Xaccess.sample", 0644, "%s",
+ "# Xaccess - Access control file for XDMCP connections\n"
+ "#\n"
+ "# To control Direct and Broadcast access:\n"
+@@ -1549,7 +1549,7 @@
+ "\n"
+ "#* CHOOSER %hostlist #\n"
+ );
+- writeFile ("%s/Xservers", 0644, "%s",
++ writeFile ("%s/Xservers.sample", 0644, "%s",
+ "# Xservers - local X-server list\n"
+ "#\n"
+ "# This file should contain an entry to start the server on the\n"
+@@ -1572,7 +1572,7 @@
+ ":0 local " XBINDIR "/X"
+ #endif
+ "\n\n");
+- writeFile ("%s/Xwilling", 0755, "%s",
++ writeFile ("%s/Xwilling.sample", 0755, "%s",
+ "#!/bin/sh\n"
+ "# The output of this script is displayed in the chooser window.\n"
+ "# (instead of \"Willing to manage\")\n"
+@@ -1583,13 +1583,13 @@
+ "\n"
+ "echo \"${nrusers} user${s}, load: ${load}\"\n"
+ );
+- writeFile ("%s/Xsetup", 0755, "%s",
++ writeFile ("%s/Xsetup.sample", 0755, "%s",
+ "#!/bin/sh\n"
+ "# Xsetup - run as root before the login dialog appears\n"
+ "\n"
+ KDE_BINDIR "/kdmdesktop &\n"
+ );
+- writeFile ("%s/Xstartup", 0755, "%s",
++ writeFile ("%s/Xstartup.sample", 0755, "%s",
+ "#!/bin/sh\n"
+ "# Xstartup - run as root before session starts\n"
+ "\n"
+@@ -1606,12 +1606,12 @@
#endif
"\n"
"#exec sessreg -a -l $DISPLAY "
@@ -18,7 +61,13 @@
"-x " KDMCONF "/Xservers "
#endif
"$USER\n"
-@@ -1628,7 +1628,7 @@
+ );
+- writeFile ("%s/Xreset", 0755, "%s",
++ writeFile ("%s/Xreset.sample", 0755, "%s",
+ "#!/bin/sh\n"
+ "# Xreset - run as root after session exits\n"
+ "\n"
+@@ -1628,12 +1628,12 @@
#endif
"\n"
"#exec sessreg -d -l $DISPLAY "
@@ -27,3 +76,18 @@
"-x " KDMCONF "/Xservers "
#endif
"$USER\n"
+ );
+- writeFile ("%s/Xsession", 0755, "%s",
++ writeFile ("%s/Xsession.sample", 0755, "%s",
+ "#!/bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
+@@ -1781,7 +1781,7 @@
+ }
+ addKdePath ("UserPath", DEF_USER_PATH);
+ addKdePath ("SystemPath", DEF_SYSTEM_PATH);
+- ASPrintf (&newkdmrc, "%s/kdmrc", newdir);
++ ASPrintf (&newkdmrc, "%s/kdmrc.sample", newdir);
+ f = Create (newkdmrc, kdmrcmode);
+ wrconf (f);
+ fclose (f);
diff -urN /usr/ports/x11/kdebase2/pkg-plist kdebase2/pkg-plist
--- /usr/ports/x11/kdebase2/pkg-plist Sat Nov 3 08:57:26 2001
+++ kdebase2/pkg-plist Sat Nov 3 00:21:29 2001
@@ -1284,14 +1284,30 @@
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/Xaccess
-share/config/kdm/Xreset
-share/config/kdm/Xservers
-share/config/kdm/Xsession
-share/config/kdm/Xsetup
-share/config/kdm/Xstartup
-share/config/kdm/Xwilling
-share/config/kdm/kdmrc
+@unexec if cmp -s %D/share/config/kdm/Xaccess %D/share/config/kdm/Xaccess.sample; then rm -f %D/share/config/kdm/Xaccess; fi
+share/config/kdm/Xaccess.sample
+@exec if [ ! -f %D/share/config/kdm/Xaccess ]; then cp %D/share/config/kdm/Xaccess.sample %D/share/config/kdm/Xaccess; fi
+@unexec if cmp -s %D/share/config/kdm/Xreset %D/share/config/kdm/Xreset.sample; then rm -f %D/share/config/kdm/Xreset; fi
+share/config/kdm/Xreset.sample
+@exec if [ ! -f %D/share/config/kdm/Xreset ]; then cp %D/share/config/kdm/Xreset.sample %D/share/config/kdm/Xreset; fi
+@unexec if cmp -s %D/share/config/kdm/Xservers %D/share/config/kdm/Xservers.sample; then rm -f %D/share/config/kdm/Xservers; fi
+share/config/kdm/Xservers.sample
+@exec if [ ! -f %D/share/config/kdm/Xservers ]; then cp %D/share/config/kdm/Xservers.sample %D/share/config/kdm/Xservers; fi
+@unexec if cmp -s %D/share/config/kdm/Xsession %D/share/config/kdm/Xsession.sample; then rm -f %D/share/config/kdm/Xsession; fi
+share/config/kdm/Xsession.sample
+@exec if [ ! -f %D/share/config/kdm/Xsession ]; then cp %D/share/config/kdm/Xsession.sample %D/share/config/kdm/Xsession; fi
+@unexec if cmp -s %D/share/config/kdm/Xsetup %D/share/config/kdm/Xsetup.sample; then rm -f %D/share/config/kdm/Xsetup; fi
+share/config/kdm/Xsetup.sample
+@exec if [ ! -f %D/share/config/kdm/Xsetup ]; then cp %D/share/config/kdm/Xsetup.sample %D/share/config/kdm/Xsetup; fi
+@unexec if cmp -s %D/share/config/kdm/Xstartup %D/share/config/kdm/Xstartup.sample; then rm -f %D/share/config/kdm/Xstartup; fi
+share/config/kdm/Xstartup.sample
+@exec if [ ! -f %D/share/config/kdm/Xstartup ]; then cp %D/share/config/kdm/Xstartup.sample %D/share/config/kdm/Xstartup; fi
+@unexec if cmp -s %D/share/config/kdm/Xwilling %D/share/config/kdm/Xwilling.sample; then rm -f %D/share/config/kdm/Xwilling; fi
+share/config/kdm/Xwilling.sample
+@exec if [ ! -f %D/share/config/kdm/Xwilling ]; then cp %D/share/config/kdm/Xwilling.sample %D/share/config/kdm/Xwilling; fi
+@unexec if cmp -s %D/share/config/kdm/kdmrc %D/share/config/kdm/kdmrc.sample; then rm -f %D/share/config/kdm/kdmrc; fi
+share/config/kdm/kdmrc.sample
+@exec if [ ! -f %D/share/config/kdm/kdmrc ]; then cp %D/share/config/kdm/kdmrc.sample %D/share/config/kdm/kdmrc; fi
share/config/klipperrc
share/config/konqsidebartng.rc
share/config/konsolerc
================================================================
SASAKI Katuhiro
mailto: sahiro@crest.ocn.ne.jp
================================================================
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3be36dc4.6478%sahiro>