From 9c2b134bdd463f1a1a82fef608d3fcaed8f92f8c Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Sat, 14 May 2016 14:44:35 +0000
Subject: [PATCH] Remove handling of /etc/examples/ files by sysmerge(8).
 Getting regular messages about pkg.conf isn't really that helpful and if a
 big syntax change comes along well we have current.html.

it was disabled during p2k16 and no one complained so far
discussed with and ok deraadt@
---
 src/etc/Makefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 588aff4a..5eb50b86 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.423 2016/05/11 21:52:48 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.424 2016/05/14 14:44:35 ajacoutot Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -208,15 +208,9 @@ distribution-etc-root-var: distrib-dirs
 		    ${DESTDIR}/etc/rc.d
 	cd ${DESTDIR}/var; ln -fs ../tmp
 	touch ${DESTDIR}/var/sysmerge/etcsum
-	touch ${DESTDIR}/var/sysmerge/examplessum
 	cd ${DESTDIR}/ && \
 		sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \
 		xargs sha256 -h ${DESTDIR}/var/sysmerge/etcsum || true
-	cd ${DESTDIR}/ && \
-		grep -h '/etc/examples/' \
-		    ${.CURDIR}/../distrib/sets/lists/base/{mi,md.${MACHINE}} | \
-		sort | \
-		xargs sha256 -h ${DESTDIR}/var/sysmerge/examplessum || true
 	cd ${DESTDIR}/ && \
 		sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \
 	    	pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz