Update to new Tcl layout, Makefile cleanups.

While there, update to version 2.3

OK landry@, stu@
This commit is contained in:
sebastia 2011-01-05 17:57:00 +00:00
parent 7b8ebbcc99
commit f26b31718c
7 changed files with 74 additions and 61 deletions

View File

@ -1,48 +1,48 @@
# $OpenBSD: Makefile,v 1.7 2010/11/22 08:37:05 espie Exp $
# $OpenBSD: Makefile,v 1.8 2011/01/05 17:57:00 sebastia Exp $
SHARED_ONLY = Yes
SHARED_ONLY = Yes
COMMENT = tree widget extension for Tk
VERSION= 2.2.10
DISTNAME = tktreectrl-${VERSION}
SHARED_LIBS = treectrl22 1.0
CATEGORIES = x11
HOMEPAGE = http://tktreectrl.sourceforge.net/
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
COMMENT = tree widget extension for Tk
DISTNAME = tktreectrl-2.3b1
SHARED_LIBS = treectrl23 0.0
CATEGORIES = x11
HOMEPAGE = http://tktreectrl.sourceforge.net/
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tktreectrl/}
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += X11
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tktreectrl/}
MODULES = x11/tk
BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS}
RUN_DEPENDS = ${MODTK_RUN_DEPENDS}
SEPARATE_BUILD = simple
FAKE_FLAGS = PKG_DIR=tktreectrl \
INSTALL_PROGRAM='${INSTALL_DATA}'
SEPARATE_BUILD = concurrent
USE_GROFF = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = SHLIB_VERSION=${LIBtreectrl22_VERSION}
CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--libdir=${MODTCL_TCLDIR} \
--with-tcl=${MODTCL_LIBDIR} \
--with-tk=${MODTK_LIBDIR} \
--datadir=${PREFIX}/share/examples \
--docdir=${PREFIX}/share/doc/tktreectrl
FAKE_FLAGS = pkgdatadir=${PREFIX}/share/examples/tktreectrl
USE_GROFF = Yes
REGRESS_IS_INTERACTIVE = X11
REGRESS_TARGET = test
SUBST_VARS = VERSION
--docdir=${PREFIX}/share/doc/tktreectrl \
SHLIB_VERSION=${LIBtreectrl23_VERSION}
REGRESS_IS_INTERACTIVE =X11
REGRESS_TARGET = test
WRKDIST = ${WRKDIR}/tktreectrl-2.3
pre-configure:
${MODTCL_TCLSH_ADJ} ${WRKSRC}/demos/demo.tcl
@${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>

View File

@ -1,5 +1,5 @@
MD5 (tktreectrl-2.2.10.tar.gz) = cSjjlVuU15BZTU0KablGQg==
RMD160 (tktreectrl-2.2.10.tar.gz) = Dt8WM9+s/OGUvxUFUBrNbdJuPFA=
SHA1 (tktreectrl-2.2.10.tar.gz) = RlOlav53AC4DF3FML2G7mcDM/8k=
SHA256 (tktreectrl-2.2.10.tar.gz) = C6961qjnh01AtMLDONO0NjC3us6PmRAXV+wQLY79jJ4=
SIZE (tktreectrl-2.2.10.tar.gz) = 742335
MD5 (tktreectrl-2.3b1.tar.gz) = zMlQZuGbDrnBfH0NYlAdMw==
RMD160 (tktreectrl-2.3b1.tar.gz) = DEYcve6wb4TzS+zmFDfAfZq6yxM=
SHA1 (tktreectrl-2.3b1.tar.gz) = VPuczmlAQh4J+570/P3xhyRxTlU=
SHA256 (tktreectrl-2.3b1.tar.gz) = caUlmYVg/eusrZfFrX+Z1X91sl/BHyWRlxgCb2y0wX0=
SIZE (tktreectrl-2.3b1.tar.gz) = 856205

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/07/09 16:43:11 sebastia Exp $
$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 Sun Feb 24 23:22:10 2008
+++ Makefile.in Sat Jun 19 00:30:03 2010
@@ -75,6 +75,7 @@ datadir = @datadir@
--- 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@
datarootdir = @datarootdir@
mandir = @mandir@
includedir = @includedir@
@ -10,7 +10,7 @@ Also install some demos and license files.
DESTDIR =
@@ -189,7 +190,7 @@ doc-x:
@@ -192,7 +193,7 @@ doc-x:
doc:
@echo "No docs to build"
@ -19,16 +19,13 @@ Also install some demos and license files.
install-binaries: binaries install-lib-binaries install-bin-binaries
@mkdir -p $(DESTDIR)$(pkglibdir)
@@ -216,15 +217,19 @@ install-libraries: libraries
install-doc-x:
@mkdir -p $(DESTDIR)$(mandir)/mann
@@ -221,13 +222,21 @@ install-doc-x:
@echo "Installing documentation in $(DESTDIR)$(mandir)"
- @for i in $(srcdir)/doc/*.n; do \
- echo "Installing $$i"; \
@for i in $(srcdir)/doc/*.n; do \
echo "Installing $$i"; \
- rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
- done
+ $(INSTALL_DATA) $(srcdir)/doc/*.n $(DESTDIR)$(mandir)/mann
$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
done
install-doc: install-doc-x
- mkdir -p $(DESTDIR)$(pkglibdir)/htmldoc
@ -40,7 +37,8 @@ Also install some demos and license files.
+
+install-demos:
+ mkdir -p $(DESTDIR)$(pkgdatadir)
+ $(INSTALL_SCRIPT) $(srcdir)/demos/*.tcl $(DESTDIR)$(pkgdatadir)
+ $(INSTALL_DATA) $(srcdir)/demos/*.tcl $(DESTDIR)$(pkgdatadir)
+ chmod 555 $(DESTDIR)$(pkgdatadir)/demo.tcl
+ mkdir -p $(DESTDIR)$(pkgdatadir)/pics
+ $(INSTALL_DATA) $(srcdir)/demos/pics/* $(DESTDIR)$(pkgdatadir)/pics

View File

@ -0,0 +1,11 @@
$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
# OpenBSD builds and links with -pthread, never -lpthread.
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
- SHLIB_CFLAGS="$SHLIB_CFLAGS -pthread"
fi
# OpenBSD doesn't do version numbers with dots.

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-demos_demo_tcl,v 1.1.1.1 2010/07/09 16:43:11 sebastia Exp $
$OpenBSD: patch-demos_demo_tcl,v 1.2 2011/01/05 17:57:00 sebastia Exp $
XXX hand-rolled; CVS keyword in patch
@ -7,11 +7,6 @@ XXX hand-rolled; CVS keyword in patch
@@ -1,2 +1,4 @@
-#!/bin/wish84.exe
+#! /bin/sh
+# the next line restarts with wish \
+exec tclsh8.5 "$0" ${1+"$@"}
@@ -6,3 +8,3 @@ set VERSION 2.2.9
-package require Tk 8.4
+package require Tk
+# the next line restarts with tclsh \
+exec tclsh "$0" ${1+"$@"}

View File

@ -5,3 +5,6 @@ one or more columns. For each column of an item there is a style
associated, which determines how to display the item's column taking
into account the item's current state set. One column can be defined to
display the data in a hierarchical structure.
Additional documentation, with examples and pictures:
http://tktreectrl.sourceforge.net/Understanding%20TkTreeCtrl.html

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2010/09/20 07:06:49 sebastia Exp $
lib/treectrl${VERSION}/
lib/treectrl${VERSION}/filelist-bindings.tcl
@lib lib/treectrl${VERSION}/libtreectrl22.so.${LIBtreectrl22_VERSION}
lib/treectrl${VERSION}/pkgIndex.tcl
lib/treectrl${VERSION}/treectrl.tcl
@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/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
@ -16,6 +16,9 @@ share/examples/tktreectrl/column-lock.tcl
share/examples/tktreectrl/demo.tcl
share/examples/tktreectrl/explorer.tcl
share/examples/tktreectrl/firefox.tcl
share/examples/tktreectrl/gradients.tcl
share/examples/tktreectrl/gradients2.tcl
share/examples/tktreectrl/gradients3.tcl
share/examples/tktreectrl/help.tcl
share/examples/tktreectrl/imovie.tcl
share/examples/tktreectrl/layout.tcl
@ -30,6 +33,7 @@ share/examples/tktreectrl/pics/big-file.gif
share/examples/tktreectrl/pics/big-folder.gif
share/examples/tktreectrl/pics/big-txt.gif
share/examples/tktreectrl/pics/checked.gif
share/examples/tktreectrl/pics/feather.gif
share/examples/tktreectrl/pics/file.gif
share/examples/tktreectrl/pics/folder-closed.gif
share/examples/tktreectrl/pics/folder-open.gif
@ -50,6 +54,8 @@ share/examples/tktreectrl/pics/internet-radio-off.gif
share/examples/tktreectrl/pics/internet-radio-on.gif
share/examples/tktreectrl/pics/internet-search.gif
share/examples/tktreectrl/pics/internet-security.gif
share/examples/tktreectrl/pics/logMedTrans.gif
share/examples/tktreectrl/pics/logoMedTrans.gif
share/examples/tktreectrl/pics/mac-collapse.gif
share/examples/tktreectrl/pics/mac-expand.gif
share/examples/tktreectrl/pics/outlook-arrow.gif