BitKeeper: update to 7.3 and fix build

[Wayne Scott <wscott%bitkeeper.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Wayne Scott <wscott%bitkeeper.com@localhost>
Pushed By:	terinjokes
Date:		Mon Aug 22 12:16:50 2016 -0400
Changeset:	8ebcc9e7bb4a1586945e2cb74b100b53776b0282

Modified Files:
	bitkeeper/Makefile
	bitkeeper/distinfo
Added Files:
	bitkeeper/files/conf.mk.local
	bitkeeper/patches/patch-Ldoc-install
Removed Files:
	bitkeeper/patches/patch-src_gui_tcltk_tcl_win_configure
	bitkeeper/patches/patch-src_libc_utils_crc32c.c

Log Message:
BitKeeper: update to 7.3 and fix build

Update to the bk-7.3ce release and add missing dependencies to
fix build.  Still doesn't attempt to fix the install target.

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

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

diffstat:
 bitkeeper/Makefile                                    | 18 +++++++++++++-----
 bitkeeper/distinfo                                    |  9 +++------
 bitkeeper/files/conf.mk.local                         |  8 ++++++++
 bitkeeper/patches/patch-Ldoc-install                  | 14 ++++++++++++++
 .../patches/patch-src_gui_tcltk_tcl_win_configure     | 19 -------------------
 bitkeeper/patches/patch-src_libc_utils_crc32c.c       | 15 ---------------
 6 files changed, 38 insertions(+), 45 deletions(-)

diffs:
diff --git a/bitkeeper/Makefile b/bitkeeper/Makefile
index e406377..c573b90 100644
--- a/bitkeeper/Makefile
+++ b/bitkeeper/Makefile
@@ -1,19 +1,27 @@
 # $NetBSD$
 
-DISTNAME=	bk-7.2.1
+DISTNAME=	bk-7.3ce
 PKGNAME=	${DISTNAME:S/bk/bitkeeper/}
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=bitkeeper-scm/}
-GITHUB_TAG=	${DISTNAME}ce
+MASTER_SITES=	http://www.bitkeeper.org/downloads/7.3ce/
+EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.bitkeeper.org/
 COMMENT=	Distributed Source Control System
 LICENSE=	apache-2.0
 
-USE_TOOLS+=	gmake bison lex groff perl bash
+USE_TOOLS+=	gmake bison lex groff perl bash gperf
 
-BUILD_DEPENDS+=	gperf-[0-9]*:../../devel/gperf
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../security/libtomcrypt/buildlink3.mk"
+.include "../../math/ltm/buildlink3.mk"
+.include "../../archivers/lz4/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+
+pre-configure:
+	perl -pe 's{BUILDLINK_DIR}{${BUILDLINK_DIR}}' \
+		< files/conf.mk.local > ${WRKSRC}/src/conf.mk.local
 
 do-build:
 	${RUN} cd ${WRKSRC}/src && ${GMAKE}  # p
diff --git a/bitkeeper/distinfo b/bitkeeper/distinfo
index 5d3744c..c6387af 100644
--- a/bitkeeper/distinfo
+++ b/bitkeeper/distinfo
@@ -1,8 +1,5 @@
 $NetBSD$
 
-SHA1 (bk-7.2.1.tar.gz) = ed7d1d1fe6c7dc5f7a5444cbf7bddefe1646ecb8
-RMD160 (bk-7.2.1.tar.gz) = 00046627f2fb02c9e017a469f2f7917abda0b2e9
-SHA512 (bk-7.2.1.tar.gz) = c07ae760f70e0715f20e667207385a10124fe4e577b85f3a930ae845fb4aee94946bdc7713d1c71fff06f5c166ba7e318f7f0137de6732ebe2c207274f617e50
-Size (bk-7.2.1.tar.gz) = 28958626 bytes
-SHA1 (patch-src_gui_tcltk_tcl_win_configure) = 909c7c4092a198efa0f8edcc21a7d33023e25860
-SHA1 (patch-src_libc_utils_crc32c.c) = f5be9e423aade86282b3e596f5035381b50fac8c
+SHA1 (bk-7.3ce.src.tar.gz) = 98303855a4cc84eea592bc6eca37c0d8feb83ed8
+Size (bk-7.3ce.src.tar.gz) = 20257094 bytes
+SHA1 (patch-Ldoc-install) = 2fa27a25427172722dddf398a0e0e47b26625daa
diff --git a/bitkeeper/files/conf.mk.local b/bitkeeper/files/conf.mk.local
new file mode 100644
index 0000000..37220ac
--- /dev/null
+++ b/bitkeeper/files/conf.mk.local
@@ -0,0 +1,8 @@
+PCRE_CPPFLAGS="-IBUILDLINK_DIR/include"
+PCRE_LDFLAGS="-LBUILDLINK_DIR/lib -lpcre"
+
+TOMCRYPT_CPPFLAGS="-IBUILDLINK_DIR/include"
+TOMCRYPT_LDFLAGS="-LBUILDLINK_DIR/lib -ltomcrypt"
+
+TOMMATH="-IBUILDLINK_DIR/include"
+TOMMATH="-LBUILDLINK_DIR/lib -ltommath"
diff --git a/bitkeeper/patches/patch-Ldoc-install b/bitkeeper/patches/patch-Ldoc-install
new file mode 100644
index 0000000..079c4bf
--- /dev/null
+++ b/bitkeeper/patches/patch-Ldoc-install
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/gui/tcltk/tcl/doc/L/Makefile.orig	2016-07-15 19:21:30.000000000 +0000
++++ src/gui/tcltk/tcl/doc/L/Makefile
+@@ -35,7 +35,8 @@
+ 	gv little.ps
+ 
+ install: all
+-	cp delta.gif little.man little.1 little.txt little.html $(INSTALL_DIR)
++	cp delta.gif little.man little.1 little.txt $(INSTALL_DIR)
++	-cp little.html $(INSTALL_DIR)
+ 
+ pfmt: little.man
+ 	-test -d $(PFMT_DIR) && { \
diff --git a/bitkeeper/patches/patch-src_gui_tcltk_tcl_win_configure b/bitkeeper/patches/patch-src_gui_tcltk_tcl_win_configure
deleted file mode 100644
index 5608ba5..0000000
--- a/bitkeeper/patches/patch-src_gui_tcltk_tcl_win_configure
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- src/gui/tcltk/tcl/win/configure.orig	2016-05-16 18:52:05.000000000 +0000
-+++ src/gui/tcltk/tcl/win/configure
-@@ -4918,7 +4918,7 @@ if test "$tcl_ok" = "yes"; then :
- 
-   if test "$do64bit" = "yes"; then :
- 
--    if test "$GCC" == "yes"; then :
-+    if test "$GCC" = "yes"; then :
- 
-       ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64/libz.dll.a
- 
-@@ -6811,5 +6811,3 @@ if test -n "$ac_unrecognized_opts" && te
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
--
--
diff --git a/bitkeeper/patches/patch-src_libc_utils_crc32c.c b/bitkeeper/patches/patch-src_libc_utils_crc32c.c
deleted file mode 100644
index f6eedca..0000000
--- a/bitkeeper/patches/patch-src_libc_utils_crc32c.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix build on NetBSD/amd64. From Wayne Scott.
-
---- src/libc/utils/crc32c.c.orig	2016-05-16 18:52:05.000000000 +0000
-+++ src/libc/utils/crc32c.c
-@@ -1247,7 +1247,7 @@ cpuid(u32 functionInput)
- 	u32 ebx;
- 	u32 ecx;
- 	u32 edx;
--#ifdef __PIC__
-+#if defined(__PIC__) && !defined(__x86_64__)
- 	// PIC: Need to save and restore ebx See:
- 	// http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well
- 	asm("pushl %%ebx\n\t" /* save %ebx */