CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/28 11:26:44 Modified files: x11/bwidget: Makefile distinfo Log message: Update to 1.9.16. Add FIX_EXTRACT_PERMISSIONS=Yes. Thanks to Gonzalo L. Rodriguez for patch and prodding.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/08/12 11:11:18 Modified files: lang/eagle : Makefile distinfo Log message: Update to beta53.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/07/25 08:32:48 Modified files: databases/sqlite3-tcl: Makefile distinfo Log message: Update to 3.42.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/06/04 20:16:43 Modified files: x11/dbus-tcl : Makefile distinfo Log message: Update to 3.1.
UPDATE: productivity/sl
I didn't even know this existed!
Use Tcl/Tk 8.6.
HOMEPAGE and MASTER_SITES no longer exist.
Take maintainership.
Ok?
Stu
Index: Makefile
===
RCS file: /cvs/ports/productivity/sl/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile11 Mar 2022 19:51:46 - 1.7
+++ Makefile18 Feb 2023 05:35:23 -
@@ -1,17 +1,15 @@
COMMENT = substantially more useful ls
+
DISTNAME = sl-ls-1.1.2
-REVISION = 1
+REVISION = 2
CATEGORIES = productivity sysutils
-
-HOMEPAGE = http://practicalthought.com/sl/
+MAINTAINER = Stuart Cassoff
# GPLv3
-PERMIT_PACKAGE = Yes
-
-MASTER_SITES = http://mirrors.nycbug.org/pub/distfiles/
-
-MODULES += lang/tcl
+PERMIT_PACKAGE =Yes
+MODULES = lang/tcl
+MODTCL_VERSION =8.6
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
NO_BUILD = Yes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/02/17 22:34:31 Modified files: misc/tkcron: Makefile misc/tkcron/patches: patch-tkcron-2_12_tcl Log message: Use Tcl/Tk 8.6. Shebang patch not needed for MODTCL_WISH_ADJ to work.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/02/16 03:19:24 Modified files: devel/ltcltk : Makefile distinfo devel/ltcltk/pkg: PLIST Added files: devel/ltcltk/patches: patch-src_ltcl_c Removed files: devel/ltcltk/patches: patch-ltcl_c Log message: Update to 0.9_5. Build against Tcl/Tk 8.6. Install one more doc file and graphical shell. Ltcltk moved to a new home.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/02/16 02:03:12 Modified files: net/tclcurl: Makefile distinfo net/tclcurl/patches: patch-Makefile_in patch-doc_tclcurl_n net/tclcurl/pkg: PLIST Added files: net/tclcurl/patches: patch-doc_tclcurl_multi_n patch-doc_tclcurl_share_n Removed files: net/tclcurl/patches: patch-configure patch-generic_tclcurl_h Log message: Update to 7.22.0. Enable tests. Fix man pages. TclCurl moved to a new home.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/02/14 08:45:04 Modified files: net/nam: Makefile net/nam/patches: patch-configure Added files: net/nam/patches: patch-rng_cc patch-xwd_c Log message: Add missing function parameter declaration. Fix off-by-one. Explicitly set compiler flags.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/02/13 01:56:35 Modified files: devel/tclarc4random: Makefile Log message: HOMEPAGE changed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/02/13 01:56:28 Modified files: devel/jimarc4random: Makefile Log message: HOMEPAGE changed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/02/11 20:33:57 Modified files: net/netinfo: Makefile Log message: Netinfo moved to a new home.
Re: Python access to Berkeley DB
TCL_EXACT, ) != TCL_OK) {
result = IS_HELP(objv[i]);
goto error;
-@@ -1579,7 +1579,7 @@ bdb_DbOpen(interp, objc, objv, ip, dbp)
+@@ -1579,7 +1582,7 @@ bdb_DbOpen(interp, objc, objv, ip, dbp)
*/
i = 2;
while (i < objc) {
@@ -36,7 +47,7 @@
"option", TCL_EXACT, ) != TCL_OK) {
/*
* Reset the result so we don't get
-@@ -1641,7 +1641,7 @@ bdb_DbOpen(interp, objc, objv, ip, dbp)
+@@ -1641,7 +1644,7 @@ bdb_DbOpen(interp, objc, objv, ip, dbp)
i = 2;
while (i < objc) {
Tcl_ResetResult(interp);
@@ -45,7 +56,7 @@
TCL_EXACT, ) != TCL_OK) {
arg = Tcl_GetStringFromObj(objv[i], NULL);
if (arg[0] == '-') {
-@@ -2548,7 +2548,7 @@ bdb_DbRemove(interp, objc, objv)
+@@ -2548,7 +2551,7 @@ bdb_DbRemove(interp, objc, objv)
*/
i = 2;
while (i < objc) {
@@ -54,7 +65,7 @@
"option", TCL_EXACT, ) != TCL_OK) {
arg = Tcl_GetStringFromObj(objv[i], NULL);
if (arg[0] == '-') {
-@@ -2768,7 +2768,7 @@ bdb_DbRename(interp, objc, objv)
+@@ -2768,7 +2771,7 @@ bdb_DbRename(interp, objc, objv)
*/
i = 2;
while (i < objc) {
@@ -63,7 +74,7 @@
"option", TCL_EXACT, ) != TCL_OK) {
arg = Tcl_GetStringFromObj(objv[i], NULL);
if (arg[0] == '-') {
-@@ -3005,7 +3005,7 @@ bdb_DbVerify(interp, objc, objv)
+@@ -3005,7 +3008,7 @@ bdb_DbVerify(interp, objc, objv)
*/
i = 2;
while (i < objc) {
@@ -72,7 +83,7 @@
"option", TCL_EXACT, ) != TCL_OK) {
arg = Tcl_GetStringFromObj(objv[i], NULL);
if (arg[0] == '-') {
-@@ -3224,7 +3224,7 @@ bdb_Version(interp, objc, objv)
+@@ -3224,7 +3227,7 @@ bdb_Version(interp, objc, objv)
*/
i = 2;
while (i < objc) {
@@ -81,7 +92,7 @@
"option", TCL_EXACT, ) != TCL_OK) {
arg = Tcl_GetStringFromObj(objv[i], NULL);
if (arg[0] == '-') {
-@@ -3452,7 +3452,7 @@ bdb_DbUpgrade(interp, objc, objv)
+@@ -3452,7 +3455,7 @@ bdb_DbUpgrade(interp, objc, objv)
i = 2;
while (i < objc) {
Index: v4/pkg/PLIST-java
===
RCS file: /cvs/ports/databases/db/v4/pkg/PLIST-java,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-java
--- v4/pkg/PLIST-java 11 Mar 2022 18:31:18 - 1.6
+++ v4/pkg/PLIST-java 24 Dec 2022 04:34:54 -
@@ -1,6 +1,6 @@
@option is-branch
lib/db4/db.jar
-lib/db4/libdb_java.a
+@static-lib lib/db4/libdb_java.a
lib/db4/libdb_java.la
@lib lib/db4/libdb_java.so.${LIBdb_java_VERSION}
@lib lib/libdb_java.so.${LIBdb_java_VERSION}
Index: v4/pkg/PLIST-main
===
RCS file: /cvs/ports/databases/db/v4/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST-main
--- v4/pkg/PLIST-main 11 Mar 2022 18:31:18 - 1.7
+++ v4/pkg/PLIST-main 24 Dec 2022 04:34:55 -
@@ -21,10 +21,10 @@ include/db4/db.h
include/db4/db_185.h
include/db4/db_cxx.h
lib/db4/
-lib/db4/libdb.a
+@static-lib lib/db4/libdb.a
lib/db4/libdb.la
@lib lib/db4/libdb.so.${LIBdb_VERSION}
-lib/db4/libdb_cxx.a
+@static-lib lib/db4/libdb_cxx.a
lib/db4/libdb_cxx.la
@lib lib/db4/libdb_cxx.so.${LIBdb_cxx_VERSION}
@lib lib/libdb.so.${LIBdb_VERSION}
Index: v4/pkg/PLIST-tcl
===
RCS file: /cvs/ports/databases/db/v4/pkg/PLIST-tcl,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-tcl
--- v4/pkg/PLIST-tcl11 Mar 2022 18:31:18 - 1.5
+++ v4/pkg/PLIST-tcl24 Dec 2022 04:34:55 -
@@ -1,10 +1,13 @@
@option no-default-conflict
@option is-branch
@conflict db-tcl->=4,<5
-lib/db4/libdb_tcl.a
+@static-lib lib/db4/libdb_tcl.a
lib/db4/libdb_tcl.la
@lib lib/db4/libdb_tcl.so.${LIBdb_tcl_VERSION}
@lib lib/libdb_tcl.so.${LIBdb_tcl_VERSION}
+lib/tcl/
+lib/tcl/db_v4/
+lib/tcl/db_v4/pkgIndex.tcl
share/doc/db4/api_tcl/
share/doc/db4/api_tcl/api_tcl.html
share/doc/db4/api_tcl/db_close.html
-- Original Message --
From: s...@spacehopper.org
To: r...@rmswch.plus.com; ports@openbsd.org
Sent: Thursday, December 22, 2022 9:33 AM
Subject: Re: Python access to Berkeley DB
You could try rebuilding databases/db/v4 with
MODTCL_VERSION=8.6 added to the Makefile and see if that helps at all..
--
Sent from a phone, apologies for poor formatting.
On 21 December 2022 20:52:06 Roger Marsh wrote:
> On Tue, 20 Dec 2022 12:18:59 - (UTC)
> Stuart Henderson wrote:
>
>> ["Followup-To:" h
Re: Python access to Berkeley DB
-- Original Message -- From: stu.li...@spacehopper.org To: ports@openbsd.org Cc: m...@openbsd.org Sent: Monday, December 19, 2022 7:53 AM Subject: Re: Python access to Berkeley DB [ moving to ports@, hopefully reply-to will be set correctly if I got the gmane/nntp bits right :) ] You might possibly be able to kludge around it with some LD_PRELOAD, though tkinter is now built against Tcl 8.6 and the db-tcl package is built against Tcl 8.5 and I don't know if extensions are compatible cross-version. Extensions built against 8.5 should load into 8.6 no problem. Stu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 14:18:53 Modified files: databases/tdbc-sqlite3: Makefile distinfo Log message: Update to 1.1.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 14:18:40 Modified files: databases/tdbc-postgres: Makefile distinfo Log message: Update to 1.1.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 14:18:26 Modified files: databases/tdbc-odbc: Makefile distinfo Log message: Update to 1.1.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 14:17:40 Modified files: databases/tdbc-mysql: Makefile distinfo Removed files: databases/tdbc-mysql/patches: patch-generic_tdbcmysql_c patch-tests_tdbcmysql_test Log message: Update to 1.1.5. Drop two patches thanks to upstream changes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 14:15:33 Modified files: databases/tdbc : Makefile distinfo databases/tdbc/patches: patch-Makefile_in patch-configure Log message: Update to 1.1.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 14:14:18 Modified files: x11/tk/8.6 : Makefile distinfo x11/tk/8.6/pkg : PLIST Log message: Update to 8.6.13.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 14:13:09 Modified files: lang/tcl/8.6 : Makefile distinfo lang/tcl/8.6/patches: patch-unix_Makefile_in lang/tcl/8.6/pkg: PLIST Log message: Update to 8.6.13. More tests can be run thanks to upstream changes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 14:09:09 Modified files: devel/tclthread: distinfo Log message: Upstream re-rolled the DISTFILE. Content identical to previous.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/20 09:53:54 Modified files: databases/sqlite3-tcl: Makefile distinfo Removed files: databases/sqlite3-tcl/patches: patch-tea_configure Log message: Update to 3.34.0. Drop a patch thanks to upstream changes. Don't supply build options that are now enabled by default. New default build options: SQLITE_ENABLE_BYTECODE_VTAB SQLITE_ENABLE_DBPAGE_VTAB SQLITE_ENABLE_FTS4 SQLITE_ENABLE_MATH_FUNCTIONS Add build option SQLITE_MAX_ALLOCATION_SIZE, set to 0x00fffeff (16M - 1 - 256), inspired by default 0x7eff. https://sqlite.org/compile.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/18 05:50:33 Modified files: devel/tclthread: Makefile distinfo devel/tclthread/patches: patch-Makefile_in patch-configure Log message: Update to 2.8.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/10/06 06:02:41 Modified files: databases/sqlite3-tcl: Makefile distinfo Log message: Update to 3.39.4. Add build options (https://sqlite.org/compile.html): -DSQLITE_ENABLE_API_ARMOR Enables code that attempts to detect misuse of the SQLite API. -DSQLITE_ENABLE_GEOPOLY Enable the Geopoly extension.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/09/09 18:27:43
Modified files:
graphics/tkimg : Makefile distinfo
graphics/tkimg/pkg: PLIST
Removed files:
graphics/tkimg/patches: patch-Makefile_in
Log message:
Update to 1.4.13.
Drop the Makefile patch and instead let TkImg perform the install as it wants.
With the right options in CONFIGURE_ARGS and some other Makefile vars,
this gives a nice result, with all the lib files in one place and without
a lot of directories and pkgIndex.tcl files.
Include files are now installed in ${LOCALBASE}/include/tkimg,
instead of ${LOCALBASE}/include.
The *Config.sh files are now installed in ${LOCALBASE}/lib/tcl/tkimg,
instead of ${LOCALBASE}/lib.
Man pages are now installed.
Tests can now be run without the package having to install itself.
No longer need SHARED_LIBS.
Take Maintainership.
OK sthen@
TkImg 1.4.13
After maintainer timeout, here is an update to graphics/tkimg.
I'm guessing the maintainer is no longer interested in TkImg
so I'll gladly take maintanership of the port.
I tried it quickly with Coccinella (the only consumer) and
I don't see any difference than with the older version of TkImg.
There were enough changes to the Makefile that I also did
a complete cleanup and reorganization.
I decided to not use the Makefile patch and instead
let TkImg perform the install as it wants.
With the right options in CONFIGURE_ARGS and some
other Makefile vars, this gives a nice result, with all the lib
files in one place and without a lot of directories and pkgIndex.tcl
files.
The include files are now in /usr/local/include/tkimg
instead of /usr/local/include, and all the *Config.sh files
are in /usr/local/lib/tcl/tkimg instead of in /usr/local/lib.
Man pages are also now installed.
Tests can be run without the package installing itself.
No need for SHARED_LIBS.
OK?
Stu
(patch attached in case of mailer mangling)
(port also attached in case patch is too hard to read)
diff -u -rNp /usr/ports/graphics/tkimg/Makefile ./Makefile
--- /usr/ports/graphics/tkimg/Makefile Fri Mar 11 14:23:28 2022
+++ ./Makefile Wed Aug 24 21:27:20 2022
@@ -1,55 +1,39 @@
-COMMENT = image extension for Tcl/Tk
+COMMENT = image extension for Tcl/Tk
-V =1.4.2
-DISTNAME = tkimg$V
-PKGNAME = tkimg-$V
-SHLIB_VERSION =0.0
-.for _lib in tkimgbmp142 tkimg142 tkimggif142 tkimgico142 tkimgjpeg142
\
- tkimgpcx142 tkimgpixmap142 tkimgpng142 tkimgppm142 tkimgps142 \
- tkimgsgi142 tkimgsun142 tkimgtga142 tkimgtiff142 tkimgwindow142 \
- tkimgxbm142 tkimgxpm142 tkimgraw142 tkimgdted142 zlibtcl128 \
- jpegtcl84 pngtcl1412 tifftcl394
-SHARED_LIBS += ${_lib} ${SHLIB_VERSION}
-.endfor
-REVISION = 0
+V =1.4.13
-CATEGORIES = graphics
+DISTNAME = Img-${V}-Source
+PKGNAME = tkimg-${V}
+CATEGORIES = graphics
+HOMEPAGE = http://tkimg.sourceforge.net/
+MAINTAINER = Stuart Cassoff
-HOMEPAGE = http://tkimg.sourceforge.net/
-
-MAINTAINER = Sebastian Reitenbach
-
# BSD
-PERMIT_PACKAGE = Yes
-
-WANTLIB += X11 Xext Xft Xss fontconfig m
-
+PERMIT_PACKAGE = Yes
+WANTLIB = X11 Xext Xft Xss fontconfig m
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tkimg/}
-
MODULES = x11/tk
+
BUILD_DEPENDS =${MODTK_BUILD_DEPENDS} \
devel/tcllib
+
RUN_DEPENDS = ${MODTK_RUN_DEPENDS}
-TEST_DEPENDS = ${PKGPATH}
+FAKE_FLAGS = INSTALL_ROOT=${DESTDIR} \
+ LIB_RUNTIME_DIR=${MODTCL_TCLDIR}/tkimg
+
+TEST_FLAGS = libdir=${WRKBUILD}
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS= --libdir=${MODTCL_TCLDIR} \
- --with-tcl=${MODTCL_LIBDIR} \
- --with-tclinclude=$(MODTCL_INCDIR) \
- --with-tk=${MODTK_LIBDIR} \
- --with-tkinclude=${MODTK_INCDIR} \
- --with-x \
- --x-includes=${X11BASE}/include
-WRKDIST = ${WRKDIR}/tkimg1.4
-TEST_IS_INTERACTIVE = X11
-TEST_TARGET = test
-INSTALL_TARGET = collate
-FAKE_FLAGS = INSTALL_ROOT=${DESTDIR}
LIB_RUNTIME_DIR=${MODTCL_TCLDIR}/tkimg
-CONFIGURE_ENV =SHLIB_VERSION=${SHLIB_VERSION}
-post-install:
- echo 'set auto_path [concat $$auto_path $$dir]' > \
- ${DESTDIR}${MODTCL_TCLDIR}/tkimg/pkgIndex.tcl
+CONFIGURE_ARGS = --libdir=${MODTCL_TCLDIR}/tkimg \
+ --includedir=${PREFIX}/include/tkimg \
+ --with-tcl=${MODTCL_LIBDIR} \
+ --with-tk=${MODTK_LIBDIR} \
+ --with-x
+
+TEST_IS_INTERACTIVE = X11
+WRKDIST = ${WRKDIR}/Img-${V}
+TEST_TARGET = test
.include
diff -u -rNp /usr/ports/graphics/tkimg/distinfo ./distinfo
--- /usr/ports/graphics/tkimg/distinfo Mon Nov 10 12:39:00 2014
+++ ./distinfo Sun Aug 7 06:36:48 2022
@@ -1,2 +1,2 @@
-SHA256 (tkimg1.4.2.tar.gz) =
ONLBNB8zHgcT0Od3QXgpC+xQq1gmipjrJ31mMJMidZ4=
-SIZE (tkimg1.4.2.tar.gz) = 7257064
+SHA256 (Img-1.4.13-Source.tar.gz) =
8IaMHK2XUtzxI0+B8AxBfTShHA8N1Jm6Rp3ynxxA0WM=
+SIZE (Img-1.4.13-Source.tar.gz) = 8366556
diff -u -rNp /usr/ports/graphics/tkimg/patches/patch-Makefile_in
./patches/patch-Makefile_in
--- /usr/ports/graphics/tkimg/patches/patch-Makefile_in Fri Mar 11
14:23:28 2022
+++ ./patches/patch-Makefile_in Wed Dec 31 19:00:00 1969
@@ -1,35 +0,0 @@
-Do not use the two-stages install here, just patch the first step
(collate)
-and make use of the INSTALL_TARGET in the ports Makefile
-
Makefile.in.orig Thu Nov 21 23:03:12 2013
-+++ Makefile.inTue Nov 4 10:41:35 2014
-@@ -129,22 +129,15 @@ collate: all
- here=`pwd` && \
- cd $$sub && \
-
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/08/09 15:48:36 Modified files: x11/p5-Tkx : Makefile distinfo x11/p5-Tkx/patches: patch-tkx-prove Log message: Update to 1.10.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/08/09 15:47:38 Modified files: devel/p5-Tcl : Makefile distinfo devel/p5-Tcl/pkg: PLIST Log message: Update to 1.27.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/08/09 15:46:14 Modified files: textproc/tdom : Makefile distinfo textproc/tdom/patches: patch-Makefile_in patch-configure textproc/tdom/pkg: PLIST Removed files: textproc/tdom/patches: patch-extensions_tdomhtml_tdomhtml_tcl Log message: Update to 0.9.3. Drop a patch thanks to upstream changes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/08/08 06:22:12 Modified files: x11/bwidget: Makefile distinfo Log message: Update to 1.9.15. -HOMEPAGE = http://sourceforge.net/projects/tcllib/ +HOMEPAGE = https://core.tcl-lang.org/bwidget/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/08/03 17:09:13 Modified files: devel/tklib: Makefile distinfo devel/tklib/patches: patch-installer_tcl patch-support_installation_actions_tcl patch-support_installation_modules_tcl devel/tklib/pkg: PLIST Log message: Update to 0.7pl0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/08/03 17:07:18 Modified files: devel/tcllib : Makefile distinfo devel/tcllib/patches: patch-support_installation_actions_tcl patch-support_installation_modules_tcl devel/tcllib/pkg: PLIST Removed files: devel/tcllib/patches: patch-sak_tcl Log message: Update to 1.21pl0. Drop a patch thanks to upstream changes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/28 05:21:18 Modified files: textproc/pdf4tcl: Makefile distinfo Log message: Update to 0.9.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/25 11:53:01 Modified files: x11/dbus-intf : Makefile distinfo Log message: Update to 2.1. Remove dbus-tcl version constraint from RUN_DEPENDS; old and no longer needed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/25 11:52:14 Modified files: x11/dbus-tcl : Makefile distinfo x11/dbus-tcl/pkg: PLIST Log message: Update to 3.0. Drop now-default configure option --enable-threads.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/25 11:51:25 Modified files: devel/nagelfar : Makefile distinfo devel/nagelfar/patches: patch-nagelfar_tcl devel/nagelfar/pkg: PLIST Added files: devel/nagelfar/patches: patch-doc_plugins_txt Log message: Update to 1.3.2. Document OpenBSD-configured paths.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/25 11:49:38 Modified files: devel/diffutiltcl: Makefile distinfo devel/diffutiltcl/pkg: PLIST Log message: Update to 0.4.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/22 06:41:21 Modified files: databases/sqlite3-tcl: Makefile distinfo Log message: Update to 3.39.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/11 08:57:07 Modified files: databases/sqlite3-tcl: Makefile distinfo databases/sqlite3-tcl/patches: patch-tea_configure Log message: Update to 3.39.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/06/09 08:49:29 Modified files: lang/python: Makefile.inc lang/python/2.7: Makefile lang/python/2.7/patches: patch-setup_py lang/python/2.7/pkg: DESCR-tkinter lang/python/3.10: Makefile lang/python/3.10/files: CHANGES.OpenBSD lang/python/3.10/patches: patch-setup_py lang/python/3.10/pkg: DESCR-tkinter lang/python/3.8: Makefile lang/python/3.8/patches: patch-setup_py lang/python/3.8/pkg: DESCR-tkinter lang/python/3.9: Makefile lang/python/3.9/patches: patch-setup_py lang/python/3.9/pkg: DESCR-tkinter Log message: Move from using Tcl/Tk 8.5 to Tcl/Tk 8.6, except for Python-2.7, which stays with 8.5. Make COMMENTs and DESCRs consistent with Tk. Fix typo in 3.10/files/CHANGES.OpenBSD. OKs and thanks to kmos@, sthen@.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/06/08 14:08:06 Modified files: security/tcltls: Makefile distinfo security/tcltls/pkg: PLIST Added files: security/tcltls/patches: patch-tlsBIO_c patch-tlsInt_h Removed files: security/tcltls/patches: patch-configure patch-tests_ciphers_test patch-tlsX509_c Log message: Update to 1.7.22. Take maintainer with permission. OK sebastia@, sthen@.
Re: Python Tkinter 8.6
-- Original Message -- From: s...@spacehopper.org To: 3...@bell.net Cc: ports@openbsd.org; k...@openbsd.org Sent: Wednesday, June 8, 2022 11:05 AM Subject: Re: Python Tkinter 8.6 On 2022/06/08 10:55, Stuart Cassoff wrote: > > > > Not me, the port did - I swear! > > $ cd /usr/ports/lang/python/2.7; make fake; make update-plist > > Should yield the same result for porters who are not me. > > Those .so's aren't part of TkInter. > > Yet the change to tkinter caused them to build. So if there _was_ a > no_tkinter PSEUDO_FLAVOR then packaging -main would fail if the > CONFIGURE_ARGS was not used. But then the question is why they're > now built. > > So the change for tkinter is causing something deeply strange with > platform detection, we really need to figure out what's going on with > that > > > That is the result obtained with -current Python 2.7 without my changes. > > > $ cd /usr/ports/lang/python/2.7; make fake; make update-plist > > Not > > $ cd /usr/ports/mystuff/lang/python/2.7; make fake; make update-plist > > > Stu Oh! Are you not on a 64-bit arch then? Just checked: ok on amd64, PLIST problem on i386. Stu
Re: Python Tkinter 8.6
> > Not me, the port did - I swear! > $ cd /usr/ports/lang/python/2.7; make fake; make update-plist > Should yield the same result for porters who are not me. > Those .so's aren't part of TkInter. Yet the change to tkinter caused them to build. So if there _was_ a no_tkinter PSEUDO_FLAVOR then packaging -main would fail if the CONFIGURE_ARGS was not used. But then the question is why they're now built. So the change for tkinter is causing something deeply strange with platform detection, we really need to figure out what's going on with that That is the result obtained with -current Python 2.7 without my changes. $ cd /usr/ports/lang/python/2.7; make fake; make update-plist Not $ cd /usr/ports/mystuff/lang/python/2.7; make fake; make update-plist Stu
Re: Python Tkinter 8.6
-- Original Message --
From: s...@spacehopper.org
To: 3...@bell.net
Cc: ports@openbsd.org; k...@openbsd.org
Sent: Tuesday, June 7, 2022 10:50 AM
Subject: Re: Python Tkinter 8.6
Thanks for taking a look, I have a new patch!
On 2022/06/07 09:05, Stuart Cassoff wrote:
> Does it make sense to put all the TkInter bits inside .if
> ${BUILD_PACKAGES:M-tkinter} ?
do you mean LIB_DEPENDS-tkinter, WANTLIB-tkinter, etc? if so, no,
these
should be set unconditionally
I simplified this bit, no worries. Nicer, even.
> Are the changes to CHANGES.OpenBSD ok/necessary?
changes patching the build files should be added, if it's just
CONFIGURE_ARGS
etc then I think not. I don't see a patch to match what you added to
this?
I wasn't sure and erred on the side of caution.
> I also noticed that Python 3.10 doesn't uninstall cleanly.
any more info on that?
# pkg_add python-3.10.4.p1 ; pkg_delete python-3.10.4.p1
...
Error deleting directory /usr/local/lib/python3.10: Directory not empty
> @so lib/python2.7/lib-dynload/datetime.so
> @so lib/python2.7/lib-dynload/dbm.so
> +@so lib/python2.7/lib-dynload/dl.so
> @so lib/python2.7/lib-dynload/fcntl.so
> @so lib/python2.7/lib-dynload/future_builtins.so
> @so lib/python2.7/lib-dynload/grp.so
> +@so lib/python2.7/lib-dynload/imageop.so
> @so lib/python2.7/lib-dynload/itertools.so
> @so lib/python2.7/lib-dynload/math.so
> @so lib/python2.7/lib-dynload/mmap.so
you added those to PLIST-main, shouldn't they be in PLIST-tkinter?
Not me, the port did - I swear!
$ cd /usr/ports/lang/python/2.7; make fake; make update-plist
Should yield the same result for porters who are not me.
Those .so's aren't part of TkInter.
Stu
(patch also attached)
diff -u -rNp /usr/ports/lang/python/2.7/Makefile ./2.7/Makefile
--- /usr/ports/lang/python/2.7/Makefile Mon Mar 28 11:48:24 2022
+++ ./2.7/Makefile Sat Jun 4 16:21:38 2022
@@ -8,12 +8,12 @@ SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
PORTROACH =limit:^2\.7
-REVISION-main =7
+REVISION-main =8
REVISION-idle =1
REVISION-tests = 1
REVISION-bsddb = 0
REVISION-gdbm =0
-REVISION-tkinter = 0
+REVISION-tkinter = 1
REVISION-tools = 0
CONFIGURE_ARGS += --with-ensurepip=no
diff -u -rNp /usr/ports/lang/python/2.7/patches/patch-setup_py
./2.7/patches/patch-setup_py
--- /usr/ports/lang/python/2.7/patches/patch-setup_py Fri Mar 11
14:29:11 2022
+++ ./2.7/patches/patch-setup_pySat Jun 4 13:54:33 2022
@@ -84,17 +84,7 @@ Index: setup.py
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support
64-bit
-@@ -1936,8 +1946,7 @@ class PyBuildExt(build_ext):
- # The versions with dots are used on Unix, and the versions
without
- # dots on Windows, for detection by cygwin.
- tcllib = tklib = tcl_includes = tk_includes = None
--for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3',
'83',
--'8.2', '82', '8.1', '81', '8.0', '80']:
-+for version in ['85']:
- tklib = self.compiler.find_library_file(lib_dirs,
- 'tk' +
version)
- tcllib = self.compiler.find_library_file(lib_dirs,
-@@ -1980,17 +1989,9 @@ class PyBuildExt(build_ext):
+@@ -1980,17 +1990,9 @@ class PyBuildExt(build_ext):
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
diff -u -rNp /usr/ports/lang/python/2.7/pkg/DESCR-tkinter
./2.7/pkg/DESCR-tkinter
--- /usr/ports/lang/python/2.7/pkg/DESCR-tkinter Sun Apr 24 05:31:46
2011
+++ ./2.7/pkg/DESCR-tkinter Wed Jun 8 09:22:52 2022
@@ -11,5 +11,5 @@ in C or C++. On most systems such modules may be dyna
Python is also adaptable as an extension language for existing
applications. See the internal documentation for hints.
-This package contains the Tkinter module, for using the tk toolkit
-in Python.
+This package contains the Tkinter module, a Python interface to the
+Tk graphical toolkit.
diff -u -rNp /usr/ports/lang/python/2.7/pkg/PLIST-main
./2.7/pkg/PLIST-main
--- /usr/ports/lang/python/2.7/pkg/PLIST-main Fri Mar 11 14:29:11 2022
+++ ./2.7/pkg/PLIST-mainSat Jun 4 14:05:24 2022
@@ -1593,9 +1593,11 @@
lib/python2.7/lib-dynload/Python-${FULL_VERSION}-py2.7
@so lib/python2.7/lib-dynload/crypt.so
@so lib/python2.7/lib-dynload/datetime.so
@so lib/python2.7/lib-dynload/dbm.so
+@so lib/python2.7/lib-dynload/dl.so
@so lib/python2.7/lib-dynload/fcntl.so
@so lib/python2.7/lib-dynload/future_builtins.so
@so lib/python2.7/lib-dynload/grp.so
+@so lib/python2.7/lib-dynload/imageop.so
@so lib/python2.7/lib-dynload/itertools.so
@so lib/pyth
Tk, Ruby-Tk, Python-TkInter: COMMENT consistency
Currently: Tk: graphical toolkit for Tcl Ruby-Tk: ruby graphical tooklit using Tk PyTkinter: tk GUI module for Python Proposed: "Ruby interface to the Tk graphical toolkit" "Python interface to the Tk graphical toolkit" Stu
Python Tkinter 8.6
After discussion with maintainer, here's my patch to have TkInter work
with Tk 8.6.TkInter's setup.py program searches for libs using patterns
like libtkXX.a
and libtkXX.so, not taking into account OpenBSD's .so versioning.
Since static libs are only built for 8.5, setup.py will find libtk85.a
and configure for 8.5 but will not find libtk8.6.so and fail.
This should be fixed upstream, I guess.
Instead of patching setup.py for the desired Tk version,
simply pass the correct parameters in CONFIGURE_ARGS.
This way, it's easy to select 8.5 or 8.6, and there's
no need to "sync" the setup.py patch and the port Makefile.
I experienced weirdness trying to build TkInter 2.7 against Tk 8.6:
it seems the install script would relink against 8.5?
Anyway, it's probably best to keep TkInter 2.7 with Tk 8.5.
I'm not sure if my patch is completely ok (2.7 PLIST, style of Makefile
changes).
Does it make sense to put all the TkInter bits inside .if
${BUILD_PACKAGES:M-tkinter} ?
Are the changes to CHANGES.OpenBSD ok/necessary?When built successfully,
this or similar incantation should work:
$ echo 'from tkinter import *; print(Tk().tk.eval("info patchlevel"));
exit' | python3.10
8.6.12
I also noticed that Python 3.10 doesn't uninstall cleanly.
Stu
(patch also attached)
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.147
diff -u -p -u -p -r1.147 Makefile.inc
--- Makefile.inc26 May 2022 15:13:55 - 1.147
+++ Makefile.inc5 Jun 2022 13:11:38 -
@@ -8,7 +8,7 @@ COMMENT-bsddb = Berkeley db module for P
COMMENT-gdbm = GNU dbm module for Python
COMMENT-idle = IDE for Python
COMMENT-tests =Python test suite
-COMMENT-tkinter = tk GUI module for Python
+COMMENT-tkinter = Tk GUI module for Python
COMMENT-tools =extra tools for Python
VERSION = ${FULL_VERSION:R}
@@ -94,12 +94,9 @@ RUN_DEPENDS-idle = lang/python/${VERSION
${RUN_DEPENDS}
WANTLIB-idle =
-MODULES += x11/tk
-# Tcl/Tk version needs to be in sync with patch-setup_py's one
-MODTK_VERSION =8.5
LIB_DEPENDS-tkinter = lang/python/${VERSION},-main \
${MODTK_LIB_DEPENDS}
-WANTLIB-tkinter = X11 pthread python${VERSION} \
+WANTLIB-tkinter = pthread python${VERSION} \
${MODTK_WANTLIB}
AUTOCONF_VERSION = 2.69
@@ -117,6 +114,19 @@ CONFIGURE_ARGS += --enable-loadable-sqli
CONFIGURE_ARGS += --with-lto
. endif
TEST_IS_INTERACTIVE = Yes
+.endif
+
+.include
+
+.if ${BUILD_PACKAGES:M-tkinter}
+MODULES += x11/tk
+CONFIGURE_ARGS += --with-tcltk-includes='-I${MODTCL_INCDIR}
-I${MODTK_INCDIR} -I${X11BASE}/include' \
+ --with-tcltk-libs='-L${X11BASE}/lib -l${MODTCL_LIB}
-l${MODTK_LIB}'
+. if ${VERSION} == "2.7"
+MODTK_VERSION =8.5
+. else
+MODTK_VERSION =8.6
+. endif
.endif
CONFIGURE_ENV += OPT='${CFLAGS} -fPIC'
CPPFLAGS='-I${LOCALBASE}/include' \
Index: 2.7/Makefile
===
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 Makefile
--- 2.7/Makefile28 Mar 2022 15:48:24 - 1.76
+++ 2.7/Makefile5 Jun 2022 13:11:38 -
@@ -8,12 +8,12 @@ SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
PORTROACH =limit:^2\.7
-REVISION-main =7
+REVISION-main =8
REVISION-idle =1
REVISION-tests = 1
REVISION-bsddb = 0
REVISION-gdbm =0
-REVISION-tkinter = 0
+REVISION-tkinter = 1
REVISION-tools = 0
CONFIGURE_ARGS += --with-ensurepip=no
Index: 2.7/files/CHANGES.OpenBSD
===
RCS file: /cvs/ports/lang/python/2.7/files/CHANGES.OpenBSD,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 CHANGES.OpenBSD
--- 2.7/files/CHANGES.OpenBSD 11 Mar 2022 19:29:11 - 1.7
+++ 2.7/files/CHANGES.OpenBSD 5 Jun 2022 13:11:38 -
@@ -7,5 +7,8 @@ of changes made to this version of Pytho
3. RAND_egd support has been disabled, as it is not available in
LibreSSL.
+4. Enable proper building of TkInter against Tcl/Tk 8.5;
+the TkInter configure script doesn't look for OpenBSD-style sonames.
+
These changes are available in the OpenBSD CVS repository
in ports/lang/python/2.7.
Index: 2.7/patches/patch-setup_py
===
RCS file: /cvs/ports/lang/python/2.7/patches/patch-setup_py,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-setup_py
--- 2.7/patches/patch-setup_py 11 Mar 2022 19:29:11 - 1.16
+++ 2.7/patches/patch-setup_py 5 Jun 2022 13:11:38 -
@@ -84,17 +84,7 @@ Index: setup.py
frameworks = ['-framework',
Re: pkg_add coccinella: Can't find tcltls-1.6p4
rday, May 28, 2022 9:02 AM Subject: Re: pkg_add coccinella: Can't find tcltls-1.6p4 Hello, (stu@ removed from CC:) sebas...@l00-bugdead-prods.de (Sebastian Reitenbach), 2022.04.27 19:15 (CEST): > On Tuesday, April 26, 2022 16:25 CEST, Stuart Cassoff <3...@bell.net> wrote: > > Sorry about that. I'm looking into it. > I don't use net/coccinella anymore, it's old, and since long > unmaintained upstream. I do not use it either, just wanted to check it out. Thanks for the info! > In case it's in the way of updating tcltls, it probably should just be > removed. tcltls was updated by stu@ and with his help successfully installed here. Marcus tcltls.diff.gz Description: application/gzip
Re: NEW: Tdbc-odbc
Yes, thanks! Stu -- Original Message -- From: s...@spacehopper.org To: 3...@bell.net Cc: ports@openbsd.org Sent: Thursday, June 2, 2022 8:22 AM Subject: Re: NEW: Tdbc-odbc On 2022/06/02 07:45, Stuart Cassoff wrote: > ping > > >-- Original Message -- >From: 3...@bell.net >To: ports@openbsd.org >Sent: Monday, May 23, 2022 11:26 PM >Subject: NEW: Tdbc-odbc > > This completes the set! > > Stu > > $ cat pkg/DESCR > Provides a database interface that conforms to Tcl DataBase Connectivity > (TDBC) > and allows a Tcl script to connect to an ODBC database. > > > > I would s/odbc/ODBC/ in COMMENT OK
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/06/02 09:03:52 Modified files: databases : Makefile Log message: +tdbc-odbc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/06/02 09:02:37 Log message: Import databases/tdbc-odbc. Provides a database interface that conforms to Tcl DataBase Connectivity (TDBC) and allows a Tcl script to connect to an ODBC database. OK sthen@ Status: Vendor Tag: stu Release Tags: stu_20220602 N ports/databases/tdbc-odbc/distinfo N ports/databases/tdbc-odbc/Makefile N ports/databases/tdbc-odbc/pkg/PLIST N ports/databases/tdbc-odbc/pkg/DESCR No conflicts created by this import
Re: NEW: Tdbc-odbc
ping -- Original Message -- From: 3...@bell.net To: ports@openbsd.org Sent: Monday, May 23, 2022 11:26 PM Subject: NEW: Tdbc-odbc This completes the set! Stu $ cat pkg/DESCR Provides a database interface that conforms to Tcl DataBase Connectivity (TDBC) and allows a Tcl script to connect to an ODBC database.
Re: pkg_add coccinella: Can't find tcltls-1.6p4
I can take maintainer for this port. Stu -- Original Message -- From: mcmer-open...@tor.at To: sebas...@l00-bugdead-prods.de Cc: ports@openbsd.org Sent: Saturday, May 28, 2022 9:02 AM Subject: Re: pkg_add coccinella: Can't find tcltls-1.6p4 Hello, (stu@ removed from CC:) sebas...@l00-bugdead-prods.de (Sebastian Reitenbach), 2022.04.27 19:15 (CEST): > On Tuesday, April 26, 2022 16:25 CEST, Stuart Cassoff <3...@bell.net> wrote: > > Sorry about that. I'm looking into it. > I don't use net/coccinella anymore, it's old, and since long > unmaintained upstream. I do not use it either, just wanted to check it out. Thanks for the info! > In case it's in the way of updating tcltls, it probably should just be > removed. tcltls was updated by stu@ and with his help successfully installed here. Marcus
Re: pkg_add coccinella: Can't find tcltls-1.6p4
Bummer, I was hoping the patch wouldn't get mangled. Oh well. Patch
attached.
This'll set it up:
$ cat uptcltls.sh
d=/path/to/tcltls.diff.gz
mkdir -p /usr/ports/mystuff/security
cd /usr/ports/mystuff/security
rm -Rf tcltls
cp -a /usr/ports/security/tcltls .
cd tcltls
gzcat $d | patch -p0 -E
find . -name '*.orig' -exec rm {} +
Stu
-- Original Message --
From: mcmer-open...@tor.at
To: 3...@bell.net
Cc: ports@openbsd.org; sebas...@openbsd.org
Sent: Tuesday, May 24, 2022 8:50 AM
Subject: Re: pkg_add coccinella: Can't find tcltls-1.6p4
Hello Stu,
your patch landed somewhat garbled in my inbox, long lines gained a
line break. I attempted a repair, following patch(1)'s advice, and ran
patch < your.patch in security/tcltls. I ended up with two patch files
in security/tcltls instead of patches/. Moved these into patches/, ran
make but got:
Patching file tlsX509.c using Plan A...
Reversed (or previously applied) patch detected! Assume -R? [y] n
Apply anyway? [n] n
Hunk #1 ignored at 104.
Hunk #2 ignored at 144.
2 out of 2 hunks ignored--saving rejects to tlsX509.c.rej
done
***> patch-tlsX509_c did not apply cleanly
===> Ignoring patchfile patch-tlsX509_c.orig
===> Ignoring patchfile patch-tlsX509_c.rej
===> Failed patches:
patch-tests_ciphers_test
patch-tlsX509_c
I'm at my wits end.
Marcus
3...@bell.net (Stuart Cassoff), 2022.05.23 (Mon) 23:06 (CEST):
> Hi,
>
> I've brought the port up to the latest version
> but I'm not pleased with the test failures
> when not using --enable-ssl-fastpath.
>
> I don't see anything about this problem in
> the FreeBSD, NetBSD or Debian ports.
> Only NetBSD uses --enable-ssl-fastpath.
>
> My best guess is something to do with EAGAIN
> handling and BIO_should_read/write() in the BioRead
> and BioWrite functions in tlsBIO.c.
>
> This is about as far as my brain can take me.
> Additional notes in the patches.
>
> Same results on amd64 and i386.
>
>
> Stu
>
>
> diff -u -rNp /usr/ports/security/tcltls/Makefile ./Makefile
> --- /usr/ports/security/tcltls/Makefile Fri Mar 11 14:54:07 2022
> +++ ./MakefileMon May 23 16:52:38 2022
> @@ -1,16 +1,12 @@
> -BROKEN= Needs update to less outdated version and checking of
dependent
> ports
> -
> COMMENT= OpenSSL Tcl extension
>
> -VERSION= 1.6
> +VERSION= 1.7.22
>
> -DISTNAME=tls${VERSION}-src
> -PKGNAME= tcltls-${VERSION}
> -REVISION=4
> +DISTNAME=tcltls-${VERSION}
>
> CATEGORIES= security
>
> -HOMEPAGE=http://tls.sourceforge.net/
> +HOMEPAGE=http://core.tcl-lang.org/tcltls/
>
> MAINTAINER= Sebastian Reitenbach
>
> @@ -19,29 +15,54 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB= ssl crypto
>
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=tls/}
> +MASTER_SITES=${HOMEPAGE:=uv/}
>
> MODULES= lang/tcl
>
> RUN_DEPENDS= ${MODTCL_RUN_DEPENDS}
> BUILD_DEPENDS= ${RUN_DEPENDS}
>
> -WRKDIST= ${WRKDIR}/tls${VERSION}
> +FAKE_FLAGS = PACKAGE_INSTALL_DIR='$$(TCL_PACKAGE_PATH)/tcltls' \
> + INSTALL_PROGRAM='$$(INSTALL_DATA)'
> +
> +TEST_FLAGS = TESTFLAGS='${TESTFLAGS}'
> SEPARATE_BUILD =Yes
> CONFIGURE_STYLE=gnu
> +
> CONFIGURE_ARGS= --libdir=${MODTCL_TCLDIR} \
> --with-tcl=${MODTCL_LIBDIR} \
> - --with-tclinclude=${MODTCL_INCDIR} \
> - --with-ssl-dir=/usr \
> - --includedir=${PREFIX}/include/tcltls
> + --includedir=${PREFIX}/include/tcltls \
> + --disable-rpath \
> + --enable-deterministic \
> + --enable-ssl-fastpath
>
> -FAKE_FLAGS = PKG_DIR='$$(PACKAGE_NAME)'
INSTALL_PROGRAM='$$(INSTALL_DATA)'
> -INSTALL_TARGET= install-binaries
> +
> +# Tests will fail without this. Not a good sign.
> +# --enable-ssl-fastpath
> +
> +# Use premade DH primes instead of generating new ones; builds
faster.
> +# --enable-deterministic
> +
> +# Print lots of debugging info
> +# --enable-debug
> +
> +
> +# Tcltls configure will always choose tclsh8.6 (if installed) over
> tclsh8.5.
> +# Ensure that the tclsh chosen is the one matching MODTCL_VERSION.
> +CONFIGURE_ENV += TCLSH_NATIVE=${MODTCL_BIN}
> +
> TEST_TARGET= test
> -CFLAGS +=-DNO_SSL2 -DNO_SSL3
> -SUBST_VARS= VER
>
> -VER= ${VERSION:S/.//g}
> +# Use TESTFLAGS to control the Tclthread tests
> +TESTFLAGS =
> +
> +
> +# These tests fail without --enable-ssl-fastpath.
> +#TESTFLAGS='-skip "tlsIO-9.2 tlsIO-2.11 tlsIO-12.3"'
> +
> +# To run one test only:
> +#TESTFLAGS='-match "tlsIO-9.2"'
&g
NEW: Tdbc-odbc
This completes the set! Stu $ cat pkg/DESCR Provides a database interface that conforms to Tcl DataBase Connectivity (TDBC) and allows a Tcl script to connect to an ODBC database. port-tdbc-odbc.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 21:00:09 Modified files: databases/tdbc-sqlite3: Makefile distinfo Log message: Update to 1.1.3. Update HOMEPAGE. Add TESTFLAGS var for Tdbc-sqlite3 test control. Upstream build improvements mean that now the Tdbc-sqlite3 tests can be run like normal Tcl TEA extension tests.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 20:59:44 Modified files: databases/tdbc-postgres: Makefile distinfo databases/tdbc-postgres/pkg: PLIST Log message: Update to 1.1.3. Update HOMEPAGE. Add TESTFLAGS var for Tdbc-postgres test control. Upstream build improvements mean that now the Tdbc-postgres tests can be run like normal Tcl TEA extension tests.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 20:59:08 Modified files: databases/tdbc-mysql: Makefile distinfo databases/tdbc-mysql/pkg: PLIST Added files: databases/tdbc-mysql/patches: patch-generic_tdbcmysql_c patch-tests_tdbcmysql_test Log message: Update to 1.1.3. Update HOMEPAGE. Add TESTFLAGS var for Tdbc-mysql test control. Upstream build improvements mean that now the Tdbc-mysql tests can be run like normal Tcl TEA extension tests. Add patch because MariaDb removed "MySQL" from error messages, causing a test to fail. Add cheap patch because mysql_get_client_version() since 10.6.2 returns the client version and no longer the server version, breaking an assumption made by this software. Add patch from upstream, fixing bug: https://core.tcl-lang.org/tdbcmysql/info/9bf0e3e2e7. This comment in the port Makefile was/is wrong: "Skip test requiring isolation levels not provided by MariaDB" All tests pass now.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 20:57:38 ports/databases/tdbc-mysql/patches Update of /cvs/ports/databases/tdbc-mysql/patches In directory cvs.openbsd.org:/tmp/cvs-serv93128/patches Log Message: Directory /cvs/ports/databases/tdbc-mysql/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 20:56:51 Modified files: databases/tdbc : Makefile distinfo databases/tdbc/patches: patch-Makefile_in patch-configure patch-pkgIndex_tcl_in databases/tdbc/pkg: PLIST Log message: Update to 1.1.3. Update HOMEPAGE. Add TESTFLAGS var for Tdbc test control. Add a SUBST_VAR to help reduce PLIST churn.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 20:55:52 Modified files: devel/tclthread: Makefile distinfo devel/tclthread/patches: patch-Makefile_in patch-configure patch-pkgIndex_tcl_in devel/tclthread/pkg: PLIST Log message: Update to 2.8.7. Add TESTFLAGS var for Tclthread test control. Add a SUBST_VAR to help reduce PLIST churn.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 20:54:39 Modified files: x11/tk/8.6 : Makefile distinfo x11/tk/8.6/patches: patch-unix_Makefile_in patch-unix_tk_pc_in x11/tk/8.6/pkg : PLIST Log message: Update to 8.6.12. Update HOMEPAGE.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 20:54:08 Modified files: lang/tcl/8.6 : Makefile distinfo lang/tcl/8.6/patches: patch-library_init_tcl patch-library_tm_tcl patch-unix_Makefile_in lang/tcl/8.6/pkg: PLIST README Removed files: lang/tcl/8.6/patches: patch-generic_tclIO_c patch-library_safe_tcl patch-tests_binary_test patch-unix_configure Log message: Update to 8.6.12. Update HOMEPAGE. Remove three patch files thanks to upstream changes. Remove one patch file not needed since 2017-12-14: https://marc.info/?l=openbsd-cvs=15135127141 Remove static library section from README; 8.5 only.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/23 19:27:43 Modified files: lang/eagle : Makefile distinfo Log message: Update to beta49.
Re: -Wstring-plus-int
Hi, -- Original Message -- From: t...@theobuehler.org To: 3...@bell.net Cc: ports@openbsd.org Sent: Saturday, May 21, 2022 3:14 AM Subject: Re: -Wstring-plus-int On Fri, May 20, 2022 at 04:34:22AM -0400, Stuart Cassoff wrote: > > I get 7 of these warnings building Tclthread (summarized): > warning: adding 'int' to a string does not append to the string > [-Wstring-plus-int] > Happens here at "b+1": ((a) && (b) && (*(a)==*(b)) && (*(a+1)==*(b+1)) && > (!strcmp((a),(b > So I'm wondering if I should: > a) Add -Wno-string-plus-int to flags. > b) Patch: > - ((a) && (b) && (*(a)==*(b)) && (*(a+1)==*(b+1)) && (!strcmp((a),(b > + ((a) && (b) && (*(a)==*(b)) && (*(a+1)==(b[1])) && (!strcmp((a),(b If you want to patch, I suggest you pull in the upstream fix. This has the benefit of consistency and using correct parentheses: https://github.com/tcltk/thread/commit/4db6b62efaee4a6f3af1f4fe89ef47f59c7dcbb5 I was mistakenly working with an older version. The newer version has the fix - with the all the brackets. Your suggested patch would break reasonable usage such as OPT_CMP(a + 1, b + 1). True. It was a surgical patch to handle the particular case. As a C programmer, I don't think I should be forced into a particular syntax to add an int to a pointer. I suspect C++ people. > c) Leave as is. I think either option is fine. Thanks, Stu
Re: ***UNCHECKED*** Re: pkg_add coccinella: Can't find tcltls-1.6p4
I'm not familiar with telephony/iaxclient but the others are all good and worth keeping. (telephony/iaxclient probably good, too) Stu -- Original Message -- From: s...@spacehopper.org To: sebas...@l00-bugdead-prods.de Cc: 3...@bell.net; mcmer-open...@tor.at; ports@openbsd.org Sent: Thursday, April 28, 2022 12:53 PM Subject: Re: ***UNCHECKED*** Re: pkg_add coccinella: Can't find tcltls-1.6p4 On 2022/04/27 19:15, Sebastian Reitenbach wrote: > Hi, > > On Tuesday, April 26, 2022 16:25 CEST, Stuart Cassoff <3...@bell.net> wrote: > > > Sorry about that. I'm looking into it. > > I don't use net/coccinella anymore, it's old, and since long unmaintained upstream. > In case it's in the way of updating tcltls, it probably should just be removed. btw if coccinella is removed, it might make sense to remove some/all of these too which afaict were imported for coccinella audio/snack graphics/tkimg graphics/tkpng misc/memchan telephony/iaxclient x11/tkdnd x11/tkhtml x11/tktray x11/tktreectrl
Re: pkg_add coccinella: Can't find tcltls-1.6p4
Hi,
I've brought the port up to the latest version
but I'm not pleased with the test failures
when not using --enable-ssl-fastpath.
I don't see anything about this problem in
the FreeBSD, NetBSD or Debian ports.
Only NetBSD uses --enable-ssl-fastpath.
My best guess is something to do with EAGAIN
handling and BIO_should_read/write() in the BioRead
and BioWrite functions in tlsBIO.c.
This is about as far as my brain can take me.
Additional notes in the patches.
Same results on amd64 and i386.
Stu
diff -u -rNp /usr/ports/security/tcltls/Makefile ./Makefile
--- /usr/ports/security/tcltls/Makefile Fri Mar 11 14:54:07 2022
+++ ./Makefile Mon May 23 16:52:38 2022
@@ -1,16 +1,12 @@
-BROKEN= Needs update to less outdated version and checking of dependent
ports
-
COMMENT= OpenSSL Tcl extension
-VERSION= 1.6
+VERSION= 1.7.22
-DISTNAME= tls${VERSION}-src
-PKGNAME= tcltls-${VERSION}
-REVISION= 4
+DISTNAME= tcltls-${VERSION}
CATEGORIES=security
-HOMEPAGE= http://tls.sourceforge.net/
+HOMEPAGE= http://core.tcl-lang.org/tcltls/
MAINTAINER=Sebastian Reitenbach
@@ -19,29 +15,54 @@ PERMIT_PACKAGE= Yes
WANTLIB= ssl crypto
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tls/}
+MASTER_SITES= ${HOMEPAGE:=uv/}
MODULES= lang/tcl
RUN_DEPENDS= ${MODTCL_RUN_DEPENDS}
BUILD_DEPENDS= ${RUN_DEPENDS}
-WRKDIST= ${WRKDIR}/tls${VERSION}
+FAKE_FLAGS = PACKAGE_INSTALL_DIR='$$(TCL_PACKAGE_PATH)/tcltls' \
+ INSTALL_PROGRAM='$$(INSTALL_DATA)'
+
+TEST_FLAGS = TESTFLAGS='${TESTFLAGS}'
SEPARATE_BUILD =Yes
CONFIGURE_STYLE=gnu
+
CONFIGURE_ARGS=--libdir=${MODTCL_TCLDIR} \
--with-tcl=${MODTCL_LIBDIR} \
- --with-tclinclude=${MODTCL_INCDIR} \
- --with-ssl-dir=/usr \
- --includedir=${PREFIX}/include/tcltls
+ --includedir=${PREFIX}/include/tcltls \
+ --disable-rpath \
+ --enable-deterministic \
+ --enable-ssl-fastpath
-FAKE_FLAGS = PKG_DIR='$$(PACKAGE_NAME)'
INSTALL_PROGRAM='$$(INSTALL_DATA)'
-INSTALL_TARGET=install-binaries
+
+# Tests will fail without this. Not a good sign.
+# --enable-ssl-fastpath
+
+# Use premade DH primes instead of generating new ones; builds faster.
+# --enable-deterministic
+
+# Print lots of debugging info
+# --enable-debug
+
+
+# Tcltls configure will always choose tclsh8.6 (if installed) over
tclsh8.5.
+# Ensure that the tclsh chosen is the one matching MODTCL_VERSION.
+CONFIGURE_ENV += TCLSH_NATIVE=${MODTCL_BIN}
+
TEST_TARGET= test
-CFLAGS += -DNO_SSL2 -DNO_SSL3
-SUBST_VARS=VER
-VER= ${VERSION:S/.//g}
+# Use TESTFLAGS to control the Tclthread tests
+TESTFLAGS =
+
+
+# These tests fail without --enable-ssl-fastpath.
+#TESTFLAGS='-skip "tlsIO-9.2 tlsIO-2.11 tlsIO-12.3"'
+
+# To run one test only:
+#TESTFLAGS='-match "tlsIO-9.2"'
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcltls/
diff -u -rNp /usr/ports/security/tcltls/distinfo ./distinfo
--- /usr/ports/security/tcltls/distinfo Sat Jan 17 22:15:08 2015
+++ ./distinfo Sat May 21 09:18:13 2022
@@ -1,2 +1,2 @@
-SHA256 (tls1.6-src.tar.gz) =
rexQFDqa1jSmcdJPfHu/JFVIfrXxLSkPQXl8MqmLk/M=
-SIZE (tls1.6-src.tar.gz) = 168043
+SHA256 (tcltls-1.7.22.tar.gz) =
6E4reideyCxKqp0bH5eG2+Q1jIFekXU5/+f2Z/9Lw7Q=
+SIZE (tcltls-1.7.22.tar.gz) = 165206
diff -u -rNp /usr/ports/security/tcltls/patches/patch-configure
./patches/patch-configure
--- /usr/ports/security/tcltls/patches/patch-configure Fri Mar 11
14:54:07 2022
+++ ./patches/patch-configure Wed Dec 31 19:00:00 1969
@@ -1,12 +0,0 @@
-Index: configure
configure.orig
-+++ configure
-@@ -8155,7 +8155,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
- DL_LIBS=""
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
- echo "$as_me:$LINENO: checking for ELF" >&5
- echo $ECHO_N "checking for ELF... $ECHO_C" >&6
- if test "${tcl_cv_ld_elf+set}" = set; then
diff -u -rNp /usr/ports/security/tcltls/patches/patch-tests_ciphers_test
./patches/patch-tests_ciphers_test
--- /usr/ports/security/tcltls/patches/patch-tests_ciphers_test Fri Mar
11 14:54:07 2022
+++ ./patches/patch-tests_ciphers_test Wed Dec 31 19:00:00 1969
@@ -1,39 +0,0 @@
-Those tests will fail.
-
tests/ciphers.test.origFri Jun 22 23:03:34 2007
-+++ tests/ciphers.test Sun Dec 5 12:57:05 2010
-@@ -105,22 +105,22 @@ test ciphers-1.2 {Tls::ciphers for tls1}
{rsabsafe} {
- listcompare $::EXPECTEDCIPHERS(rsabsafe) [tls::ciphers tls1]
- } {}
-
--test ciphers-1.3 {Tls::ciphers for ssl3} {openssl} {
--# This will fail if you compiled against RSA bsafe or with a
--# different set of defines than the default.
--# Change the constraint setting above.
--listcompare
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/20 14:45:05 Modified files: databases/sqlite3-tcl: Makefile distinfo Log message: Update to 3.38.5. Remove build lock to Tcl 8.5; not needed and some people might want to build against 8.6. Add recommended "-DSQLITE_DQS=0" build flag, https://sqlite.org/quirks.html#dblquote.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/20 14:42:33 Modified files: x11/tk/8.5 : Makefile x11/tk/8.5/pkg : PLIST Log message: Update HOMEPAGE, regen PLIST, bump REVISION.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/05/20 14:42:06 Modified files: lang/tcl/8.5 : Makefile lang/tcl/8.5/pkg: PLIST README Log message: Update HOMEPAGE, regen PLIST, bump REVISION.
-Wstring-plus-int
I get 7 of these warnings building Tclthread (summarized): warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] Happens here at "b+1": ((a) && (b) && (*(a)==*(b)) && (*(a+1)==*(b+1)) && (!strcmp((a),(b So I'm wondering if I should: a) Add -Wno-string-plus-int to flags. b) Patch: - ((a) && (b) && (*(a)==*(b)) && (*(a+1)==*(b+1)) && (!strcmp((a),(b + ((a) && (b) && (*(a)==*(b)) && (*(a+1)==(b[1])) && (!strcmp((a),(b c) Leave as is. Stu
Re: pkg_add coccinella: Can't find tcltls-1.6p4
Sorry about that. I'm looking into it. Stu -- Original Message -- From: mcmer-open...@tor.at To: ports@openbsd.org Cc: sebas...@openbsd.org Sent: Monday, April 25, 2022 7:46 AM Subject: pkg_add coccinella: Can't find tcltls-1.6p4 Hello! As the subject says: "pkg_add coccinella" tells me it "Can't find tcltls-1.6p4". The Makefile of tcltls says: BROKEN= Needs update to less outdated version and checking \ of dependent ports The Makefile of coccinella says: RUN_DEPENDS = security/tcltls [and many more] Doesn't this mean coccinella is broken, too? This is on -current as of yesterday but happens for quite a while already. Marcus
Re: Update: ruby-tk 0.3.0 -> 0.4.0
Nice! OK
On Tue, 25 May 2021, Jeremy Evans wrote:
> On 05/25 07:13, Jeremy Evans wrote:
> > On 05/25 05:18, Stuart Cassoff wrote:
> > > Have you tried this with Tcl/Tk 8.6?
> > > I think it's a good idea for ports to move to using 8.6 if possible.
> > > Also, you might want to use the Tk port module.
> >
> > ruby-tk is still designed for Tk 8.5. See
> > https://github.com/ruby/tk/commit/247f01adf981abe11283dc24cc7afd2173e62108
> > Some parts work with Tk 8.6, but not all. So I think this should stay on
> > 8.5. I'll look into using the Tk port module.
>
> Here's a version that uses the x11/tk module. OK?
>
> Thanks,
> Jeremy
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/ruby-tk/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile 11 Nov 2020 02:45:18 - 1.6
> +++ Makefile 25 May 2021 15:46:47 -
> @@ -2,7 +2,7 @@
>
> COMMENT= ruby graphical tooklit using Tk
>
> -DISTNAME=tk-0.3.0
> +DISTNAME=tk-0.4.0
> CATEGORIES= x11
>
> HOMEPAGE=https://github.com/ruby/tk
> @@ -12,18 +12,18 @@ MAINTAINER= Jeremy Evans # MIT
> PERMIT_PACKAGE= Yes
>
> -MODULES= lang/ruby
> +MODULES= lang/ruby x11/tk
>
> CONFIGURE_STYLE= ruby gem ext
>
> MODRUBY_TEST=rake
>
> -CONFIGURE_ARGS = --with-tcl-include=${LOCALBASE}/include/tcl8.5 \
> - --with-tk-include=${LOCALBASE}/include/tk8.5 \
> - --with-tcllib=tcl85 \
> - --with-tklib=tk85 \
> +CONFIGURE_ARGS = --with-tcl-include=${MODTCL_INCDIR} \
> + --with-tk-include=${MODTK_INCDIR} \
> + --with-tcllib=${MODTCL_LIB} \
> + --with-tklib=${MODTK_LIB} \
> --with-X11-dir=${X11BASE}
> -WANTLIB =X11 tcl85 tk85
> -LIB_DEPENDS =tk->=8.5,<8.6:x11/tk/8.5
> +WANTLIB =X11 ${MODTCL_LIB} ${MODTK_LIB}
> +LIB_DEPENDS =${MODTK_LIB_DEPENDS}
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/ruby-tk/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 11 Nov 2020 02:45:18 - 1.2
> +++ distinfo 25 May 2021 15:46:47 -
> @@ -1,2 +1,2 @@
> -SHA256 (tk-0.3.0.gem) = w840rW0detKDLvVPeHTuh+FDqE8JAE3nPMDB6MQaRBI=
> -SIZE (tk-0.3.0.gem) = 1721856
> +SHA256 (tk-0.4.0.gem) = ar/8VrYKR+g6+acG0b9doQzmmOgSGfgdq24tTYZtt6o=
> +SIZE (tk-0.4.0.gem) = 1721856
>
Re: Update: ruby-tk 0.3.0 -> 0.4.0
Have you tried this with Tcl/Tk 8.6? I think it's a good idea for ports to move to using 8.6 if possible. Also, you might want to use the Tk port module. Stu On Mon, 24 May 2021, Jeremy Evans wrote: > Simple bump to latest version of ruby-tk. > > Main changes are to fix various warnings and errors on recent Ruby > versions and to run the event loop on the main thread, which massively > speeds up programs using ruby-tk. > > Tested on amd64. Will be committing in a couple days unless I hear > objections. > > Thanks, > Jeremy > > Index: Makefile > === > RCS file: /cvs/ports/x11/ruby-tk/Makefile,v > retrieving revision 1.6 > diff -u -p -r1.6 Makefile > --- Makefile 11 Nov 2020 02:45:18 - 1.6 > +++ Makefile 23 Mar 2021 15:03:18 - > @@ -2,7 +2,7 @@ > > COMMENT= ruby graphical tooklit using Tk > > -DISTNAME=tk-0.3.0 > +DISTNAME=tk-0.4.0 > CATEGORIES= x11 > > HOMEPAGE=https://github.com/ruby/tk > Index: distinfo > === > RCS file: /cvs/ports/x11/ruby-tk/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 11 Nov 2020 02:45:18 - 1.2 > +++ distinfo 26 Mar 2021 17:44:08 - > @@ -1,2 +1,2 @@ > -SHA256 (tk-0.3.0.gem) = w840rW0detKDLvVPeHTuh+FDqE8JAE3nPMDB6MQaRBI= > -SIZE (tk-0.3.0.gem) = 1721856 > +SHA256 (tk-0.4.0.gem) = ar/8VrYKR+g6+acG0b9doQzmmOgSGfgdq24tTYZtt6o= > +SIZE (tk-0.4.0.gem) = 1721856 > >
iridium/i386
I may have missed a post about this but iridium hasn't been working on i386 for a while now. Something seems off. $ iridium /usr/local/bin/iridium[57]: /usr/local/iridium/iridium: Cannot allocate memory $ ldd /usr/local/iridium/iridium /usr/local/iridium/iridium: /usr/local/iridium/iridium: Cannot allocate memory /usr/local/iridium/iridium: exit status 1 $ size /usr/local/iridium/iridium textdatabss dec hex 175634300 3685956 1852292 181172548 acc7944 Stu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2020/12/21 08:20:41 Modified files: databases/sqlite3-odbc: Makefile distinfo databases/sqlite3-odbc/pkg: PLIST Log message: Update to 0.9998.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2020/12/19 03:10:05 Modified files: databases/sqlite3-tcl: Makefile distinfo Log message: Update to 3.34.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2020/11/14 04:59:49 Modified files: databases/sqlite3-tcl: Makefile distinfo databases/sqlite3-tcl/patches: patch-tea_configure databases/sqlite3-tcl/pkg: PLIST Log message: Update to 3.33.0. Build against Tcl 8.5 so this Tcl extension can work with Tcl 8.5 and Tcl 8.6. OK sthen@
Re: [update] devel/tcllib -> 1.20
Thanks! I'll look into it. On 2020-04-16 08:10, Renaud Allard wrote: Hello, Here is a proposed update for devel/tcllib from 1.19 to 1.20. What do you think? Regards
Re: git gui: Tcl version error
On 2020-01-19 13:11, Stuart Henderson wrote: ..but the wish interpreter path is set (eventually) based on whatever version ports is telling it to use, so wish8.5. The only way I can see that it would work is if you run "wish8.6 /usr/local/libexec/git/git-gui". Anyway here is the fix, also moves a file to the correct PLIST and uses the correct wish interpreter path in git-gui--askpass (it's subst'ed in git-gui.sh -> git-gui in git-gui/Makefile, but not in git-gui--askpass) x11/tk +MODTK_VERSION = 8.6 + Hi, Yes, that's the good way to go, thanks. Any Tcl extensions that this (or other 8.6-using ports) require should probably still be built against 8.5. This is fine, they will also load into 8.6. Stu
Re: [UPDATE] eltclsh 1.17
Forgot to add https://marc.info/?t=15321628912=1=2
where can be found my Tcl/Tk plans.
Stu
> -- Original Message --
> From: Matthieu Herrb
> Date: August 9, 2018 at 3:12 AM
>
>
> Hi,
>
> Update eltclsh to recently released version 1.17
>
> ok?
>
> Index: Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/Makefile,v
> retrieving revision 1.31
> diff -u -p -u -r1.31 Makefile
> --- Makefile 20 May 2018 10:49:38 - 1.31
> +++ Makefile 9 Aug 2018 07:07:49 -
> @@ -2,7 +2,7 @@
>
> COMMENT =Libedit interface to Tcl/Tk interpreters
>
> -DISTNAME = eltclsh-1.16
> +DISTNAME = eltclsh-1.17
> CATEGORIES = lang x11
>
> MASTER_SITES = https://www.openrobots.org/distfiles/eltclsh/
> Index: distinfo
> ===
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/distinfo,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 distinfo
> --- distinfo 20 May 2018 10:49:38 - 1.8
> +++ distinfo 9 Aug 2018 07:08:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (eltclsh-1.16.tar.gz) = RHi2Ktwye/cvhv/EIDNaKCfU4xPKd/IthQy7SobwygM=
> -SIZE (eltclsh-1.16.tar.gz) = 357909
> +SHA256 (eltclsh-1.17.tar.gz) = yPsVPiopVSkwqyQYyGM2slGfEWnYVRXKSNIjpY4ob5Q=
> +SIZE (eltclsh-1.17.tar.gz) = 378482
> Index: patches/patch-src_Makefile_in
> ===
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-src_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-src_Makefile_in
> --- patches/patch-src_Makefile_in 20 May 2018 10:49:38 - 1.2
> +++ patches/patch-src_Makefile_in 9 Aug 2018 07:09:12 -
> @@ -5,7 +5,7 @@ Find X and Tcl includes
> Index: src/Makefile.in
> --- src/Makefile.in.orig
> +++ src/Makefile.in
> -@@ -292,6 +292,7 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
> +@@ -303,6 +303,7 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
> TCL_VERSION = @TCL_VERSION@
> TK_BIN_DIR = @TK_BIN_DIR@
> TK_INCLUDE_SPEC = @TK_INCLUDE_SPEC@
> @@ -13,7 +13,7 @@ Index: src/Makefile.in
> TK_LIB_FILE = @TK_LIB_FILE@
> TK_LIB_FLAG = @TK_LIB_FLAG@
> TK_LIB_SPEC = @TK_LIB_SPEC@
> -@@ -377,7 +378,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
> +@@ -389,7 +390,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
> -DELTCLSH_VERSION='"${PACKAGE_VERSION}"'
> eltclsh_LDFLAGS = ${RUNTIME_PATH}
> eltclsh_LDADD = libcommon.la ${TCL_LIB_SPEC}
>
> --
> Matthieu Herrb
>
Re: [UPDATE] eltclsh 1.17
Builds, runs and quick-tests fine with Tcl/Tk 8.5/8.6 on amd64/i386.
Here are small tweaks for WANTLIB, style, and MODTK_VERSION.
Setting MODTK_VERSION is needed for the port to easily weather the
ports system's eventual move to Tcl/Tk 8.6 by default.
Patches inlined for 8.5 and 8.6.
8.6 is preferred but my use of CFLAGS/LDFLAGS may be hacky.
Your port, your call. :)
Thanks,
Stu
Index: Makefile
===
RCS file: /cvs/ports/lang/eltclsh/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile20 May 2018 10:49:38 - 1.31
+++ Makefile9 Aug 2018 11:45:06 -
@@ -2,7 +2,7 @@
COMMENT = Libedit interface to Tcl/Tk interpreters
-DISTNAME = eltclsh-1.16
+DISTNAME = eltclsh-1.17
CATEGORIES = lang x11
MASTER_SITES = https://www.openrobots.org/distfiles/eltclsh/
@@ -14,11 +14,11 @@ MAINTAINER =Matthieu Herrb https://www.openrobots.org/distfiles/eltclsh/
@@ -14,11 +14,11 @@ MAINTAINER =Matthieu Herrb -- Original Message --
> From: Matthieu Herrb
> Date: August 9, 2018 at 3:12 AM
>
>
> Hi,
>
> Update eltclsh to recently released version 1.17
>
> ok?
>
> Index: Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/Makefile,v
> retrieving revision 1.31
> diff -u -p -u -r1.31 Makefile
> --- Makefile 20 May 2018 10:49:38 - 1.31
> +++ Makefile 9 Aug 2018 07:07:49 -
> @@ -2,7 +2,7 @@
>
> COMMENT =Libedit interface to Tcl/Tk interpreters
>
> -DISTNAME = eltclsh-1.16
> +DISTNAME = eltclsh-1.17
> CATEGORIES = lang x11
>
> MASTER_SITES = https://www.openrobots.org/distfiles/eltclsh/
> Index: distinfo
> ===
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/distinfo,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 distinfo
> --- distinfo 20 May 2018 10:49:38 - 1.8
> +++ distinfo 9 Aug 2018 07:08:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (eltclsh-1.16.tar.gz) = RHi2Ktwye/cvhv/EIDNaKCfU4xPKd/IthQy7SobwygM=
> -SIZE (eltclsh-1.16.tar.gz) = 357909
> +SHA256 (eltclsh-1.17.tar.gz) = yPsVPiopVSkwqyQYyGM2slGfEWnYVRXKSNIjpY4ob5Q=
> +SIZE (eltclsh-1.17.tar.gz) = 378482
> Index: patches/patch-src_Makefile_in
> ===
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-src_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-src_Makefile_in
> --- patches/patch-src_Makefile_in 20 May 2018 10:49:38 - 1.2
> +++ patches/patch-src_Makefile_in 9 Aug 2018 07:09:12 -
> @@ -5,7 +5,7 @@ Find X and Tcl includes
> Index: src/Makefile.in
> --- src/Makefile.in.orig
> +++ src/Makefile.in
> -@@ -292,6 +292,7 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
> +@@ -303,6 +303,7 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
> TCL_VERSION = @TCL_VERSION@
> TK_BIN_DIR = @TK_BIN_DIR@
> TK_INCLUDE_SPEC = @TK_INCLUDE_SPEC@
> @@ -13,7 +13,7 @@ Index: src/Makefile.in
> TK_LIB_FILE = @TK_LIB_FILE@
> TK_LIB_FLAG = @TK_LIB_FLAG@
> TK_LIB_SPEC = @TK_LIB_SPEC@
> -@@ -377,7 +378,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
> +@@ -389,7 +390,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
> -DELTCLSH_VERSION='"${PACKAGE_VERSION}"'
> eltclsh_LDFLAGS = ${RUNTIME_PATH}
> eltclsh_LDADD = libcommon.la ${TCL_LIB_SPEC}
>
> --
> Matthieu Herrb
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/07/30 16:53:10 Modified files: lang/eagle : Makefile distinfo Log message: Update to beta42.
Re: Change default Tcl to 8.6
l extensions built against 8.5 should work fine with 8.6. > -- Original Message -- > From: Stuart Cassoff <3...@bell.net> > Date: July 21, 2018 at 4:32 AM > > > Tcl extensions built with 8.5 can be used with 8.6. > > I've gone over the Makefiles, PLISTs, patches, and files of the ports listed. > Attached is a tarball with a diff and a copy of the list. > I tried to keep to the style of each Makefile. > > 6's are ports moved to 8.6. A few have comments. > 5's are ports that for now are staying at 8.5 for reasons. > > Reasons are comma-separated lists of ports (dependencies), > files (something in them), or comments why the port remained at 8.5. > > I'm unsure of some ports due to either dependencies or suspicions (python). > > Itcl/Itk are old and need Tcl's "internal" includes. > I have ports in progress for the newer versions that use 8.6. > When Itcl/Itk move to 8.6 a few more can follow. > > I haven't built anything yet! I'll be starting on i386 and amd64 in about 1/2 > day. > Ports upgraded are ports I'm confident will be ok, or I highly suspect will > be ok. > Any port not working can simply be slammed back down to 8.5. > Many of these ports aren't mine, so I'm not sure how to proceed. > > Stu > > 5 audio/snack devel/itcl > 5 cad/pcb cad/pcb/patch/configure > 5 comms/hamlibunsure > 5 databases/redis unsure > 5 databases/sqliteold,unsure > 5 devel/itcl old,needs internal #includes > 5 devel/ltcltkunchanged > 5 devel/swig unsure > 5 devel/tclcl old,unsure,net/ns,net/nam > 5 devel/tcllibneeded by many > 5 devel/tklib needed by many > 5 devel/vtcl old,new 8.6 version exists, can be updated later > 5 graphics/tkimg devel/itcl > 5 graphics/tkpng devel/itcl > 5 lang/expect unsure,threads problems? > 5 lang/otcl old,unsure,net/ns,net/nam > 5 lang/pypy unsure > 5 lang/ruby/2.3 lang/ruby/2.3/Makefile > 5 math/graphviz unsure > 5 misc/WordGenerator x11/iwidgets > 5 misc/memchannet/coccinella,devel/itcl > 5 net/coccinella devel/itcl > 5 net/nam old,devel/tclcl,lang/otcl,net/ns > 5 net/ns old,devel/tclcl,lang/otcl,net/nam > 5 net/tcludp net/coccinella,devel/itcl > 5 print/texlive/texmf unsure > 5 security/tcltls net/coccinella,devel/itcl > 5 sysutils/findlibunsure,devel/cil,devel/coccinelle > 5 telephony/iaxclient unsure > 5 textproc/catdoc > unsure,devel/kf5/kfilemetadata,-main,mail/kopano/core,-main > 5 x11/byzionly needed in 8.5 > 5 x11/itk devel/itcl > 5 x11/iwidgetsdevel/itcl,x11/itk > 5 x11/ruby-tk x11/ruby-tk/Makefile > 5 x11/tkdnd net/coccinella,devel/itcl > 5 x11/tkhtml net/coccinella,devel/itcl > 5 x11/tktray net/coccinella,devel/itcl > 5 x11/tktreectrl net/coccinella,devel/itcl > 6 audio/xcd > 6 cad/tkgate > 6 cad/xcircuit > 6 comms/tkhylafax > 6 databases/pgtcl > 6 databases/sqlite3-tcl > 6 devel/fossil > 6 devel/git > 6 devel/mercurial > 6 devel/nagelfar > 6 devel/p5-Tcl > 6 devel/tclarc4random > 6 devel/tkcvs > 6 devel/tkdiff > 6 emulators/frodo > 6 emulators/openmsx > 6 geo/gpsbabel > 6 graphics/colorexplorer > 6 graphics/gocr > 6 lang/eltclsh > 6 lang/jimtcl > 6 lang/obc > 6 lang/tcltutor > 6 mail/exmh2 > 6 math/R > 6 math/maxima > 6 misc/cbb > 6 misc/impress > 6 misc/remind > 6 misc/tkcron > 6 misc/tkinfo > 6 misc/tkman > 6 misc/wordnet > 6 net/climm > 6 net/netinfo > 6 net/ssvnc > 6 net/tcl-snmptools -pthread still needed? > 6 net/tclcurl -pthread still needed? > 6 net/tkabber/base > 6 net/tkirc > 6 net/weechat REVISION-tcl ok? > 6 productivity/sl > 6 security/password-gorilla > 6 security/tclgpg > 6 sysutils/libisoburn REVISION-tcltk ok? > 6 sysutils/tkdvd > 6 textproc/TclXML > 6 textproc/boust > 6 x11/dbus-intf > 6 x11/dbus-tcl > 6 x11/p5-Tkx > 6 x11/tkcon > 6 x11/tktable > 6 x11/x11vnc > 6 x11/xbindkeys uptcl86_ports85.tar.gz Description: application/gzip
Re: UPDATE: math/graphviz
> -- Original Message -- > From: Stuart Cassoff <3...@bell.net> > Date: July 28, 2018 at 1:15 PM > > > > -- Original Message -- > > From: Rafael Sadowski > > Date: July 28, 2018 at 12:59 PM > > > > > > Hi All! > > > > First try to update graphviz. The tests look ok and runtime test with > > x11/kde-applications/umbrello too. > > > > My main concern DISTNAME. That's not nice, any ideas? > > TK is gone. > > Forever? Is it a separate thing now that can maybe be another port? > > More importantly, could you please try this with > MODTCL_VERSION=8.6 And if you can't or it doesn't work, please put in MODTCL_VERSION=8.5 Thanks, Stu
Re: UPDATE: math/graphviz
> -- Original Message -- > From: Rafael Sadowski > Date: July 28, 2018 at 12:59 PM > > > Hi All! > > First try to update graphviz. The tests look ok and runtime test with > x11/kde-applications/umbrello too. > > My main concern DISTNAME. That's not nice, any ideas? > TK is gone. Forever? Is it a separate thing now that can maybe be another port? More importantly, could you please try this with MODTCL_VERSION=8.6 Thanks, Stu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/07/25 19:56:52 Modified files: textproc/tdom : Makefile distinfo textproc/tdom/patches: patch-Makefile_in patch-configure textproc/tdom/pkg: PLIST Log message: Update to 0.9.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/07/25 08:08:50 Modified files: x11/tk : tk.port.mk Log message: Only one of MODULES lang/tcl or x11/tk should be used, not both. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/07/25 08:07:48 Modified files: lang/pypy : Makefile Log message: Only one of MODULES lang/tcl or x11/tk should be used, not both. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/07/25 08:08:18 Modified files: sysutils/libisoburn: Makefile Log message: Only one of MODULES lang/tcl or x11/tk should be used, not both. ok sthen@
Re: MODULES= lang/tcl or x11/tk but not both
Good idea but 8.6 will still be picked up
in a ports tree where Tcl/Tk default versions are 8.6
and the port Makefile contains MODTK_VERSION=8.5 if MODULES=lang/tcl x11/tk.
(x11/tk lang/tcl) would work).
A remedy would be to swap them around or set MODTCL_VERSION as well.
Only two ports with this problem; I doubt we'll see (or think about it) it much.
For the reasons above and prevention being better than cure, I propose
something like:
Index: tk.port.mk
===
RCS file: /cvs/ports/x11/tk/tk.port.mk,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 tk.port.mk
--- tk.port.mk 22 Jul 2018 01:49:25 - 1.13
+++ tk.port.mk 25 Jul 2018 00:56:28 -
@@ -1,5 +1,9 @@
# $OpenBSD: tk.port.mk,v 1.13 2018/07/22 01:49:25 stu Exp $
+.if ${MODULES:Mlang/tcl}
+ERRORS += "Fatal: MODULES = lang/tcl or x11/tk but not both.\nChoose one and
set MOD* variables accordingly."
+.endif
+
CATEGORIES += x11/tk
MODTK_VERSION ?= 8.5
Stu
> -- Original Message --
> From: Stuart Henderson
> Date: July 24, 2018 at 5:52 PM
>
>
> On 2018/07/24 12:32, Stuart Cassoff wrote:
> > Only one is needed. Having both can cause problems.
> >
> > I found 2 ports (lang/pypy, systutils/libisoburn) with this problem, which
> > can be seen:
> > $ cd /usr/ports/sysutils/libisoburn/ && make show=MODULES
> > lang/tcl x11/tk gnu lang/tcl
> >
> > If MODULES=x11/tk then lang/tcl will be automatically added at the end.
> >
> > A port with "MODULES = lang/tcl x11/tk" and "MODTK_VERSION=8.5"
> > will break if the default ports Tcl/Tk is 8.6
> >
> > Using "MODULES=x11/tk" and "MODTK_VERSION=8.5" would be sufficient.
> >
> > OK?
> >
> > Stu
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/pypy/Makefile,v
> > retrieving revision 1.30
> > diff -u -p -u -p -r1.30 Makefile
> > --- Makefile15 Dec 2017 16:47:34 - 1.30
> > +++ Makefile24 Jul 2018 16:19:50 -
> > @@ -55,7 +55,7 @@ DISTFILES += ${BOOTSTRAP-${MACHINE_ARCH
> > # if adding archs, list *all* bootstraps in SUPDISTFILES
> > SUPDISTFILES = ${BOOTSTRAP-amd64}:0
> >
> > -MODULES += lang/python lang/tcl x11/tk
> > +MODULES += lang/python x11/tk
> > MODPY_VERSION =2.7
> >
> > COMPILER = base-clang ports-gcc
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/libisoburn/Makefile,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -p -r1.1.1.1 Makefile
> > --- Makefile19 Dec 2017 20:20:44 - 1.1.1.1
> > +++ Makefile24 Jul 2018 16:20:35 -
> > @@ -22,7 +22,7 @@ MASTER_SITES =http://files.libburnia-pr
> > # GPLv2+
> > PERMIT_PACKAGE_CDROM = Yes
> >
> > -MODULES = lang/tcl x11/tk
> > +MODULES = x11/tk
> >
> > LIB_DEPENDS-main = sysutils/libisofs \
> > sysutils/libburn
> >
>
> Makes sense, but how about making tk.port.mk more robust against this
> as well?
>
> Index: tk.port.mk
> ===
> RCS file: /cvs/ports/x11/tk/tk.port.mk,v
> retrieving revision 1.12
> diff -u -p -r1.12 tk.port.mk
> --- tk.port.mk2 Feb 2013 11:18:28 - 1.12
> +++ tk.port.mk24 Jul 2018 21:52:32 -
> @@ -24,7 +24,9 @@ MODTK_CONFIG ?= ${MODTK_LIBDIR}/tkConfi
>
> SUBST_VARS +=MODTK_VERSION MODTK_BIN
>
> +.if !${MODULES:Mlang/tcl}
> MODULES += lang/tcl
> +.endif
>
> MODTK_BUILD_DEPENDS ?= ${_MODTK_SPEC}:x11/tk/${MODTK_VERSION} \
> ${MODTCL_BUILD_DEPENDS}
>
>
Re: lang/ruby/2.3 and tcl/tk
Yes, you're right, my mistake.
This is fine, nothing needs to change.
Thanks!
Stu
> -- Original Message --
> From: Jeremy Evans
> Date: July 24, 2018 at 2:19 PM
>
>
> On 07/24 01:59, Stuart Cassoff wrote:
> > Hi,
> >
> > The dependency information for Tcl/Tk is incomplete;
> > the port as it is would break if the ports Tcl/Tk version were bumped to
> > 8.6.
> >
> > OK?
>
> If tk >=8.5,<8.6 requires tcl >=8.5,<8.6, I'm not sure why this is
> needed, but I don't have a problem with adding it.
>
> You'll have to bump REVISION-tk as well, but after that OK jeremy@.
>
> Thanks,
> Jeremy
>
> >
> > Stu
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/ruby/2.3/Makefile,v
> > retrieving revision 1.25
> > diff -u -p -u -p -r1.25 Makefile
> > --- Makefile31 Mar 2018 21:12:45 - 1.25
> > +++ Makefile24 Jul 2018 17:56:25 -
> > @@ -26,6 +26,7 @@ CONFIGURE_ARGS+= --with-tcl-include=${LO
> > --with-X11-dir=${X11BASE}
> > WANTLIB-tk = X11 c gmp m pthread ruby${BINREV} tcl85 tk85
> > LIB_DEPENDS-tk = tk->=8.5,<8.6:x11/tk/8.5 \
> > + tcl->=8.5,<8.6:lang/tcl/8.5 \
> > devel/gmp \
> > lang/ruby/${REV},-main>=${VERSION},<${NEXTVER}
> > RUN_DEPENDS-tk =
lang/ruby/2.3 and tcl/tk
Hi,
The dependency information for Tcl/Tk is incomplete;
the port as it is would break if the ports Tcl/Tk version were bumped to 8.6.
OK?
Stu
Index: Makefile
===
RCS file: /cvs/ports/lang/ruby/2.3/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile31 Mar 2018 21:12:45 - 1.25
+++ Makefile24 Jul 2018 17:56:25 -
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+= --with-tcl-include=${LO
--with-X11-dir=${X11BASE}
WANTLIB-tk = X11 c gmp m pthread ruby${BINREV} tcl85 tk85
LIB_DEPENDS-tk = tk->=8.5,<8.6:x11/tk/8.5 \
+ tcl->=8.5,<8.6:lang/tcl/8.5 \
devel/gmp \
lang/ruby/${REV},-main>=${VERSION},<${NEXTVER}
RUN_DEPENDS-tk =
MODULES= lang/tcl or x11/tk but not both
Only one is needed. Having both can cause problems.
I found 2 ports (lang/pypy, systutils/libisoburn) with this problem, which can
be seen:
$ cd /usr/ports/sysutils/libisoburn/ && make show=MODULES
lang/tcl x11/tk gnu lang/tcl
If MODULES=x11/tk then lang/tcl will be automatically added at the end.
A port with "MODULES = lang/tcl x11/tk" and "MODTK_VERSION=8.5"
will break if the default ports Tcl/Tk is 8.6
Using "MODULES=x11/tk" and "MODTK_VERSION=8.5" would be sufficient.
OK?
Stu
Index: Makefile
===
RCS file: /cvs/ports/lang/pypy/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile15 Dec 2017 16:47:34 - 1.30
+++ Makefile24 Jul 2018 16:19:50 -
@@ -55,7 +55,7 @@ DISTFILES += ${BOOTSTRAP-${MACHINE_ARCH
# if adding archs, list *all* bootstraps in SUPDISTFILES
SUPDISTFILES = ${BOOTSTRAP-amd64}:0
-MODULES += lang/python lang/tcl x11/tk
+MODULES += lang/python x11/tk
MODPY_VERSION =2.7
COMPILER = base-clang ports-gcc
Index: Makefile
===
RCS file: /cvs/ports/sysutils/libisoburn/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile19 Dec 2017 20:20:44 - 1.1.1.1
+++ Makefile24 Jul 2018 16:20:35 -
@@ -22,7 +22,7 @@ MASTER_SITES =http://files.libburnia-pr
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-MODULES = lang/tcl x11/tk
+MODULES = x11/tk
LIB_DEPENDS-main = sysutils/libisofs \
sysutils/libburn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/07/21 19:49:25 Modified files: x11/tk : tk.port.mk Log message: Remove reference to Tcl 8.4.
Change default Tcl to 8.6
Tcl extensions built with 8.5 can be used with 8.6. I've gone over the Makefiles, PLISTs, patches, and files of the ports listed. Attached is a tarball with a diff and a copy of the list. I tried to keep to the style of each Makefile. 6's are ports moved to 8.6. A few have comments. 5's are ports that for now are staying at 8.5 for reasons. Reasons are comma-separated lists of ports (dependencies), files (something in them), or comments why the port remained at 8.5. I'm unsure of some ports due to either dependencies or suspicions (python). Itcl/Itk are old and need Tcl's "internal" includes. I have ports in progress for the newer versions that use 8.6. When Itcl/Itk move to 8.6 a few more can follow. I haven't built anything yet! I'll be starting on i386 and amd64 in about 1/2 day. Ports upgraded are ports I'm confident will be ok, or I highly suspect will be ok. Any port not working can simply be slammed back down to 8.5. Many of these ports aren't mine, so I'm not sure how to proceed. Stu 5 audio/snack devel/itcl 5 cad/pcb cad/pcb/patch/configure 5 comms/hamlib unsure 5 databases/redis unsure 5 databases/sqlite old,unsure 5 devel/itclold,needs internal #includes 5 devel/ltcltk unchanged 5 devel/swigunsure 5 devel/tclcl old,unsure,net/ns,net/nam 5 devel/tcllib needed by many 5 devel/tklib needed by many 5 devel/vtclold,new 8.6 version exists, can be updated later 5 graphics/tkimgdevel/itcl 5 graphics/tkpngdevel/itcl 5 lang/expect unsure,threads problems? 5 lang/otcl old,unsure,net/ns,net/nam 5 lang/pypy unsure 5 lang/ruby/2.3 lang/ruby/2.3/Makefile 5 math/graphviz unsure 5 misc/WordGeneratorx11/iwidgets 5 misc/memchan net/coccinella,devel/itcl 5 net/coccinelladevel/itcl 5 net/nam old,devel/tclcl,lang/otcl,net/ns 5 net/nsold,devel/tclcl,lang/otcl,net/nam 5 net/tcludpnet/coccinella,devel/itcl 5 print/texlive/texmf unsure 5 security/tcltls net/coccinella,devel/itcl 5 sysutils/findlib unsure,devel/cil,devel/coccinelle 5 telephony/iaxclient unsure 5 textproc/catdoc unsure,devel/kf5/kfilemetadata,-main,mail/kopano/core,-main 5 x11/byzi only needed in 8.5 5 x11/itk devel/itcl 5 x11/iwidgets devel/itcl,x11/itk 5 x11/ruby-tk x11/ruby-tk/Makefile 5 x11/tkdnd net/coccinella,devel/itcl 5 x11/tkhtmlnet/coccinella,devel/itcl 5 x11/tktraynet/coccinella,devel/itcl 5 x11/tktreectrlnet/coccinella,devel/itcl 6 audio/xcd 6 cad/tkgate 6 cad/xcircuit 6 comms/tkhylafax 6 databases/pgtcl 6 databases/sqlite3-tcl 6 devel/fossil 6 devel/git 6 devel/mercurial 6 devel/nagelfar 6 devel/p5-Tcl 6 devel/tclarc4random 6 devel/tkcvs 6 devel/tkdiff 6 emulators/frodo 6 emulators/openmsx 6 geo/gpsbabel 6 graphics/colorexplorer 6 graphics/gocr 6 lang/eltclsh 6 lang/jimtcl 6 lang/obc 6 lang/tcltutor 6 mail/exmh2 6 math/R 6 math/maxima 6 misc/cbb 6 misc/impress 6 misc/remind 6 misc/tkcron 6 misc/tkinfo 6 misc/tkman 6 misc/wordnet 6 net/climm 6 net/netinfo 6 net/ssvnc 6 net/tcl-snmptools -pthread still needed? 6 net/tclcurl -pthread still needed? 6 net/tkabber/base 6 net/tkirc 6 net/weechat REVISION-tcl ok? 6 productivity/sl 6 security/password-gorilla 6 security/tclgpg 6 sysutils/libisoburn REVISION-tcltk ok? 6 sysutils/tkdvd 6 textproc/TclXML 6 textproc/boust 6 x11/dbus-intf 6 x11/dbus-tcl 6 x11/p5-Tkx 6 x11/tkcon 6 x11/tktable 6 x11/x11vnc 6 x11/xbindkeys uptcl86.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/07/20 15:31:15 Modified files: lang/tcl : tcl.port.mk Log message: Remove reference to Tcl 8.4.
Re: troubles building devel/avr
Oh that I know about. It's the annoying thing that makes 'make plist' take so long now. :D I didn't think about just using it from the command line, which is handy. Stu > -- Original Message -- > From: Rafael Sadowski > Date: July 19, 2018 at 11:49 AM > > > On Thu Jul 19, 2018 at 11:13:51AM -0400, Stuart Cassoff wrote: > > Wow, cool tool! > > How long has pkglocate been around? > > Why didn't anybody tell me? > > > https://marc.info/?l=openbsd-ports-cvs=152587428913413=2 > https://marc.info/?l=openbsd-ports=153020995203980=2 > > have fun ;) > > > > > Stu > > > -- Original Message -- > > > From: Marc Espie > > > Date: July 19, 2018 at 11:00 AM > > > > > > > > > On Thu, Jul 19, 2018 at 04:15:43PM +0200, Grégoire Jadi wrote: > > > > Hello ports@, > > > > > > > > I have troubles building gcc and gdb from devel/avr. avr-binutils and > > > > avr-libc build fine. I have two boxes: one running the latest snapshot > > > > and one following -current from sources. I encounter the same problem on > > > > both boxes. > > > > > > > > # gcc > > > > > > > > I manage to build avr-gcc by removing `-I /usr/local/include' from the > > > > CFLAGS. > > > > > > > > libiberty includes "ansidecl.h". Because of the -I command, it picked > > > > the one from /usr/local/include instead of the one bundled with gcc and > > > > they differ a lot. /usr/local/include/ansidecl.h has no macros PARAMS, > > > > VA_OPEN, etc. > > > > > > > > I don't understand why the -I command is used but I also don't > > > > understand why it didn't work for me though someone™ is clearly building > > > > the binary packages for pkg_add... > > > > > > pkglocate ansidecl.h > > > will tell you it comes from the gdb port. > > > > > > maybe the guys who built the package didn't have it installed on their > > > system ? Not that surprising... considering it's not a hugely frequent > > > dependency. sqlports gives me only qt-creator, ocaml, rust, and gnustep's > > > projectcenter. > > > > > > Anyway, it's a bug. If you can provide a patch, that will help. > > > > > > > > > > - Did I messed up my installations and have the wrong ansidecl.h file? > > > > - Do package builders use a different configuration than the Makefile in > > > > ports? (I've never tried dpb(1)) > > > > > > You should :) > > > > > > package builders start builds on clean systems. Personally, I do > > > everything > > > in a separate chroot, and dpb periodically removes dependencies (because > > > otherwise, it would overflow about everything). > > > > > > You actually *don't* have an ansidecl.h file on a base system. Certainly > > > not under /usr/local. > > > > > > > > > > # gdb > > > > > > > > gdb-6.8.tar.gz cannot be found on any GNU mirrors (the closer is > > > > gdb-6.8a.tar.gz). And the fallback on OpenBSD distfiles fails too > > > > because it tries to fetch distfiles/gdb/gdb/gdb-6.8.tar.gz instead of > > > > distfiles/gdb/gdb-6.8.tar.gz (two /gdb/ is too much). > > > > > > Nope, not any more. You're not -current. About one week behind, I > > > believe. > > > > > > > Hardcoding MASTER_SITES to > > > > https://ftp.openbsd.org/pub/OpenBSD/distfiles/gdb/ did the trick. > > > > > > > > But again, how can the packages be built if the URLs fails? > > > > > > People did grab the distfiles before it vanished. > > > > > > > > > > > So, what am I doing wrong? Did I miss some configuration steps or > > > > misread some documentation? > > > > > > You are missing quite a few clues, yes. > > > > > > New to OpenBSD ?... > > > > > >
Re: troubles building devel/avr
Wow, cool tool! How long has pkglocate been around? Why didn't anybody tell me? Stu > -- Original Message -- > From: Marc Espie > Date: July 19, 2018 at 11:00 AM > > > On Thu, Jul 19, 2018 at 04:15:43PM +0200, Grégoire Jadi wrote: > > Hello ports@, > > > > I have troubles building gcc and gdb from devel/avr. avr-binutils and > > avr-libc build fine. I have two boxes: one running the latest snapshot > > and one following -current from sources. I encounter the same problem on > > both boxes. > > > > # gcc > > > > I manage to build avr-gcc by removing `-I /usr/local/include' from the > > CFLAGS. > > > > libiberty includes "ansidecl.h". Because of the -I command, it picked > > the one from /usr/local/include instead of the one bundled with gcc and > > they differ a lot. /usr/local/include/ansidecl.h has no macros PARAMS, > > VA_OPEN, etc. > > > > I don't understand why the -I command is used but I also don't > > understand why it didn't work for me though someone™ is clearly building > > the binary packages for pkg_add... > > pkglocate ansidecl.h > will tell you it comes from the gdb port. > > maybe the guys who built the package didn't have it installed on their > system ? Not that surprising... considering it's not a hugely frequent > dependency. sqlports gives me only qt-creator, ocaml, rust, and gnustep's > projectcenter. > > Anyway, it's a bug. If you can provide a patch, that will help. > > > > - Did I messed up my installations and have the wrong ansidecl.h file? > > - Do package builders use a different configuration than the Makefile in > > ports? (I've never tried dpb(1)) > > You should :) > > package builders start builds on clean systems. Personally, I do everything > in a separate chroot, and dpb periodically removes dependencies (because > otherwise, it would overflow about everything). > > You actually *don't* have an ansidecl.h file on a base system. Certainly > not under /usr/local. > > > > # gdb > > > > gdb-6.8.tar.gz cannot be found on any GNU mirrors (the closer is > > gdb-6.8a.tar.gz). And the fallback on OpenBSD distfiles fails too > > because it tries to fetch distfiles/gdb/gdb/gdb-6.8.tar.gz instead of > > distfiles/gdb/gdb-6.8.tar.gz (two /gdb/ is too much). > > Nope, not any more. You're not -current. About one week behind, I believe. > > > Hardcoding MASTER_SITES to > > https://ftp.openbsd.org/pub/OpenBSD/distfiles/gdb/ did the trick. > > > > But again, how can the packages be built if the URLs fails? > > People did grab the distfiles before it vanished. > > > > > So, what am I doing wrong? Did I miss some configuration steps or > > misread some documentation? > > You are missing quite a few clues, yes. > > New to OpenBSD ?... >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/06/25 17:13:57 Modified files: x11/dbus-intf : Makefile distinfo Removed files: x11/dbus-intf/patches: patch-Makefile_in Log message: Update to 1.3.
