pkg/41102: upgrade x11/xdm and use CONF_FILES

[reed%reedmedia.net@localhost]

>Number:         41102
>Category:       pkg
>Synopsis:       upgrade x11/xdm and use CONF_FILES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 30 19:45:00 +0000 2009
>Originator:     reed%reedmedia.net@localhost
>Release:        NetBSD 4.99.62
>Organization:
>Environment:
>Description:
Here is a patch for pkgsrc to upgrade x11/xdm and to use
CONF_FILES.
I have used this for many months.
I used this so I could be sure to use correct X server when using
pkgsrc xdm (I had base xdm and X installed too).

Change history is at
http://lists.freedesktop.org/archives/xorg-announce/2008-May/000549.html
http://lists.freedesktop.org/archives/xorg-announce/2008-March/000478.html

>How-To-Repeat:
        
>Fix:

Index: x11/xdm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xdm/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- x11/xdm/Makefile    10 Nov 2008 17:21:39 -0000      1.9
+++ x11/xdm/Makefile    30 Mar 2009 19:02:58 -0000
@@ -1,7 +1,9 @@
 # $NetBSD: Makefile,v 1.9 2008/11/10 17:21:39 wiz Exp $
 
-DISTNAME=      xdm-1.1.6
-PKGREVISION=   2
+# TODO: CONF_FILES for xdm
+# TODO: xdm rc.d script has same name, but command is different
+
+DISTNAME=      xdm-1.1.8
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=  .tar.bz2
@@ -18,6 +20,19 @@
 CONFIGURE_ARGS+=       --enable-tcp-transport
 CONFIGURE_ARGS+=       --enable-unix-transport
 
+PKG_SYSCONFSUBDIR=     xdm
+CONFIGURE_ARGS+=       --with-xdmconfigdir=${PKG_SYSCONFDIR:Q}
+INSTALL_MAKE_FLAGS+=   ${MAKE_FLAGS}
+INSTALL_MAKE_FLAGS+=   xdmconfigdir="${PREFIX}/share/examples/xdm"
+CONF_FILES=            ${PREFIX}/share/examples/xdm/xdm-config \
+                       ${PKG_SYSCONFDIR}/xdm-config
+CONF_FILES+=           ${PREFIX}/share/examples/xdm/Xaccess    \
+                       ${PKG_SYSCONFDIR}/Xaccess
+CONF_FILES+=           ${PREFIX}/share/examples/xdm/Xresources \
+                       ${PKG_SYSCONFDIR}/Xresources
+CONF_FILES+=           ${PREFIX}/share/examples/xdm/Xservers   \
+                       ${PKG_SYSCONFDIR}/Xservers
+
 USE_TOOLS+=    pkg-config
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c
Index: x11/xdm/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xdm/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- x11/xdm/PLIST       6 Aug 2007 14:56:33 -0000       1.1.1.1
+++ x11/xdm/PLIST       30 Mar 2009 19:02:58 -0000
@@ -4,10 +4,7 @@
 lib/X11/app-defaults/Chooser
 lib/X11/xdm/GiveConsole
 lib/X11/xdm/TakeConsole
-lib/X11/xdm/Xaccess
 lib/X11/xdm/Xreset
-lib/X11/xdm/Xresources
-lib/X11/xdm/Xservers
 lib/X11/xdm/Xsession
 lib/X11/xdm/Xsetup_0
 lib/X11/xdm/Xstartup
@@ -16,9 +13,13 @@
 lib/X11/xdm/libXdmGreet.la
 lib/X11/xdm/pixmaps/xorg-bw.xpm
 lib/X11/xdm/pixmaps/xorg.xpm
-lib/X11/xdm/xdm-config
 man/man1/xdm.1
 share/examples/rc.d/xdm
+share/examples/xdm/Xaccess
+share/examples/xdm/Xservers
+share/examples/xdm/Xresources
+share/examples/xdm/xdm-config
+@dirrm share/examples/xdm
 @dirrm lib/X11/xdm/pixmaps
 @dirrm lib/X11/xdm
 @comment @dirrm lib/X11/app-defaults
Index: x11/xdm/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xdm/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- x11/xdm/distinfo    18 Jan 2008 02:54:15 -0000      1.2
+++ x11/xdm/distinfo    30 Mar 2009 19:02:58 -0000
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.2 2008/01/18 02:54:15 bjs Exp $
 
-SHA1 (xdm-1.1.6.tar.bz2) = 9b5642407f01bbdaa8ad699e2d2417bd26372c53
-RMD160 (xdm-1.1.6.tar.bz2) = 24f5d5fef2e608b7a0a0f7efd174e4d536663c90
-Size (xdm-1.1.6.tar.bz2) = 394175 bytes
-SHA1 (patch-aa) = f2308286759f5af228fea0e0dfe4934b56a4b591
+SHA1 (xdm-1.1.8.tar.bz2) = 619d810d9cd60e193be72365791cdb4057fc56ce
+RMD160 (xdm-1.1.8.tar.bz2) = 5435ff73a8fea36ecb071462121308f828d47927
+Size (xdm-1.1.8.tar.bz2) = 401712 bytes
Index: x11/xdm/files/xdm.sh
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xdm/files/xdm.sh,v
retrieving revision 1.2
diff -u -r1.2 xdm.sh
--- x11/xdm/files/xdm.sh        6 Aug 2007 16:43:40 -0000       1.2
+++ x11/xdm/files/xdm.sh        30 Mar 2009 19:02:58 -0000
@@ -11,7 +11,7 @@
 
 name="xdm"
 rcvar=$name
-xdm_config="/etc/X11/${name}/${name}-config"
+xdm_config="@PKG_SYSCONFDIR@/${name}-config"
 command="@PREFIX@/bin/${name}"
 command_args="-config ${xdm_config}"
 pidfile="/var/run/${name}.pid"

>Unformatted: