Hi,
attached patch updates tktreectrl to latest available version 2.4.1. 2.4.0 had
a bug which made coccinella stop working. Those got fixed, and now here is
2.4.1, which makes coccinella happy again. Regression tests are all passing on
i386 for me.
is it OK?
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tktreectrl/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 11 Mar 2011 15:52:34 -0000 1.9
+++ Makefile 27 Oct 2011 06:30:05 -0000
@@ -3,9 +3,9 @@
SHARED_ONLY = Yes
COMMENT = tree widget extension for Tk
-DISTNAME = tktreectrl-2.3
+DISTNAME = tktreectrl-2.4.1
EPOCH = 0
-SHARED_LIBS = treectrl23 0.0
+SHARED_LIBS = treectrl24 0.0
CATEGORIES = x11
HOMEPAGE = http://tktreectrl.sourceforge.net/
MAINTAINER = Sebastian Reitenbach <sebas...@openbsd.org>
@@ -16,7 +16,7 @@
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += X11
+WANTLIB += m X11
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tktreectrl/}
MODULES = x11/tk
@@ -36,14 +36,12 @@
--with-tk=${MODTK_LIBDIR} \
--datadir=${PREFIX}/share/examples \
--docdir=${PREFIX}/share/doc/tktreectrl \
- SHLIB_VERSION=${LIBtreectrl23_VERSION}
+ SHLIB_VERSION=${LIBtreectrl24_VERSION}
REGRESS_IS_INTERACTIVE =X11
REGRESS_TARGET = test
-WRKDIST = ${WRKDIR}/tktreectrl-2.3
pre-configure:
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/demos/demo.tcl
- mv "${WRKSRC}/doc/What's New in TkTreeCtrl.html" ${WRKSRC}/doc/Whats_New_in_TkTreeCtrl.html
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/tktreectrl/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 11 Mar 2011 15:52:34 -0000 1.4
+++ distinfo 27 Oct 2011 06:30:05 -0000
@@ -1,5 +1,5 @@
-MD5 (tktreectrl-2.3.tar.gz) = RCSvjZ/RgLIejVjmhVZvrg==
-RMD160 (tktreectrl-2.3.tar.gz) = GKcEPEKquXzSgI+gRS9LSCkhHms=
-SHA1 (tktreectrl-2.3.tar.gz) = FofPhsPiKx0EFaPsEykMFb3HNUM=
-SHA256 (tktreectrl-2.3.tar.gz) = gFAUjllma6cQIpeGc5t3Ty3Xp76Rj6AxZU/4oL791Xo=
-SIZE (tktreectrl-2.3.tar.gz) = 856293
+MD5 (tktreectrl-2.4.1.tar.gz) = a+VvPGS3Bd9RkQa+EhhayA==
+RMD160 (tktreectrl-2.4.1.tar.gz) = byw+0b6yca242crWlbFV53GZyFA=
+SHA1 (tktreectrl-2.4.1.tar.gz) = XNe9/YG6ip+vPYQu2W9fRIERock=
+SHA256 (tktreectrl-2.4.1.tar.gz) = wtGc/HzosVDLUKa2PcYyfJH7cfdrTylH4DNKFdX4adM=
+SIZE (tktreectrl-2.4.1.tar.gz) = 945101
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/tktreectrl/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 5 Jan 2011 17:57:00 -0000 1.2
+++ patches/patch-Makefile_in 27 Oct 2011 06:30:05 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.2 2011/01/05 17:57:00 sebastia Exp $
Also install some demos and license files.
---- Makefile.in.orig Fri Nov 19 22:19:54 2010
-+++ Makefile.in Wed Dec 8 12:13:04 2010
-@@ -77,6 +77,7 @@ datadir = @datadir@
+--- Makefile.in.orig Wed Jun 1 22:16:09 2011
++++ Makefile.in Sun Oct 9 18:18:26 2011
+@@ -75,6 +75,7 @@ datadir = @datadir@
datarootdir = @datarootdir@
mandir = @mandir@
includedir = @includedir@
@@ -10,7 +10,7 @@
DESTDIR =
-@@ -192,7 +193,7 @@ doc-x:
+@@ -190,7 +191,7 @@ doc-x:
doc:
@echo "No docs to build"
@@ -19,7 +19,7 @@
install-binaries: binaries install-lib-binaries install-bin-binaries
@mkdir -p $(DESTDIR)$(pkglibdir)
-@@ -221,13 +222,21 @@ install-doc-x:
+@@ -219,13 +220,21 @@ install-doc-x:
@echo "Installing documentation in $(DESTDIR)$(mandir)"
@for i in $(srcdir)/doc/*.n; do \
echo "Installing $$i"; \
@@ -43,4 +43,4 @@
+ $(INSTALL_DATA) $(srcdir)/demos/pics/* $(DESTDIR)$(pkgdatadir)/pics
test: binaries libraries
- $(WISH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) | cat
+ @$(WISH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) | cat
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/tktreectrl/patches/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- patches/patch-configure 5 Jan 2011 17:57:00 -0000 1.4
+++ patches/patch-configure 27 Oct 2011 06:30:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2011/01/05 17:57:00 sebastia Exp $
---- configure.orig Wed Dec 8 12:18:38 2010
-+++ configure Wed Dec 8 12:18:54 2010
-@@ -8168,7 +8168,6 @@ fi
+--- configure.orig Tue May 10 21:38:42 2011
++++ configure Sun Oct 9 18:18:26 2011
+@@ -8194,7 +8194,6 @@ fi
# OpenBSD builds and links with -pthread, never -lpthread.
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
Index: patches/patch-demos_demo_tcl
===================================================================
RCS file: /cvs/ports/x11/tktreectrl/patches/patch-demos_demo_tcl,v
retrieving revision 1.2
diff -u -r1.2 patch-demos_demo_tcl
--- patches/patch-demos_demo_tcl 5 Jan 2011 17:57:00 -0000 1.2
+++ patches/patch-demos_demo_tcl 27 Oct 2011 06:30:05 -0000
@@ -2,11 +2,13 @@
XXX hand-rolled; CVS keyword in patch
---- demos/demo.tcl.orig Sun May 17 20:35:58 2009
-+++ demos/demo.tcl Fri Jul 9 11:01:42 2010
-@@ -1,2 +1,4 @@
+--- demos/demo.tcl.orig Wed Jun 8 21:27:44 2011
++++ demos/demo.tcl Wed Oct 12 18:09:25 2011
+@@ -1,4 +1,6 @@
-#!/bin/wish84.exe
+#! /bin/sh
+# the next line restarts with tclsh \
+exec tclsh "$0" ${1+"$@"}
+
+ # Copyright (c) 2002-2011 Tim Baker
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tktreectrl/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 5 Jan 2011 17:57:00 -0000 1.5
+++ pkg/PLIST 27 Oct 2011 06:30:05 -0000
@@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST,v 1.5 2011/01/05 17:57:00 sebastia Exp $
lib/tcl/tktreectrl/
lib/tcl/tktreectrl/filelist-bindings.tcl
-@lib lib/tcl/tktreectrl/libtreectrl23.so.${LIBtreectrl23_VERSION}
+@lib lib/tcl/tktreectrl/libtreectrl24.so.${LIBtreectrl24_VERSION}
lib/tcl/tktreectrl/pkgIndex.tcl
lib/tcl/tktreectrl/treectrl.tcl
@man man/mann/treectrl.n
share/doc/tktreectrl/
-share/doc/tktreectrl/Whats_New_in_TkTreeCtrl.html
+share/doc/tktreectrl/What-is-New-in-TkTreeCtrl.html
share/doc/tktreectrl/license.terms
share/doc/tktreectrl/treectrl.html
share/examples/tktreectrl/
@@ -19,6 +19,7 @@
share/examples/tktreectrl/gradients.tcl
share/examples/tktreectrl/gradients2.tcl
share/examples/tktreectrl/gradients3.tcl
+share/examples/tktreectrl/headers.tcl
share/examples/tktreectrl/help.tcl
share/examples/tktreectrl/imovie.tcl
share/examples/tktreectrl/layout.tcl
@@ -84,5 +85,6 @@
share/examples/tktreectrl/random.tcl
share/examples/tktreectrl/span.tcl
share/examples/tktreectrl/style-editor.tcl
+share/examples/tktreectrl/table.tcl
share/examples/tktreectrl/textvariable.tcl
share/examples/tktreectrl/www-options.tcl
