xbps: Fixes in how conf files are handled.

[Aleksej Lebedev <root%zta.lk@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Aleksej Lebedev <root%zta.lk@localhost>
Pushed By:	zhtw
Date:		Mon May 13 16:12:50 2019 +0000
Changeset:	699faf7967d1b980ff45178592b89458e2d9be37

Modified Files:
	xbps/Makefile
	xbps/PLIST

Log Message:
xbps: Fixes in how conf files are handled.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=699faf7967d1b980ff45178592b89458e2d9be37

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xbps/Makefile | 22 ++++++++++++----------
 xbps/PLIST    |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diffs:
diff --git a/xbps/Makefile b/xbps/Makefile
index 98983cb524..ac1005b6c6 100644
--- a/xbps/Makefile
+++ b/xbps/Makefile
@@ -10,22 +10,24 @@ COMMENT=	The X Binary Package System
 LICENSE=	2-clause-bsd
 
 EGDIR=          ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES=     ${EGDIR}/xbps.conf.example \
-                  ${PKG_SYSCONFDIR}/xbps.d/xbps.conf \
-                ${EGDIR}/00-repository-main.conf.example \
-                  ${PKG_SYSCONFDIR}/xbps.d/00-repository-main.conf
+CONFS=          xbps.conf 00-repository-main.conf
 
-OWN_DIRS+=      ${PKG_SYSCONFDIR}/${PKGBASE}
+.for f in ${CONFS}
+CONF_FILES+=    ${EGDIR}/${f} ${PKG_SYSCONFDIR}/xbps.d/${f}
+.endfor
+
+INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/examples/${PKGBASE}
+
+OWN_DIRS+=      ${PKG_SYSCONFDIR}/xbps.d
 
 USE_TOOLS+=	pkg-config gmake
 GNU_CONFIGURE=	yes
 
 post-install:
-	cd ${DESTDIR}${PREFIX}/share && \
-	  ${MKDIR} examples/xbps && \
-	  ${MV} xbps.d/xbps.conf examples/xbps/xbps.conf.example && \
-	  ${MV} xbps.d/00-repository-main.conf examples/xbps/00-repository-main.conf.example && \
-	  ${RMDIR} xbps.d
+	${MKDIR} ${DESTDIR}${EGDIR} &&\
+	for f in ${CONFS}; do \
+	  ${MV} ${DESTDIR}${PREFIX}/share/xbps.d/$${f} ${DESTDIR}${EGDIR}; \
+	done
 
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/xbps/PLIST b/xbps/PLIST
index 9d9f62a67e..629662c74e 100644
--- a/xbps/PLIST
+++ b/xbps/PLIST
@@ -50,7 +50,7 @@ share/bash-completion/completions/xbps-query
 share/bash-completion/completions/xbps-reconfigure
 share/bash-completion/completions/xbps-remove
 share/bash-completion/completions/xbps-rindex
-share/examples/xbps/00-repository-main.conf.example
-share/examples/xbps/xbps.conf.example
+share/examples/xbps/00-repository-main.conf
+share/examples/xbps/xbps.conf
 share/zsh/site-functions/_xbps
 share/zsh/site-functions/_xbps_src