pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Make xdm use configs from under PKG_SYSCONFDIR.
details: https://anonhg.NetBSD.org/pkgsrc/rev/6a465ae29503
branches: trunk
changeset: 482112:6a465ae29503
user: reed <reed%pkgsrc.org@localhost>
date: Wed Oct 20 14:33:30 2004 +0000
description:
Make xdm use configs from under PKG_SYSCONFDIR.
Some ideas came from NetBSD's XFree86 customizations.
Use USE_PKGINSTALL and CONF_FILES for xorg-clients.
Installs xdm configs (and shell scripts) to examples directory.
Create OWN_DIRS for the authDir.
PLIST changes are for chooser is now in bin directory.
And pixmaps moved to include/X11/pixmaps directory.
xdm configs are no longer in lib/X11/xdm (so they are no longer lost
on reinstall).
(Anyone want to do twm and other configs?)
diffstat:
meta-pkgs/xorg/Makefile.common | 5 +-
x11/xorg-clients/Makefile | 22 +++++++-
x11/xorg-clients/PLIST | 31 +++++-----
x11/xorg-clients/files/host.def | 5 +-
x11/xorg-libs/distinfo | 6 +-
x11/xorg-libs/patches/patch-am | 59 ++++++++++++++++++++++
x11/xorg-libs/patches/patch-an | 107 ++++++++++++++++++++++++++++++++++++++++
x11/xorg-libs/patches/patch-ao | 60 ++++++++++++++++++++++
x11/xorg-libs/patches/patch-ap | 12 ++++
9 files changed, 287 insertions(+), 20 deletions(-)
diffs (truncated from 436 to 300 lines):
diff -r eb42be50ee14 -r 6a465ae29503 meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common Wed Oct 20 14:20:09 2004 +0000
+++ b/meta-pkgs/xorg/Makefile.common Wed Oct 20 14:33:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/09/22 15:52:18 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/10/20 14:33:30 reed Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -108,6 +108,7 @@
WRKSRC?= ${WRKDIR}/xc
X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX}
PREPEND_PATH+= ${X11ROOT}/bin # Make sure we have this in PATH :)
+EGDIR= ${LOCALBASE}/share/examples/xorg
PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX}
MESSAGE_SUBST+= X11ROOT=${X11ROOT}
@@ -164,6 +165,8 @@
-e "s|@LDFLAGS@|${GLOBAL_LDFLAGS}|g" \
-e "s|@WRKSRC@|${WRKSRC}|g" \
-e "s|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g" \
+ -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
+ -e "s|@EGDIR@|${EGDIR}|g" \
${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util
@${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util
diff -r eb42be50ee14 -r 6a465ae29503 x11/xorg-clients/Makefile
--- a/x11/xorg-clients/Makefile Wed Oct 20 14:20:09 2004 +0000
+++ b/x11/xorg-clients/Makefile Wed Oct 20 14:33:30 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/10/04 12:32:19 hira Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/20 14:33:30 reed Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-clients-${XORG_VER}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R${XORG_VER}-src1.tar.gz \
@@ -15,6 +15,7 @@
USE_X11= yes
USE_BUILDLINK3= yes
+USE_PKGINSTALL= yes
DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo
PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches
@@ -22,6 +23,23 @@
XINSTALL_DIRS= programs fonts/util
XINSTALL_MAN_DIRS= programs
+# XXX todo: define build's VarDirectory to pkgsrc's VARBASE
+OWN_DIRS= ${VARBASE}/lib/xdm
+OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm/authdir ${ROOT_USER} ${ROOT_GROUP} 0700
+OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm/authdir/authfiles ${ROOT_USER} ${ROOT_GROUP} 0700
+
+EGDIR= ${LOCALBASE}/share/examples/xorg/xdm
+PKG_SYSCONFSUBDIR= xorg/xdm
+CONF_FILES= ${EGDIR}/xdm/xdm-config ${PKG_SYSCONFDIR}/xdm-config
+CONF_FILES+= ${EGDIR}/xdm/Xservers ${PKG_SYSCONFDIR}/Xservers
+CONF_FILES+= ${EGDIR}/xdm/Xresources ${PKG_SYSCONFDIR}/Xresources
+CONF_FILES+= ${EGDIR}/xdm/Xaccess ${PKG_SYSCONFDIR}/Xaccess
+CONF_FILES_PERMS= ${EGDIR}/xdm/Xsetup_0 ${PKG_SYSCONFDIR}/Xsetup_0 ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+= ${EGDIR}/xdm/Xsession ${PKG_SYSCONFDIR}/Xsession ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+= ${EGDIR}/xdm/TakeConsole ${PKG_SYSCONFDIR}/TakeConsole ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+= ${EGDIR}/xdm/GiveConsole ${PKG_SYSCONFDIR}/GiveConsole ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+= ${EGDIR}/xdm/Xwilling ${PKG_SYSCONFDIR}/Xwilling ${ROOT_USER} ${ROOT_GROUP} 0755
+
post-buildlink:
@${MKDIR} ${WRKSRC}/exports/include
@${CP} ${X11ROOT}/include/X11/fonts/*.h ${BUILDLINK_DIR}/include
diff -r eb42be50ee14 -r 6a465ae29503 x11/xorg-clients/PLIST
--- a/x11/xorg-clients/PLIST Wed Oct 20 14:20:09 2004 +0000
+++ b/x11/xorg-clients/PLIST Wed Oct 20 14:33:30 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/10/04 12:32:19 hira Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/10/20 14:33:30 reed Exp $
${X11ROOT_PREFIX}/bin/Xmark
${X11ROOT_PREFIX}/bin/appres
${X11ROOT_PREFIX}/bin/atobm
@@ -7,6 +7,7 @@
${X11ROOT_PREFIX}/bin/beforelight
${X11ROOT_PREFIX}/bin/bitmap
${X11ROOT_PREFIX}/bin/bmtoa
+${X11ROOT_PREFIX}/bin/chooser
${X11ROOT_PREFIX}/bin/cxpm
${X11ROOT_PREFIX}/bin/dga
${X11ROOT_PREFIX}/bin/dpsexec
@@ -135,6 +136,8 @@
${X11ROOT_PREFIX}/include/X11/bitmaps/box6
${X11ROOT_PREFIX}/include/X11/bitmaps/ldblarrow
${X11ROOT_PREFIX}/include/X11/bitmaps/rdblarrow
+${X11ROOT_PREFIX}/include/X11/pixmaps/xorg-bw.xpm
+${X11ROOT_PREFIX}/include/X11/pixmaps/xorg.xpm
${X11ROOT_PREFIX}/lib/X11/app-defaults/Beforelight
${X11ROOT_PREFIX}/lib/X11/app-defaults/Bitmap
${X11ROOT_PREFIX}/lib/X11/app-defaults/Bitmap-color
@@ -363,18 +366,6 @@
${X11ROOT_PREFIX}/lib/X11/x11perfcomp/fillblnk
${X11ROOT_PREFIX}/lib/X11/x11perfcomp/perfboth
${X11ROOT_PREFIX}/lib/X11/x11perfcomp/perfratio
-${X11ROOT_PREFIX}/lib/X11/xdm/GiveConsole
-${X11ROOT_PREFIX}/lib/X11/xdm/TakeConsole
-${X11ROOT_PREFIX}/lib/X11/xdm/Xaccess
-${X11ROOT_PREFIX}/lib/X11/xdm/Xresources
-${X11ROOT_PREFIX}/lib/X11/xdm/Xservers
-${X11ROOT_PREFIX}/lib/X11/xdm/Xsession
-${X11ROOT_PREFIX}/lib/X11/xdm/Xsetup_0
-${X11ROOT_PREFIX}/lib/X11/xdm/Xwilling
-${X11ROOT_PREFIX}/lib/X11/xdm/chooser
-${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps/xorg-bw.xpm
-${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps/xorg.xpm
-${X11ROOT_PREFIX}/lib/X11/xdm/xdm-config
${X11ROOT_PREFIX}/lib/X11/xedit/lisp/indent.lsp
${X11ROOT_PREFIX}/lib/X11/xedit/lisp/lisp.lsp
${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/c.lsp
@@ -863,6 +854,17 @@
${X11ROOT_PREFIX}/${MAN_DIR}/xprehashprinterlist.${MAN_SUFFIX}
${X11ROOT_PREFIX}/${MAN_DIR}/xpsimplehelloworld.${MAN_SUFFIX}
${X11ROOT_PREFIX}/${MAN_DIR}/xpxthelloworld.${MAN_SUFFIX}
+share/examples/xorg/xdm/GiveConsole
+share/examples/xorg/xdm/TakeConsole
+share/examples/xorg/xdm/Xaccess
+share/examples/xorg/xdm/Xresources
+share/examples/xorg/xdm/Xservers
+share/examples/xorg/xdm/Xsession
+share/examples/xorg/xdm/Xsetup_0
+share/examples/xorg/xdm/Xwilling
+share/examples/xorg/xdm/xdm-config
+@dirrm share/examples/xorg/xdm
+@dirrm share/examples/xorg
@dirrm ${X11ROOT_PREFIX}/lib/X11/xsm
@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/types
@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/xfree68
@@ -896,8 +898,6 @@
@dirrm ${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes
@dirrm ${X11ROOT_PREFIX}/lib/X11/xedit/lisp
@dirrm ${X11ROOT_PREFIX}/lib/X11/xedit
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xdm
@dirrm ${X11ROOT_PREFIX}/lib/X11/x11perfcomp
@dirrm ${X11ROOT_PREFIX}/lib/X11/twm
@dirrm ${X11ROOT_PREFIX}/lib/X11/rstart/contexts
@@ -916,3 +916,4 @@
@dirrm ${X11ROOT_PREFIX}/lib/X11/icons
@dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/util
@dirrm ${X11ROOT_PREFIX}/include/X11/PM
+@unexec ${RMDIR} %D/${X11ROOT_PREFIX}/include/X11/pixmaps 2>/dev/null || ${TRUE}
diff -r eb42be50ee14 -r 6a465ae29503 x11/xorg-clients/files/host.def
--- a/x11/xorg-clients/files/host.def Wed Oct 20 14:20:09 2004 +0000
+++ b/x11/xorg-clients/files/host.def Wed Oct 20 14:33:30 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.3 2004/09/21 17:38:53 xtraeme Exp $ */
+/* $NetBSD: host.def,v 1.4 2004/10/20 14:33:30 reed Exp $ */
#define ProjectRoot @PREFIX@
#define BuildHtmlManPages NO
@@ -64,3 +64,6 @@
#define HasFontconfig YES
#define FontconfigDir @BLNK@
+
+#define XdmDir @PKG_SYSCONFDIR@
+#define XdmEgDir @EGDIR@
diff -r eb42be50ee14 -r 6a465ae29503 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo Wed Oct 20 14:20:09 2004 +0000
+++ b/x11/xorg-libs/distinfo Wed Oct 20 14:33:30 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/10/08 03:35:25 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/10/20 14:33:30 reed Exp $
SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -16,3 +16,7 @@
SHA1 (patch-aj) = 78855dfdafe76695290636e170f69b6685ad23e1
SHA1 (patch-ak) = d600481936a6b141dc1247e1af2270e224b03b22
SHA1 (patch-al) = cb82cecd7147da8edd19d9f38a0789f07cddea87
+SHA1 (patch-am) = a907d42a4d2a72871e165b99afdba81945d656c7
+SHA1 (patch-an) = 513f8746bb66c954decdd7f2ca00888175c72834
+SHA1 (patch-ao) = 3350204fda261f03ba69e475420f90141974c6b0
+SHA1 (patch-ap) = 4a69e2df26e850ee33c1f7e6acc45ac205a46cd5
diff -r eb42be50ee14 -r 6a465ae29503 x11/xorg-libs/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/patches/patch-am Wed Oct 20 14:33:30 2004 +0000
@@ -0,0 +1,59 @@
+$NetBSD: patch-am,v 1.3 2004/10/20 14:33:30 reed Exp $
+
+--- programs/xdm/Imakefile.orig 2004-07-26 15:56:33.000000000 -0700
++++ programs/xdm/Imakefile
+@@ -195,6 +195,13 @@ LIFREQ_FLAGS = -Xa
+ #endif
+ #endif
+
++XDMLOGDIR = $(LOGDIRECTORY)
++#ifdef VarRunDirectory
++XDMPIDDIR = $(VARRUNDIR)
++#else
++XDMPIDDIR = $(XDMDIR)
++#endif
++
+ SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2) $(SYS_LIBRARIES3)
+
+ XDMCONFIGDIR = XdmConfigurationSubdirectory
+@@ -252,7 +259,8 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB)
+ #endif
+ PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW)
+
+- CHOOSERPATH = $(XDMDIR)/chooser
++ CHOOSERPATH = $(BINDIR)/chooser
++ GREETERLIBPATH = $(USRLIBDIR)/libXdmGreet.so
+ OSMAJORVERSION = OSMajorVersion
+ OSMINORVERSION = OSMinorVersion
+ CONN_DEFINES = $(CONNECTION_FLAGS)
+@@ -267,6 +275,10 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB)
+ $(XPM_DEFINES) $(XINERAMA_DEFINES) $(PROCTITLE_DEFINES) \
+ $(IFADDRS_DEFINES) $(IPV6_DEFINES) $(MKSTEMP_DEFINES)
+ EXTRAMANDEFS = $(RANDOM_DEFINES) -DCHOOSERPATH=$(CHOOSERPATH) \
++ -DGREETERLIBPATH=$(GREETERLIBPATH) \
++ -DXDMDIR=$(XDMDIR) \
++ -DXDMAUTHDIR=$(XDMVARDIR) \
++ -DXDMPIDDIR=$(XDMPIDDIR) \
+ -DXDMLOGDIR=$(XDMLOGDIR)
+
+ XCOMM
+@@ -290,8 +302,8 @@ RES_DEFINES = '-DDEF_SERVER_LINE=":0 loc
+ '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
+ '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
+ '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
+- '-DDEF_AUTH_DIR="$(XDMDIR)"' \
+- '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
++ '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
++ '-DDEF_GREETER_LIB="$(GREETERLIBPATH)"'
+
+ ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
+ #ifdef LinkConfDirectory
+@@ -316,7 +328,7 @@ SpecialCObjectRule(daemon,$(ICONFIGFILES
+ #if BuildChooser
+ SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS))
+ NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
+-InstallProgram(chooser,$(XDMDIR))
++InstallProgram(chooser,$(BINDIR))
+ InstallAppDefaults(Chooser)
+ #endif
+ #if BuildBoth
diff -r eb42be50ee14 -r 6a465ae29503 x11/xorg-libs/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/patches/patch-an Wed Oct 20 14:33:30 2004 +0000
@@ -0,0 +1,107 @@
+$NetBSD: patch-an,v 1.3 2004/10/20 14:33:30 reed Exp $
+
+--- programs/xdm/xdm.man.orig 2004-07-26 15:56:33.000000000 -0700
++++ programs/xdm/xdm.man
+@@ -164,7 +164,7 @@ as resources.
+ Names the configuration file, which specifies resources to control
+ the behavior of
+ .I xdm.
+-.I __projectroot__/lib/X11/xdm/xdm-config
++.I XDMDIR/xdm-config
+ is the default.
+ See the section \fBConfiguration File\fP.
+ .IP "\fB\-nodaemon\fP"
+@@ -306,7 +306,7 @@ uses the \fIlockf\fP library call, while
+ This names a directory under which
+ .I xdm
+ stores authorization files while initializing the session. The
+-default value is \fI __projectroot__/lib/X11/xdm.\fP
++default value is \fI\&XDMAUTHDIR\fP.
+ Can be overridden for specific displays by
+ DisplayManager.\fIDISPLAY\fP.authFile.
+ .IP \fBDisplayManager.autoRescan\fP
+@@ -374,7 +374,7 @@ algorithm is used instead.
+ .IP \fBDisplayManager.greeterLib\fP
+ On systems that support a dynamically-loadable greeter library, the
+ name of the library. The default is
+-\fI __projectroot__/lib/X11/xdm/libXdmGreet.so\fP.
++\fI\&GREETERLIBPATH\fP.
+ .IP \fBDisplayManager.choiceTimeout\fP
+ Number of seconds to wait for display to respond after user has
+ selected a host from the chooser. If the display sends an XDMCP
+@@ -406,7 +406,7 @@ section
+ which describes the various
+ resources that are appropriate to place in this file.
+ There is no default value for this resource, but
+-\fI __projectroot__/lib/X11/xdm/Xresources\fP
++\fI\&XDMDIR/Xresources\fP
+ is the conventional name.
+ .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.chooser\fP"
+ Specifies the program run to offer a host menu for Indirect queries
+@@ -599,7 +599,7 @@ variable XAUTHORITY at the created file.
+ First, the
+ .I xdm
+ configuration file should be set up.
+-Make a directory (usually \fI __projectroot__/lib/X11/xdm\fP) to contain all
++Make a directory (usually \fI\&XDMDIR\fP) to contain all
+ of the relevant files.
+ .LP
+ Here is a reasonable configuration file, which could be
+@@ -608,12 +608,12 @@ named \fIxdm-config\fP:
+
Home |
Main Index |
Thread Index |
Old Index