i2pd: some fixes for files' installation

[Jake Slazenger <jake.slazenger%yandex.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jake Slazenger <jake.slazenger%yandex.com@localhost>
Pushed By:	jakeSlaz
Date:		Wed Mar 14 16:46:32 2018 +0300
Changeset:	5aa765c0ff198d042b936ba60767ec96f644ecab

Modified Files:
	i2pd/Makefile
	i2pd/PLIST

Log Message:
i2pd: some fixes for files' installation

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

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

diffstat:
 i2pd/Makefile | 12 +++++++-----
 i2pd/PLIST    | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diffs:
diff --git a/i2pd/Makefile b/i2pd/Makefile
index c2b0674f39..c4ff1151c9 100644
--- a/i2pd/Makefile
+++ b/i2pd/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD$
+.include	"../../wip/libi2pd/Makefile.common"
 
 PKGNAME=	i2pd-${I2PD_VERSION}
 
 COMMENT=	Full-featured C++ implementation of I2P client
 
-.include	"../../wip/libi2pd/Makefile.common"
-
 CMAKE_ARGS+=	-DWITH_BINARY=yes
 CMAKE_ARGS+=	-DWITH_LIBRARY=no
 
@@ -19,6 +18,7 @@ PKG_USERS=	${I2PD_USER}:${I2PD_GROUP}
 PKG_GROUPS=	${I2PD_GROUP}
 
 I2PD_SOURCESDIR=${WRKSRC}/..
+PKG_SYSCONFSUBDIR=i2pd
 I2PD_CONFDIR=${DESTDIR}/${PKG_SYSCONFBASE}/i2pd
 
 MAKE_DIRS+=${VARBASE}/db/i2pd
@@ -26,8 +26,10 @@ MAKE_DIRS+=${VARBASE}/log/i2pd
 MAKE_DIRS+=${VARBASE}/run/i2pd
 
 INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	share/examples/i2pd
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	${PKG_SYSCONFBASE}/i2pd
+INSTALLATION_DIRS+=	var/i2pd/
 
 MAKE_DIRS_PERMS+=${I2PD_CONFDIR} \
 				 ${I2PD_USER} ${I2PD_GROUP} 0755
@@ -44,8 +46,8 @@ post-install:
 	${INSTALL_DATA} ${I2PD_SOURCESDIR}/contrib/i2pd.conf \
 		${I2PD_CONFDIR}/
 	${INSTALL_DATA} ${I2PD_SOURCESDIR}/contrib/tunnels.conf \
-		${I2PD_CONFDIR}/
-	${INSTALL_DATA_DIR} ${I2PD_SOURCESDIR}/contrib/certificates \
-		${I2PD_CONFDIR}/
+		${DESTDIR}/${PREFIX}/share/examples/i2pd/
+	cp -Rv ${I2PD_SOURCESDIR}/contrib/certificates \
+		${DESTDIR}/${PREFIX}/var/i2pd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/i2pd/PLIST b/i2pd/PLIST
index 125da4166f..06f8ed839e 100644
--- a/i2pd/PLIST
+++ b/i2pd/PLIST
@@ -1,5 +1,21 @@
 @comment $NetBSD$
 bin/i2pd
 etc/i2pd/i2pd.conf
-etc/i2pd/tunnels.conf
 man/man1/i2pd.1
+share/examples/i2pd/tunnels.conf
+var/i2pd/certificates/family/gostcoin.crt
+var/i2pd/certificates/family/i2p-dev.crt
+var/i2pd/certificates/family/i2pd-dev.crt
+var/i2pd/certificates/family/mca2-i2p.crt
+var/i2pd/certificates/family/volatile.crt
+var/i2pd/certificates/reseed/atomike_at_mail.i2p.crt
+var/i2pd/certificates/reseed/backup_at_mail.i2p.crt
+var/i2pd/certificates/reseed/bugme_at_mail.i2p.crt
+var/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt
+var/i2pd/certificates/reseed/echelon_at_mail.i2p.crt
+var/i2pd/certificates/reseed/igor_at_novg.net.crt
+var/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt
+var/i2pd/certificates/reseed/meeh_at_mail.i2p.crt
+var/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt
+var/i2pd/certificates/reseed/zmx_at_mail.i2p.crt
+var/i2pd/certificates/router/orignal_at_mail.i2p.crt