On 2012/09/07 09:02, Kevin Lo wrote:
> Christian Weisgerber wrote:
> > Stefan Sperling <s...@openbsd.org> wrote:
> >
> > > SVK development stopped in 2009:
> > > http://lists.bestpractical.com/pipermail/svk-devel/2009-May/001224.html
> > >
> > > Is anyone still using svk?
> >
> > Is it broken?
>
> Apparently not. I use svk on OpenBSD every day.
>
> Kevin
>
>
Yes, it's broken in -current. Changes I just committed to p5-SVN-* will
let it build again but it'll fail to run without LD_PRELOAD=libpthread.so;
we could maybe add a wrapper like this..
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/svk/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 7 Sep 2012 08:09:59 -0000 1.18
+++ Makefile 7 Sep 2012 08:18:17 -0000
@@ -3,7 +3,7 @@
COMMENT= decentralized version control system
V= 2.2.1
-REVISION= 0
+REVISION= 1
DISTNAME= SVK-v${V}
PKGNAME= svk-${V}
CATEGORIES= devel perl5
@@ -48,9 +48,20 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
CONFIGURE_STYLE= perl
-CONFIGURE_ENV= LD_PRELOAD=libpthread.so # XXX remove when perl is -lpthread
-
REGRESS_DEPENDS=devel/p5-BSD-Resource \
devel/p5-Test-Pod
+
+# XXX remove entire section below when perl is -lpthread
+
+CONFIGURE_ENV= LD_PRELOAD=libpthread.so
+
+post-configure:
+ ${SUBST_CMD} -c ${FILESDIR}/wrapper.sh ${WRKDIR}/wrapper.sh
+
+post-install:
+ mv ${PREFIX}/bin/svk ${PREFIX}/libexec/
+ ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/svk
+
+###
.include <bsd.port.mk>
Index: files/wrapper.sh
===================================================================
RCS file: files/wrapper.sh
diff -N files/wrapper.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/wrapper.sh 7 Sep 2012 08:18:17 -0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+LD_PRELOAD=libpthread.so exec ${PREFIX}/libexec/svk $*
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/svk/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 14 Nov 2008 09:24:42 -0000 1.4
+++ pkg/PLIST 7 Sep 2012 08:18:17 -0000
@@ -159,6 +159,7 @@ ${P5SITE}/SVK/Util.pm
${P5SITE}/SVK/Version.pm
${P5SITE}/SVK/View.pm
${P5SITE}/SVK/XD.pm
+libexec/svk
@man man/man1/svk.1
@man man/man3p/SVK.3p
@man man/man3p/SVK::Command.3p
