i2pd & libi2pd: fixed WRKSRC

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: i2pd & libi2pd: fixed WRKSRC
From: Jake Slazenger <jake.slazenger%yandex.com@localhost>
Date: Thu, 22 Mar 2018 09:03:25 +0000
Module Name:	pkgsrc-wip
Committed By:	Jake Slazenger <jake.slazenger%yandex.com@localhost>
Pushed By:	jakeSlaz
Date:		Thu Mar 22 12:03:25 2018 +0300
Changeset:	50032655d879572837020988fc992edd5f0c1621

Modified Files:
	i2pd/Makefile
	i2pd/distinfo
	i2pd/patches/patch-CMakeLists.txt
	i2pd/patches/patch-I2PEndian.h
	i2pd/patches/patch-NTCPSession.cpp
	libi2pd/Makefile.common
	libi2pd/distinfo
	libi2pd/patches/patch-CMakeLists.txt
	libi2pd/patches/patch-I2PEndian.h
	libi2pd/patches/patch-NTCPSession.cpp

Log Message:
i2pd & libi2pd: fixed WRKSRC

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

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

diffstat:
 i2pd/Makefile                         | 69 +++++++++++++++++------------------
 i2pd/distinfo                         |  6 +--
 i2pd/patches/patch-CMakeLists.txt     |  4 +-
 i2pd/patches/patch-I2PEndian.h        |  4 +-
 i2pd/patches/patch-NTCPSession.cpp    |  4 +-
 libi2pd/Makefile.common               |  3 +-
 libi2pd/distinfo                      |  6 +--
 libi2pd/patches/patch-CMakeLists.txt  |  4 +-
 libi2pd/patches/patch-I2PEndian.h     |  4 +-
 libi2pd/patches/patch-NTCPSession.cpp |  4 +-
 10 files changed, 54 insertions(+), 54 deletions(-)

diffs:
diff --git a/i2pd/Makefile b/i2pd/Makefile
index e4577ba8e7..5a3696be51 100644
--- a/i2pd/Makefile
+++ b/i2pd/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 .include	"../../wip/libi2pd/Makefile.common"
 
-PKGNAME=	i2pd-${I2PD_VERSION}
-COMMENT=	Full-featured C++ implementation of I2P client
+PKGNAME=		i2pd-${I2PD_VERSION}
+COMMENT=		Full-featured C++ implementation of I2P client
 
-CONFLICTS+= i2pd-git-*
+CONFLICTS+=		i2pd-git-*
 
 BUILD_DEFS+=	VARBASE PKG_SYSCONFBASE
 USE_TOOLS+=		pax
@@ -12,68 +12,67 @@ USE_TOOLS+=		pax
 CMAKE_ARGS+=	-DWITH_BINARY=yes
 CMAKE_ARGS+=	-DWITH_LIBRARY=no
 
-I2PD_SOURCESDIR=${WRKSRC}/..
 EGDIR=			share/examples/i2pd
 
-SUBST_CLASSES+=	fix-paths
-SUBST_STAGE.fix-paths=	pre-configure
+SUBST_CLASSES+=				fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing hardcoded path for datadir
-SUBST_FILES.fix-paths=	${I2PD_SOURCESDIR}/libi2pd/FS.cpp
-SUBST_SED.fix-paths=	-e 's,/var/lib,${PREFIX}/var,g'
-
-I2PD_USER=		i2pd
-I2PD_GROUP=		i2pd
-PKG_HOME.${I2PD_USER}= ${PREFIX}/var/i2pd
-PKG_USERS=	${I2PD_USER}:${I2PD_GROUP}
-PKG_GROUPS=	${I2PD_GROUP}
+SUBST_FILES.fix-paths=		${WRKSRC}/libi2pd/FS.cpp
+SUBST_SED.fix-paths=		-e 's,/var/lib,${PREFIX}/var,g'
+
+I2PD_USER=				i2pd
+I2PD_GROUP=				i2pd
+PKG_HOME.${I2PD_USER}=	${PREFIX}/var/i2pd
+PKG_USERS=				${I2PD_USER}:${I2PD_GROUP}
+PKG_GROUPS=				${I2PD_GROUP}
 PKG_GECOS.${I2PD_USER}=	i2pd user
 
-PKG_SYSCONFSUBDIR=i2pd
+PKG_SYSCONFSUBDIR=		i2pd
 
-INSTALLATION_DIRS+=	bin
-INSTALLATION_DIRS+=	${EGDIR}
-INSTALLATION_DIRS+=	${PKGMANDIR}/man1
-INSTALLATION_DIRS+=	${PKG_SYSCONFBASE}/i2pd
-INSTALLATION_DIRS+=	var/i2pd
-INSTALLATION_DIRS+=	var/i2pd/certificates
+INSTALLATION_DIRS+=		bin
+INSTALLATION_DIRS+=		${EGDIR}
+INSTALLATION_DIRS+=		${PKGMANDIR}/man1
+INSTALLATION_DIRS+=		${PKG_SYSCONFBASE}/i2pd
+INSTALLATION_DIRS+=		var/i2pd
+INSTALLATION_DIRS+=		var/i2pd/certificates
 
 .if ${OPSYS} == "NetBSD" # NetBSD-specific config
-CONF_FILES+= ${EGDIR}/i2pd.conf.NetBSD \
-			 ${PREFIX}/${PKG_SYSCONFDIR}/i2pd.conf
+CONF_FILES+= 	${EGDIR}/i2pd.conf.NetBSD \
+			${PREFIX}/${PKG_SYSCONFDIR}/i2pd.conf
 .else
-CONF_FILES+= ${EGDIR}/i2pd.conf \
-			 ${PREFIX}/${PKG_SYSCONFDIR}/i2pd.conf
+CONF_FILES+= 	${EGDIR}/i2pd.conf \
+			${PREFIX}/${PKG_SYSCONFDIR}/i2pd.conf
 .endif
 
-RCD_SCRIPTS+=i2pd
-RCD_SCRIPT_SRC.i2pd=${FILESDIR}/i2pd.in
+RCD_SCRIPTS+=	i2pd
+RCD_SCRIPT_SRC.i2pd=	${FILESDIR}/i2pd.in
 
 MAKE_DIRS+=${VARBASE}/log/i2pd
 MAKE_DIRS+=${VARBASE}/run/i2pd
 
 MAKE_DIRS_PERMS+=${VARBASE}/log/i2pd \
-				 ${I2PD_USER} ${I2PD_GROUP} 0755
+			${I2PD_USER} ${I2PD_GROUP} 0755
 
 MAKE_DIRS_PERMS+=${VARBASE}/run/i2pd \
-				 ${I2PD_USER} ${I2PD_GROUP} 0700
+			${I2PD_USER} ${I2PD_GROUP} 0700
 
 MAKE_DIRS_PERMS+=${PREFIX}/var/i2pd \
-				 ${I2PD_USER} ${I2PD_GROUP} 0700
+			${I2PD_USER} ${I2PD_GROUP} 0700
 
 MAKE_DIRS_PERMS+=${PREFIX}/var/i2pd/certificates \
-				 ${I2PD_USER} ${I2PD_GROUP} 0700
+			${I2PD_USER} ${I2PD_GROUP} 0700
 
 post-install:
-	${INSTALL_MAN} ${I2PD_SOURCESDIR}/debian/i2pd.1 \
+	${INSTALL_MAN} ${WRKSRC}/debian/i2pd.1 \
 		${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1/
 
-	cd ${I2PD_SOURCESDIR}/contrib/certificates && \
+	cd ${WRKSRC}/contrib/certificates && \
 		pax -wr * ${DESTDIR}/${PREFIX}/var/i2pd/certificates/
 
-	${INSTALL_DATA} ${I2PD_SOURCESDIR}/contrib/tunnels.conf \
+	${INSTALL_DATA} ${WRKSRC}/contrib/tunnels.conf \
 		${DESTDIR}/${PREFIX}/${EGDIR}/tunnels.conf
 
-	${INSTALL_DATA} ${I2PD_SOURCESDIR}/contrib/i2pd.conf \
+	${INSTALL_DATA} ${WRKSRC}/contrib/i2pd.conf \
 		${DESTDIR}/${PREFIX}/${EGDIR}/i2pd.conf
 
 	${INSTALL_DATA} ${FILESDIR}/i2pd.conf.NetBSD \
diff --git a/i2pd/distinfo b/i2pd/distinfo
index 135af5f96f..840054a337 100644
--- a/i2pd/distinfo
+++ b/i2pd/distinfo
@@ -4,6 +4,6 @@ SHA1 (i2pd/i2pd-2.18.0.tar.gz) = 2c1e6750d874b3369ae3102ba50dad9292dedad4
 RMD160 (i2pd/i2pd-2.18.0.tar.gz) = 94a0edda2fdcd7ee0ae4d1478ba63dd35464d386
 SHA512 (i2pd/i2pd-2.18.0.tar.gz) = dc8e0f4df25188e4d72ea6ffa2c36e48a7d2103d025730b40e226ab631724a9a07a4dc03a1a3d08328972c98020c44535661820add80374f1dabdf3fc848ef84
 Size (i2pd/i2pd-2.18.0.tar.gz) = 1868440 bytes
-SHA1 (patch-CMakeLists.txt) = bc42e715dcf80f3ef3aae76626b9d245025de101
-SHA1 (patch-I2PEndian.h) = 6f18a636515366509eed646f77979b36e1259458
-SHA1 (patch-NTCPSession.cpp) = 77e7110d9cf09ef409edb54639147b3f52438709
+SHA1 (patch-CMakeLists.txt) = 1a8eecd49068d3a55351640da96d2d83ef0eeeb7
+SHA1 (patch-I2PEndian.h) = c627fe0f6d8bfe10badd2b4cb8e6513c2c31767d
+SHA1 (patch-NTCPSession.cpp) = ae87892d65a0e6e088059f14c9a1c62c37feaca3
diff --git a/i2pd/patches/patch-CMakeLists.txt b/i2pd/patches/patch-CMakeLists.txt
index 17acbcaf8e..8dc502ec18 100644
--- a/i2pd/patches/patch-CMakeLists.txt
+++ b/i2pd/patches/patch-CMakeLists.txt
@@ -5,8 +5,8 @@ Don't allow to install source, header and license files for the i2pd client.
 Also fix problem with WITH_LIBRARY option that doesn't work (known problem,
 fixed in the upstream: github.com/PurpleI2P/i2pd/issues/1146).
 
---- work/i2pd-2.18.0/build/CMakeLists.txt	2018-01-30 16:14:29.000000000 +0000
-+++ CMakeLists.txt
+--- build/CMakeLists.txt	2018-01-30 16:14:29.000000000 +0000
++++ build/CMakeLists.txt
 @@ -93,13 +93,16 @@ endif()
  
  add_library(libi2pd ${LIBI2PD_SRC})
diff --git a/i2pd/patches/patch-I2PEndian.h b/i2pd/patches/patch-I2PEndian.h
index e1c709f925..ef47a39df8 100644
--- a/i2pd/patches/patch-I2PEndian.h
+++ b/i2pd/patches/patch-I2PEndian.h
@@ -4,8 +4,8 @@ Adding NetBSD-specific macro.
 Fixed in the upstream: 
 github.com/PurpleI2P/i2pd/commit/30fb0f5a942cc5195c725feae25ab38f88b08436
 
---- ../libi2pd/I2PEndian.h	2018-01-30 16:14:29.000000000 +0000
-+++ ../libi2pd/I2PEndian.h
+--- libi2pd/I2PEndian.h	2018-01-30 16:14:29.000000000 +0000
++++ libi2pd/I2PEndian.h
 @@ -3,7 +3,7 @@
  #include <inttypes.h>
  #include <string.h>
diff --git a/i2pd/patches/patch-NTCPSession.cpp b/i2pd/patches/patch-NTCPSession.cpp
index 72d3d83d3f..92d2891ba1 100644
--- a/i2pd/patches/patch-NTCPSession.cpp
+++ b/i2pd/patches/patch-NTCPSession.cpp
@@ -3,8 +3,8 @@ $NetBSD$
 >"due the bug in gcc 4.7. std::shared_future.get() is not const"
 github.com/PurpleI2P/i2pd/commit/30fb0f5a942cc5195c725feae25ab38f88b08436
 
---- ../libi2pd/NTCPSession.cpp	2018-01-30 16:14:29.000000000 +0000
-+++ ../libi2pd/NTCPSession.cpp
+--- libi2pd/NTCPSession.cpp	2018-01-30 16:14:29.000000000 +0000
++++ libi2pd/NTCPSession.cpp
 @@ -171,7 +171,7 @@ namespace transport
  					return;
  				}
diff --git a/libi2pd/Makefile.common b/libi2pd/Makefile.common
index ec56e91942..3d09afcaa5 100644
--- a/libi2pd/Makefile.common
+++ b/libi2pd/Makefile.common
@@ -8,7 +8,8 @@ DISTNAME=		i2pd-${I2PD_VERSION}
 CATEGORIES=		net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=PurpleI2P/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-WRKSRC=			${WRKDIR}/i2pd-2.18.0/build
+WRKSRC=			${WRKDIR}/${DISTNAME}/
+CMAKE_ARG_PATH=		build/
 
 MAINTAINER=		jake.slazenger%yandex.com@localhost
 HOMEPAGE=		https://github.com/PurpleI2P/i2pd/
diff --git a/libi2pd/distinfo b/libi2pd/distinfo
index a1065c39ca..ae3fc4f8bf 100644
--- a/libi2pd/distinfo
+++ b/libi2pd/distinfo
@@ -4,6 +4,6 @@ SHA1 (i2pd/i2pd-2.18.0.tar.gz) = 2c1e6750d874b3369ae3102ba50dad9292dedad4
 RMD160 (i2pd/i2pd-2.18.0.tar.gz) = 94a0edda2fdcd7ee0ae4d1478ba63dd35464d386
 SHA512 (i2pd/i2pd-2.18.0.tar.gz) = dc8e0f4df25188e4d72ea6ffa2c36e48a7d2103d025730b40e226ab631724a9a07a4dc03a1a3d08328972c98020c44535661820add80374f1dabdf3fc848ef84
 Size (i2pd/i2pd-2.18.0.tar.gz) = 1868440 bytes
-SHA1 (patch-CMakeLists.txt) = 2a8dcce71bbd25eccfbf2af01902d8b6ad97b9a5
-SHA1 (patch-I2PEndian.h) = 805898295f9a1152c449376fbf74a339033f832f
-SHA1 (patch-NTCPSession.cpp) = 77e7110d9cf09ef409edb54639147b3f52438709
+SHA1 (patch-CMakeLists.txt) = 6f7b399e83de05fc00a401bab62c0132263ecaed
+SHA1 (patch-I2PEndian.h) = 4ce5f3c4f1a0e7e7be65518299b26420cc1c3763
+SHA1 (patch-NTCPSession.cpp) = ae87892d65a0e6e088059f14c9a1c62c37feaca3
diff --git a/libi2pd/patches/patch-CMakeLists.txt b/libi2pd/patches/patch-CMakeLists.txt
index 96923bbe6d..e21f9435fe 100644
--- a/libi2pd/patches/patch-CMakeLists.txt
+++ b/libi2pd/patches/patch-CMakeLists.txt
@@ -3,8 +3,8 @@ $NetBSD$
 Don't allow source and license files installing.
 Also change destination for headers of i2pd library
 
---- CMakeLists.txt	2018-01-30 16:14:29.000000000 +0000
-+++ CMakeLists.txt
+--- build/CMakeLists.txt	2018-01-30 16:14:29.000000000 +0000
++++ build/CMakeLists.txt
 @@ -466,10 +466,10 @@ if (WITH_BINARY)
    endif ()
  endif ()
diff --git a/libi2pd/patches/patch-I2PEndian.h b/libi2pd/patches/patch-I2PEndian.h
index 87e4885941..950c6a33a2 100644
--- a/libi2pd/patches/patch-I2PEndian.h
+++ b/libi2pd/patches/patch-I2PEndian.h
@@ -2,8 +2,8 @@ $NetBSD$
 
 Adding NetBSD-specific macro (send this patch to the upstream)
 
---- ../libi2pd/I2PEndian.h	2018-01-30 16:14:29.000000000 +0000
-+++ ../libi2pd/I2PEndian.h
+--- libi2pd/I2PEndian.h	2018-01-30 16:14:29.000000000 +0000
++++ libi2pd/I2PEndian.h
 @@ -3,7 +3,7 @@
  #include <inttypes.h>
  #include <string.h>
diff --git a/libi2pd/patches/patch-NTCPSession.cpp b/libi2pd/patches/patch-NTCPSession.cpp
index 72d3d83d3f..92d2891ba1 100644
--- a/libi2pd/patches/patch-NTCPSession.cpp
+++ b/libi2pd/patches/patch-NTCPSession.cpp
@@ -3,8 +3,8 @@ $NetBSD$
 >"due the bug in gcc 4.7. std::shared_future.get() is not const"
 github.com/PurpleI2P/i2pd/commit/30fb0f5a942cc5195c725feae25ab38f88b08436
 
---- ../libi2pd/NTCPSession.cpp	2018-01-30 16:14:29.000000000 +0000
-+++ ../libi2pd/NTCPSession.cpp
+--- libi2pd/NTCPSession.cpp	2018-01-30 16:14:29.000000000 +0000
++++ libi2pd/NTCPSession.cpp
 @@ -171,7 +171,7 @@ namespace transport
  					return;
  				}
Prev by Date: argouml: add LICENSE
Next by Date: rclone: Take MAINTAINERship
Previous by Thread: argouml: add LICENSE
Next by Thread: rclone: Take MAINTAINERship
Indexes:
Home | Main Index | Thread Index | Old Index