Hi,
The following diff makes hgk work out of the box without having to add a
custom path in the hgrc. Also, while we are here, adjust python script
shebangs.
To test hgk, install tk, put this is your hgrc:
---8<---
[extensions]
histedit =
---8<---
Then run 'hg view' in a hg dir.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile 9 Jul 2013 10:00:00 -0000 1.55
+++ Makefile 31 Aug 2013 16:53:34 -0000
@@ -5,6 +5,7 @@ COMMENT = fast, lightweight source cont
MODPY_EGG_VERSION = 2.6.3
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
+REVISION = 0
HOMEPAGE = http://www.selenic.com/mercurial/
@@ -15,7 +16,7 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://mercurial.selenic.com/release/
-MODULES = lang/python
+MODULES = lang/python x11/tk
USE_GROFF = Yes
BUILD_DEPENDS = devel/gettext
@@ -36,6 +37,15 @@ SCRIPTS = convert-repo hg-ssh hgk \
WANTLIB += ${MODPY_WANTLIB} pthread
+MODPY_ADJ_FILES = hgweb.cgi \
+ contrib/convert-repo \
+ contrib/dumprevlog \
+ contrib/hg-ssh \
+ contrib/simplemerge \
+ contrib/undumprevlog
+pre-configure:
+ ${MODTCL_WISH_ADJ} ${WRKSRC}/contrib/hgk
+
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgignore.5 ${PREFIX}/man/man5
@@ -59,6 +69,8 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/contrib/${script} \
${PREFIX}/share/mercurial
. endfor
+ # hgk needs to be in the path for 'hg view' to work
+ ln -s ${TRUEPREFIX}/share/mercurial/hgk ${PREFIX}/bin/hgk
do-test:
@cd ${WRKSRC}/tests && ${MODPY_BIN} run-tests.py -v 1>&2
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -r1.27 PLIST
--- pkg/PLIST 16 May 2013 09:09:30 -0000 1.27
+++ pkg/PLIST 31 Aug 2013 16:53:34 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.27 2013/05/16 09:09:30 rpointel Exp $
bin/hg
+bin/hgk
lib/python${MODPY_VERSION}/site-packages/hgext/
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
@@ -569,6 +570,7 @@ lib/python${MODPY_VERSION}/site-packages
@man man/man1/hg.1
@man man/man5/hgignore.5
@man man/man5/hgrc.5
+share/doc/pkg-readmes/${FULLPKGNAME}
share/mercurial/
share/mercurial/bash_completion
share/mercurial/convert-repo
Index: pkg/README
===================================================================
RCS file: pkg/README
diff -N pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README 31 Aug 2013 16:53:34 -0000
@@ -0,0 +1,10 @@
+$OpenBSD: README.template,v 1.4 2011/06/02 13:44:40 ajacoutot Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+Hgk GUI
+=======
+
+To use hgk (hg view) you must first install tk.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
