===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Makefile,v
retrieving revision 1.357
retrieving revision 1.358
diff -c -r1.357 -r1.358
*** src/etc/Makefile	2014/04/29 21:30:20	1.357
--- src/etc/Makefile	2014/07/11 16:59:03	1.358
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.357 2014/04/29 21:30:20 dcoppa Exp $
  
  TZDIR=		/usr/share/zoneinfo
  LOCALTIME=	Canada/Mountain
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.358 2014/07/11 16:59:03 deraadt Exp $
  
  TZDIR=		/usr/share/zoneinfo
  LOCALTIME=	Canada/Mountain
***************
*** 38,45 ****
  	remote rpc services shells syslog.conf weekly \
  	etc.${MACHINE}/login.conf \
  	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
! 	moduli pf.os sensorsd.conf ifstated.conf mixerctl.conf
  
  .if ${MACHINE} != "aviion" 
  BIN1+=	wsconsctl.conf
  .endif
--- 38,48 ----
  	remote rpc services shells syslog.conf weekly \
  	etc.${MACHINE}/login.conf \
  	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
! 	moduli pf.os sensorsd.conf mixerctl.conf
  
+ EXAMPLES=chio.conf dvmrpd.conf hostapd.conf ifstated.conf ldpd.conf \
+ 	ospf6d.conf ospfd.conf
+ 
  .if ${MACHINE} != "aviion" 
  BIN1+=	wsconsctl.conf
  .endif
***************
*** 109,122 ****
  	${INSTALL} -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc
  	pwd_mkdb -p -d ${DESTDIR}/etc /etc/master.passwd
  	${INSTALL} -c -o root -g wheel -m 600 bgpd.conf ${DESTDIR}/etc
- 	${INSTALL} -c -o root -g wheel -m 600 ospfd.conf ${DESTDIR}/etc
- 	${INSTALL} -c -o root -g wheel -m 600 ospf6d.conf ${DESTDIR}/etc
  	${INSTALL} -c -o root -g wheel -m 600 ripd.conf ${DESTDIR}/etc
- 	${INSTALL} -c -o root -g wheel -m 600 dvmrpd.conf ${DESTDIR}/etc
- 	${INSTALL} -c -o root -g wheel -m 600 ldpd.conf ${DESTDIR}/etc
  	${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc
- 	${INSTALL} -c -o root -g operator -m 644 chio.conf ${DESTDIR}/etc
- 	${INSTALL} -c -o root -g wheel -m 600 hostapd.conf ${DESTDIR}/etc
  	${INSTALL} -c -o root -g wheel -m 600 relayd.conf ${DESTDIR}/etc
  	${INSTALL} -c -o root -g wheel -m 600 iked.conf ${DESTDIR}/etc
  	${INSTALL} -c -o root -g wheel -m 600 ipsec.conf ${DESTDIR}/etc
--- 112,119 ----
***************
*** 173,178 ****
--- 170,178 ----
  		    ${DESTDIR}/etc/ppp; \
  		${INSTALL} -c -o root -g wheel -m 600 pap-secrets \
  		    ${DESTDIR}/etc/ppp
+ 	cd examples; \
+ 		${INSTALL} -c -o root -g wheel -m 644 ${EXAMPLES} \
+ 		    ${DESTDIR}/etc/examples
  	cd signify; \
  		${INSTALL} -c -o root -g wheel -m 644 *.pub \
  		    ${DESTDIR}/etc/signify