From 7c9c8362166c8ef3228f88badb35b779d2281a08 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Mon, 16 Jul 2018 09:11:31 +0000
Subject: [PATCH] network.conf.template -> network.conf it's never really been
 used properly

---
 .../network.conf.template => db/network.conf}          | 10 +---------
 infrastructure/mk/bsd.port.mk                          |  6 +-----
 2 files changed, 2 insertions(+), 14 deletions(-)
 rename infrastructure/{templates/network.conf.template => db/network.conf} (95%)

diff --git a/infrastructure/templates/network.conf.template b/infrastructure/db/network.conf
similarity index 95%
rename from infrastructure/templates/network.conf.template
rename to infrastructure/db/network.conf
index a3aa0a4a954..672087eb5b1 100644
--- a/infrastructure/templates/network.conf.template
+++ b/infrastructure/db/network.conf
@@ -1,12 +1,4 @@
-# $OpenBSD: network.conf.template,v 1.218 2018/07/15 08:44:33 espie Exp $
-
-#
-# NEVER EDIT THIS FILE DIRECTLY!!!!
-#
-# ADD YOUR OWN ENTRIES TO ../db/network.conf - EITHER COPY THIS
-# FILE AND MODIFY IT, OR ADD YOUR OWN ENTRIES FIRST FOLLOWED BY:
-# .include "../templates/network.conf.template"
-#
+# $OpenBSD: network.conf,v 1.5 2018/07/16 09:11:31 espie Exp $
 
 # List of OpenBSD sites
 MASTER_SITE_OPENBSD ?= \
diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index a098ddf2b1b..d1e2e7e54d7 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.1425 2018/07/15 09:57:34 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.1426 2018/07/16 09:11:31 espie Exp $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -1137,11 +1137,7 @@ ECHO_MSG ?= echo
 
 # basic master sites configuration
 
-.if exists(${PORTSDIR}/infrastructure/db/network.conf)
 .include "${PORTSDIR}/infrastructure/db/network.conf"
-.else
-.include "${PORTSDIR}/infrastructure/templates/network.conf.template"
-.endif
 
 .if !empty(GH_ACCOUNT) && !empty(GH_PROJECT)
 .  if !empty(GH_COMMIT) && !empty(GH_TAGNAME)