Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/etc/rc.d/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/etc/rc.d/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.68
retrieving revision 1.68.2.2
diff -u -p -r1.68 -r1.68.2.2
--- src/etc/rc.d/Makefile	2008/06/18 09:06:26	1.68
+++ src/etc/rc.d/Makefile	2009/01/22 21:28:26	1.68.2.2
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2008/06/18 09:06:26 yamt Exp $
+# $NetBSD: Makefile,v 1.68.2.2 2009/01/22 21:28:26 snj Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@ CONFIGFILES=\
 		ccd cgd cleartmp cron \
 		dhclient dhcpd dhcrelay dmesg downinterfaces envsys \
 		fsck ftp_proxy ftpd \
-		hostapd \
+		hostapd httpd \
 		identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \
 		irdaattach iscsi_target isdnd \
 		kdc \
@@ -30,9 +30,19 @@ CONFIGFILES=\
 		staticroute swap1 swap2 sysctl sysdb syslogd \
 		timed tpctl ttys \
 		veriexec virecover wdogctl wpa_supplicant wscons wsmoused \
-		xdm xfs \
 		ypbind yppasswdd ypserv
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 
+.if ${MKX11} != "no"
+CONFIGFILES+=	xdm xfs
+FILESBUILD_xdm=	yes
+FILESBUILD_xfs=	yes
+
+.SUFFIXES: .in
+.in:
+	${_MKTARGET_CREATE}
+	${TOOL_SED} -e 's,@X11ROOTDIR@,${X11ROOTDIR},g' < ${.IMPSRC} > ${.TARGET}
+.endif
+
 .include <bsd.prog.mk>