pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

bitkeeper: add X11 dependency and some linker flags so it's found.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Aug 24 00:26:58 2016 +0200
Changeset:	7f100cee5833c7d0840481496ec63c77843b3ce6

Modified Files:
	bitkeeper/Makefile
	bitkeeper/distinfo
Added Files:
	bitkeeper/patches/patch-src_gui_tcltk_tktable_configure
Removed Files:
	bitkeeper/TODO

Log Message:
bitkeeper: add X11 dependency and some linker flags so it's found.

Fixes package for me on NetBSD-7.99.36/amd64.

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

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

diffstat:
 bitkeeper/Makefile                                      |  1 +
 bitkeeper/TODO                                          | 10 ----------
 bitkeeper/distinfo                                      |  1 +
 bitkeeper/patches/patch-src_gui_tcltk_tktable_configure | 15 +++++++++++++++
 4 files changed, 17 insertions(+), 10 deletions(-)

diffs:
diff --git a/bitkeeper/Makefile b/bitkeeper/Makefile
index d36c777..517e3f4 100644
--- a/bitkeeper/Makefile
+++ b/bitkeeper/Makefile
@@ -34,4 +34,5 @@ do-install:
 .include "../../math/ltm/buildlink3.mk"
 .include "../../security/libtomcrypt/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/bitkeeper/TODO b/bitkeeper/TODO
deleted file mode 100644
index d274468..0000000
--- a/bitkeeper/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-Build on NetBSD fails with:
-
-bk tclsh ./pod2html.l --title="L Programmer's Reference Guide" \
-    --template=template.html -- little.doc > little.html
-bk: not found
-gmake[11]: [Makefile:21: little.html] Error 127 (ignored)
-cp delta.gif little.man little.1 little.txt little.html ../../../share/doc//L
-cp: little.html: No such file or directory
-
--- wiz 20160628
diff --git a/bitkeeper/distinfo b/bitkeeper/distinfo
index 2d63457..18814bb 100644
--- a/bitkeeper/distinfo
+++ b/bitkeeper/distinfo
@@ -6,3 +6,4 @@ SHA512 (bk-7.3ce.src.tar.gz) = 671828afe094a2c834f70ea2e70070eec823e6c67e0e3eaa8
 Size (bk-7.3ce.src.tar.gz) = 20257094 bytes
 SHA1 (patch-Ldoc-install) = f7d8f10d501240f08f7a27d058a700ce5b09a6d6
 SHA1 (patch-src_gui_tcltk_tcl_unix_Makefile.in) = 4811d75e4b37a8be0c2389c6d8265ce7ecae536c
+SHA1 (patch-src_gui_tcltk_tktable_configure) = 3b7feaa8a675e4c4b3e4a0e0d48537250610ea29
diff --git a/bitkeeper/patches/patch-src_gui_tcltk_tktable_configure b/bitkeeper/patches/patch-src_gui_tcltk_tktable_configure
new file mode 100644
index 0000000..a247359
--- /dev/null
+++ b/bitkeeper/patches/patch-src_gui_tcltk_tktable_configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+To make sure not only '-lX11' is on the linker command line.
+
+--- src/gui/tcltk/tktable/configure.orig	2016-07-15 19:21:31.000000000 +0000
++++ src/gui/tcltk/tktable/configure
+@@ -7097,7 +7097,7 @@ echo "${ECHO_T}could not find any!  Usin
+     fi
+     # TEA specific:
+     if test x"${XLIBSW}" != x ; then
+-	PKG_LIBS="${PKG_LIBS} ${XLIBSW}"
++	PKG_LIBS="${PKG_LIBS} -L${PREFIX}/lib -Wl,-R${PREFIX}/lib ${XLIBSW}"
+     fi
+ 
+     fi


Home | Main Index | Thread Index | Old Index