From 4517e253e52af792847e88fdb51bca055fc1e34e Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Mon, 21 Apr 2025 12:42:36 +0200 Subject: [PATCH] x11-toolkits/iwidgets: upgrade to 4.1.1 and correct licence license.terms says: Permission to use, copy, modify, distribute and license this software and its documentation for any purpose, and without fee or written agreement with DSC, is hereby granted, provided that the above copyright notice appears in all copies and that both the copyright notice and warranty disclaimer below appear in supporting documentation, and that the names of DSC Technologies Corporation or DSC Communications Corporation not be used in advertising or publicity pertaining to the software without specific, written prior permission. Therefore it is packageable. PR: 286265 Approved by: Chris Hutchinson (maintainer) --- x11-toolkits/iwidgets/Makefile | 21 +- x11-toolkits/iwidgets/distinfo | 7 +- x11-toolkits/iwidgets/files/patch-Makefile.in | 37 -- x11-toolkits/iwidgets/files/patch-configure | 54 +++ x11-toolkits/iwidgets/files/patch-noitcl | 12 - x11-toolkits/iwidgets/files/pkg-message.in | 2 +- x11-toolkits/iwidgets/pkg-plist | 382 +++++++++--------- 7 files changed, 258 insertions(+), 257 deletions(-) delete mode 100644 x11-toolkits/iwidgets/files/patch-Makefile.in create mode 100644 x11-toolkits/iwidgets/files/patch-configure delete mode 100644 x11-toolkits/iwidgets/files/patch-noitcl diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile index 0a599c904895..4c136bc455bb 100644 --- a/x11-toolkits/iwidgets/Makefile +++ b/x11-toolkits/iwidgets/Makefile @@ -1,9 +1,7 @@ PORTNAME= iwidgets -PORTVERSION= 4.0.1 -PORTREVISION= 2 +PORTVERSION= 4.1.1 CATEGORIES= x11-toolkits tk MASTER_SITES= SF/incrtcl/%5BIncr%20Widgets%5D/${PORTVERSION} -DISTNAME= iwidgets${PORTVERSION} MAINTAINER= portmaster@bsdforge.com COMMENT= Iwidgets - [incr Widgets] companion to [incr Tk] @@ -12,33 +10,32 @@ WWW= https://sourceforge.net/projects/incrtcl/ LICENSE= DTSTECH LICENSE_NAME= DTSTECH LICENSE_FILE= ${WRKSRC}/license.terms -LICENSE_PERMS= auto-accept +LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell LIB_DEPENDS= libitk.so:x11-toolkits/itk NO_BUILD= yes USES= tk:tea -CONFIGURE_ARGS= --with-itcl=${LOCALBASE} -SUB_LIST= IWIDGETS=${DISTNAME} +CONFIGURE_ARGS= --with-itcl=${LOCALBASE}/lib/itcl${ITCLVER} \ + --with-itk=${LOCALBASE}/lib/itk${ITCLVER} +ITCLVER= 3.4 +SUB_LIST= IWIDGETS=${TCL_PKG} SUB_FILES= pkg-message -PLIST_SUB= IWIDGETS=${DISTNAME} MAKE_ARGS+= INSTALL_ROOT=${STAGEDIR} PORTDOCS= CHANGES ChangeLog README iwidgets.ps OPTIONS_DEFINE= DOCS -.include - post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/iwidgets - ${LN} -s ${DISTNAME} ${STAGEDIR}${PREFIX}/lib/iwidgets -.if ${PORT_OPTIONS:MDOCS} + ${LN} -s ${TCL_PKG} ${STAGEDIR}${PREFIX}/lib/iwidgets + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/iwidgets.ps ${STAGEDIR}${DOCSDIR} .for f in CHANGES ChangeLog README ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/x11-toolkits/iwidgets/distinfo b/x11-toolkits/iwidgets/distinfo index 148d491492ec..5bc6b78482ee 100644 --- a/x11-toolkits/iwidgets/distinfo +++ b/x11-toolkits/iwidgets/distinfo @@ -1,4 +1,3 @@ -SHA256 (itcl3.2.1_src.tgz) = 9a225564fc94beef4cc0e627a368d9d2b4425c58b93d5a787c9836d6cceed2ad -SIZE (itcl3.2.1_src.tgz) = 427026 -SHA256 (iwidgets4.0.1.tar.gz) = b0e9cb74370f863e17a05df81fd70af3a39a1cfb733181c61669b30ad7799426 -SIZE (iwidgets4.0.1.tar.gz) = 647960 +TIMESTAMP = 1745225981 +SHA256 (iwidgets-4.1.1.tar.gz) = 572fd8eed70786b1fbff6e7fec62eab7bd731beea074022d1b5a480ecf2df586 +SIZE (iwidgets-4.1.1.tar.gz) = 720630 diff --git a/x11-toolkits/iwidgets/files/patch-Makefile.in b/x11-toolkits/iwidgets/files/patch-Makefile.in deleted file mode 100644 index 24d05260cee8..000000000000 --- a/x11-toolkits/iwidgets/files/patch-Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ ---- Makefile.in.orig 2024-02-27 13:21:17 UTC -+++ ./Makefile.in -@@ -9,7 +9,7 @@ - - # Current [incr Widgets] version; used in various names. - --ITCL_VERSION = @ITCL_VERSION@ -+ITCL_VERSION = 3.3 - IWIDGETS_VERSION = @VERSION@ - - #---------------------------------------------------------------- -@@ -48,7 +48,7 @@ - BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin - - # Top-level directory in which to install manual entries: --MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann -+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/share/man/mann - - # Directory containing Tcl source code (for library used during test): - TCL_SRC_DIR = @TCL_SRC_DIR@ -@@ -78,11 +78,11 @@ - # modify any of this stuff by hand. - #---------------------------------------------------------------- - --INSTALL = $(TCLSH_PROG) `$(CYGPATH) $(ITCL_SRC_DIR)/../config/installFile.tcl` -c --INSTALL_PROGRAM = $(INSTALL) --INSTALL_DATA = $(INSTALL) -m 644 --INSTALL_SCRIPT = $(INSTALL) -m 555 --MKINSTALLDIRS = $(ITCL_SRC_DIR)/../config/mkinstalldirs -+INSTALL=install -c -+INSTALL_PROGRAM=install -s -m 555 -+INSTALL_DATA=install -m 0644 -+INSTALL_SCRIPT=install -m 555 -+MKINSTALLDIRS=/bin/mkdir -p - RANLIB = @RANLIB@ - LN_S = ln -s - TOP_DIR = $(srcdir) diff --git a/x11-toolkits/iwidgets/files/patch-configure b/x11-toolkits/iwidgets/files/patch-configure new file mode 100644 index 000000000000..4e4d99f9119c --- /dev/null +++ b/x11-toolkits/iwidgets/files/patch-configure @@ -0,0 +1,54 @@ +--- configure.orig 2018-03-22 16:21:09 UTC ++++ configure +@@ -2029,13 +2029,6 @@ fi + ITCL_LIB_DIR=$itcl_SRC_DIR/library + fi + +-if test -z "$ITCL_LIB_DIR"; then +- { { echo "$as_me:$LINENO: error: Can't find Itcl source. Use --with-itcl to specify the the toplevel incr Tcl directory on your system. This directory should contain library/itcl.tcl." >&5 +-echo "$as_me: error: Can't find Itcl source. Use --with-itcl to specify the the toplevel incr Tcl directory on your system. This directory should contain library/itcl.tcl." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- + # Check whether --with-itk or --without-itk was given. + if test "${with_itk+set}" = set; then + withval="$with_itk" +@@ -2045,8 +2038,8 @@ ITK_LIB_DIR="" + fi; + + ITK_LIB_DIR="" +-if test -r $itk_search/library/itk.tcl; then +- ITK_LIB_DIR=$itk_search/library ++if test -r $itk_search/itk.tcl; then ++ ITK_LIB_DIR=$itk_search + ITK_SRC_DIR=$itk_search + fi + +@@ -3617,26 +3610,6 @@ echo $ECHO_N "checking system version (for dynamic loa + system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` + else + system=`uname -s`-`uname -r` +- if test "$?" -ne 0 ; then +- echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5 +-echo "${ECHO_T}unknown (can't find uname command)" >&6 +- system=unknown +- else +- # Special check for weird MP-RAS system (uname returns weird +- # results, and the version is kept in special file). +- +- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print }' /etc/.relid'` +- fi +- if test "`uname -s`" = "AIX" ; then +- system=AIX-`uname -v`.`uname -r` +- fi +- if test "${TEA_PLATFORM}" = "windows" ; then +- system=windows +- fi +- echo "$as_me:$LINENO: result: $system" >&5 +-echo "${ECHO_T}$system" >&6 +- fi + fi + + # Step 2: check for existence of -ldl library. This is needed because diff --git a/x11-toolkits/iwidgets/files/patch-noitcl b/x11-toolkits/iwidgets/files/patch-noitcl deleted file mode 100644 index ae5db7228024..000000000000 --- a/x11-toolkits/iwidgets/files/patch-noitcl +++ /dev/null @@ -1,12 +0,0 @@ ---- configure Thu Nov 29 15:51:34 2001 -+++ configure Tue May 16 17:36:14 2006 -@@ -818,9 +818,4 @@ - fi - --if test -z "$ITCL_LIB_DIR"; then -- { echo "configure: error: Can't find Itcl source. Use --with-itcl to specify the the toplevel incr Tcl directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.)" 1>&2; exit 1; } --fi -- -- - #-------------------------------------------------------------------- - # Needed for running the test suite diff --git a/x11-toolkits/iwidgets/files/pkg-message.in b/x11-toolkits/iwidgets/files/pkg-message.in index 0541557ab6e5..66bd1dfe37b5 100644 --- a/x11-toolkits/iwidgets/files/pkg-message.in +++ b/x11-toolkits/iwidgets/files/pkg-message.in @@ -2,7 +2,7 @@ { type: install message: <