svn commit: r338760 - in head: etc lib/libalias/libalias

[Brad Davis]

Author: brd
Date: Tue Sep 18 20:54:37 2018
New Revision: 338760
URL: https://svnweb.freebsd.org/changeset/base/338760

Log:
  Move libalias.conf to lib/libalias/libalias/
  
  This leveages CONFS to handle the install.
  
  Approved by:	re (blanket, pkgbase), bapt (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17218

Added:
  head/lib/libalias/libalias/libalias.conf
     - copied unchanged from r338759, head/etc/libalias.conf
Deleted:
  head/etc/libalias.conf
Modified:
  head/etc/Makefile
  head/lib/libalias/libalias/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Sep 18 20:52:24 2018	(r338759)
+++ head/etc/Makefile	Tue Sep 18 20:54:37 2018	(r338760)
@@ -15,7 +15,6 @@ SUBDIR+=sendmail
 BIN1=	\
 	group \
 	hosts.allow \
-	libalias.conf \
 	login.access \
 	phones \
 	rc.bsdextended \

Modified: head/lib/libalias/libalias/Makefile
==============================================================================
--- head/lib/libalias/libalias/Makefile	Tue Sep 18 20:52:24 2018	(r338759)
+++ head/lib/libalias/libalias/Makefile	Tue Sep 18 20:54:37 2018	(r338760)
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/sys/netinet/libalias
 
+CONFS=	libalias.conf
 PACKAGE=lib${LIB}
 LIB=	alias
 SHLIBDIR?= /lib

Copied: head/lib/libalias/libalias/libalias.conf (from r338759, head/etc/libalias.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libalias/libalias/libalias.conf	Tue Sep 18 20:54:37 2018	(r338760, copy of r338759, head/etc/libalias.conf)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+/lib/libalias_cuseeme.so
+/lib/libalias_ftp.so
+/lib/libalias_irc.so
+/lib/libalias_nbt.so
+/lib/libalias_pptp.so
+/lib/libalias_skinny.so
+/lib/libalias_smedia.so