From 99a84b826f726a3245333bcd5ef10c8ecb0cb546 Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Sat, 4 Aug 2018 22:31:29 +0000
Subject: [PATCH] Move portsnap.conf to head/usr.sbin/portsnap/portsnap/

This is prep for pkgbase to have config files tagged as such.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16554
---
 etc/Makefile                                      | 4 ----
 usr.sbin/portsnap/portsnap/Makefile               | 1 +
 {etc => usr.sbin/portsnap/portsnap}/portsnap.conf | 0
 3 files changed, 1 insertion(+), 4 deletions(-)
 rename {etc => usr.sbin/portsnap/portsnap}/portsnap.conf (100%)

diff --git a/etc/Makefile b/etc/Makefile
index cfec9f067027..90f7096f4cf8 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -107,10 +107,6 @@ SSH=	${SRCTOP}/crypto/openssh/ssh_config \
 SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
 .endif
 
-.if ${MK_PORTSNAP} != "no"
-BIN1+= portsnap.conf
-.endif
-
 .if ${MK_PF} != "no"
 BIN1+= pf.os
 .endif
diff --git a/usr.sbin/portsnap/portsnap/Makefile b/usr.sbin/portsnap/portsnap/Makefile
index e8f42b85f1b0..6acd3f523751 100644
--- a/usr.sbin/portsnap/portsnap/Makefile
+++ b/usr.sbin/portsnap/portsnap/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	portsnap.conf
 SCRIPTS=portsnap.sh
 MAN=	portsnap.8
 
diff --git a/etc/portsnap.conf b/usr.sbin/portsnap/portsnap/portsnap.conf
similarity index 100%
rename from etc/portsnap.conf
rename to usr.sbin/portsnap/portsnap/portsnap.conf