[pkgsrc/trunk]: pkgsrc/lang/tcl-itcl - Rename tabset.n and watch.n to avoid c...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/tcl-itcl - Rename tabset.n and watch.n to avoid c...
From: minskim <minskim%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:05:38 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb6ce2d91b12
branches:  trunk
changeset: 475243:eb6ce2d91b12
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed May 12 23:38:35 2004 +0000

description:
- Rename tabset.n and watch.n to avoid conflicts with x11/blt.
- Bl3ify.
   Tcl/Tk distfiles are not needed any more.  Installed header files are
   used instead.
- Enable pkgviews installation.

Bump PKGREVISION due to PLIST changes.

diffstat:

 lang/tcl-itcl/Makefile         |  34 +++++++++++++++++-----------------
 lang/tcl-itcl/PLIST            |   6 +++---
 lang/tcl-itcl/buildlink3.mk    |  21 +++++++++++++++++++++
 lang/tcl-itcl/distinfo         |  10 +++++-----
 lang/tcl-itcl/patches/patch-aa |  19 ++++++++++++++-----
 lang/tcl-itcl/patches/patch-ac |  21 +++++++++++++++------
 lang/tcl-itcl/patches/patch-ag |  13 ++++++++-----
 lang/tcl-itcl/patches/patch-ah |  13 ++++++++-----
 8 files changed, 91 insertions(+), 46 deletions(-)

diffs (279 lines):

diff -r 54d000a4c87b -r eb6ce2d91b12 lang/tcl-itcl/Makefile
--- a/lang/tcl-itcl/Makefile    Wed May 12 23:38:34 2004 +0000
+++ b/lang/tcl-itcl/Makefile    Wed May 12 23:38:35 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/03/08 20:27:14 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/12 23:38:35 minskim Exp $
 
 DISTNAME=      itcl3.2
 PKGNAME=       tcl-itcl-3.2
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ftp://ftp.scriptics.com/pub/tcl/itcl/
 
@@ -9,34 +10,33 @@
 HOMEPAGE=      http://tcltk.com/itcl/
 COMMENT=       [incr Tcl] object-oriented extension to Tcl/Tk
 
-USE_BUILDLINK2=        yes
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=        yes
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-CONFIGURE_ARGS= --enable-shared
+CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
+               --with-tk=${BUILDLINK_PREFIX.tk}/lib    \
+               --enable-shared
 
-CONFIGURE_ENV+=        TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4"
-CONFIGURE_ENV+=        TK_SRC_DIR="${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4"
+MAKE_ENV+=     TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl
 
 post-extract:
        @${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/dialog.n                  \
                ${WRKSRC}/iwidgets3.0.0/doc/itcldialog.n
        @${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/menubar.n                 \
                ${WRKSRC}/iwidgets3.0.0/doc/itclmenubar.n
+       @${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/tabset.n                  \
+               ${WRKSRC}/iwidgets3.0.0/doc/itcltabset.n
+       @${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/watch.n                   \
+               ${WRKSRC}/iwidgets3.0.0/doc/itclwatch.n
        @${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/dialog.n                  \
                ${WRKSRC}/iwidgets2.2.0/doc/itcldialog.n
        @${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/menubar.n                 \
                ${WRKSRC}/iwidgets2.2.0/doc/itclmenubar.n
-       @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then  \
-               cd ../../lang/tcl83 && ${MAKE} extract;                 \
-       fi
-       @if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4 ]; then     \
-               cd ../../x11/tk83 && ${MAKE} extract;                   \
-       fi
+       @${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/tabset.n                  \
+               ${WRKSRC}/iwidgets2.2.0/doc/itcltabset.n
 
-pre-clean:
-       @cd ../../lang/tcl83 && ${MAKE} clean
-       @cd ../../x11/tk83 && ${MAKE} clean
-
-.include "../../lang/tcl83/buildlink2.mk"
-.include "../../x11/tk83/buildlink2.mk"
+.include "../../lang/tcl83/buildlink3.mk"
+.include "../../x11/tk83/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 54d000a4c87b -r eb6ce2d91b12 lang/tcl-itcl/PLIST
--- a/lang/tcl-itcl/PLIST       Wed May 12 23:38:34 2004 +0000
+++ b/lang/tcl-itcl/PLIST       Wed May 12 23:38:35 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/25 09:13:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/12 23:38:35 minskim Exp $
 include/itcl.h
 include/itclDecls.h
 include/itclInt.h
@@ -378,7 +378,7 @@
 man/mann/scrolledcanvas.n
 man/mann/scrolledframe.n
 man/mann/scrolledhtml.n
-man/mann/watch.n
+man/mann/itclwatch.n
 man/mann/scrolledlistbox.n
 man/mann/scrolledtext.n
 man/mann/selectionbox.n
@@ -388,7 +388,7 @@
 man/mann/spinner.n
 man/mann/spintime.n
 man/mann/tabnotebook.n
-man/mann/tabset.n
+man/mann/itcltabset.n
 man/mann/toolbar.n
 man/mann/calendar.n
 man/mann/checkbox.n
diff -r 54d000a4c87b -r eb6ce2d91b12 lang/tcl-itcl/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/tcl-itcl/buildlink3.mk       Wed May 12 23:38:35 2004 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/12 23:38:35 minskim Exp $
+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+TCL_ITCL_BUILDLINK3_MK:=       ${TCL_ITCL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    tcl-itcl
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Ntcl-itcl}
+BUILDLINK_PACKAGES+=   tcl-itcl
+
+.if !empty(TCL_ITCL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tcl-itcl+=   tcl-itcl>=3.2
+BUILDLINK_PKGSRCDIR.tcl-itcl?= ../../lang/tcl-itcl
+.endif # TCL_ITCL_BUILDLINK3_MK
+
+.include "../../lang/tcl83/buildlink3.mk"
+.include "../../x11/tk83/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 54d000a4c87b -r eb6ce2d91b12 lang/tcl-itcl/distinfo
--- a/lang/tcl-itcl/distinfo    Wed May 12 23:38:34 2004 +0000
+++ b/lang/tcl-itcl/distinfo    Wed May 12 23:38:35 2004 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2001/05/01 16:13:53 jtb Exp $
+$NetBSD: distinfo,v 1.4 2004/05/12 23:38:35 minskim Exp $
 
 SHA1 (itcl3.2.tar.gz) = 9e51a309414d4894f2bc7b33a1c44b51c7e1dbd5
 Size (itcl3.2.tar.gz) = 1498517 bytes
-SHA1 (patch-aa) = 82510e7a39fd024ba9c24e8279744ad4be65f60e
+SHA1 (patch-aa) = eb96c474ecb44129eba14434e9553def093b4128
 SHA1 (patch-ab) = 4644c9e271a37502fbd51477340a47f4d0ecf8fe
-SHA1 (patch-ac) = 79bdcaf01a21837fab22c23662e83a11d1bbe7d4
+SHA1 (patch-ac) = ae91e2aefe7d8c3ab3d000b8e1d2405aebc046d6
 SHA1 (patch-ad) = 2f61ebe7d8c4062426d1a79d93ef544b0b46c856
 SHA1 (patch-ae) = e7ebc0443bc4fae29ce67909d8e35e9f65a0ef69
 SHA1 (patch-af) = ca6609bd91fb3e94ec637d50568e5116b83c870a
-SHA1 (patch-ag) = ad0e4ca59e3b28e49993b8962f583ecbe8f00947
-SHA1 (patch-ah) = c4b91a82bdbcdd4b2096840a57739aa3263b6a51
+SHA1 (patch-ag) = 5b21951b82de53875efd5289dd87abae8bb11073
+SHA1 (patch-ah) = 58985a1b21625fc00dbbfe4e793dcbb2f7ef2929
diff -r 54d000a4c87b -r eb6ce2d91b12 lang/tcl-itcl/patches/patch-aa
--- a/lang/tcl-itcl/patches/patch-aa    Wed May 12 23:38:34 2004 +0000
+++ b/lang/tcl-itcl/patches/patch-aa    Wed May 12 23:38:35 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/05/01 16:13:54 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/12 23:38:35 minskim Exp $
 
---- itcl/configure.orig        Tue Aug 29 03:58:00 2000
+--- itcl/configure.orig        2000-08-28 22:58:00.000000000 -0500
 +++ itcl/configure
-@@ -1119,7 +1119,7 @@
+@@ -1119,7 +1119,7 @@ case "`uname -s`" in
      ;;
      *)
        CYGPATH=echo
@@ -11,7 +11,16 @@
      ;;
  esac
  
-@@ -1575,12 +1575,12 @@
+@@ -1303,7 +1303,7 @@ echo "configure:1293: checking for Tcl p
+           TCL_PLATFORM_DIR_NATIVE=${TCL_WIN_DIR_NATIVE}
+       ;;
+       *)
+-          TCL_TOP_DIR_NATIVE='$(TCL_SRC_DIR)'
++          TCL_TOP_DIR_NATIVE='$(TCL_HEADER_DIR)'
+           TCL_GENERIC_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/generic'
+           TCL_UNIX_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/unix'
+           TCL_WIN_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/win'
+@@ -1575,12 +1575,12 @@ fi
  # link against the non-stubbed Tcl library.
  #--------------------------------------------------------------------
  
@@ -29,7 +38,7 @@
  
  #--------------------------------------------------------------------
  # This macro generates a line to use when building a library.  It
-@@ -1598,7 +1598,7 @@
+@@ -1598,7 +1598,7 @@ fi
            ;;
        *)
            MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)"
diff -r 54d000a4c87b -r eb6ce2d91b12 lang/tcl-itcl/patches/patch-ac
--- a/lang/tcl-itcl/patches/patch-ac    Wed May 12 23:38:34 2004 +0000
+++ b/lang/tcl-itcl/patches/patch-ac    Wed May 12 23:38:35 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2001/05/01 16:13:54 jtb Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/12 23:38:35 minskim Exp $
 
---- itk/configure.orig Tue Aug 29 03:58:00 2000
+--- itk/configure.orig 2000-08-28 22:58:00.000000000 -0500
 +++ itk/configure
-@@ -1119,7 +1119,7 @@
+@@ -1119,7 +1119,7 @@ case "`uname -s`" in
      ;;
      *)
        CYGPATH=echo
@@ -11,7 +11,16 @@
      ;;
  esac
  
-@@ -1871,20 +1871,20 @@
+@@ -1564,7 +1564,7 @@ echo "configure:1554: checking for Tcl p
+           TCL_PLATFORM_DIR_NATIVE=${TCL_WIN_DIR_NATIVE}
+       ;;
+       *)
+-          TCL_TOP_DIR_NATIVE='$(TCL_SRC_DIR)'
++          TCL_TOP_DIR_NATIVE='$(TCL_HEADER_DIR)'
+           TCL_GENERIC_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/generic'
+           TCL_UNIX_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/unix'
+           TCL_WIN_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/win'
+@@ -1871,20 +1871,20 @@ fi
  # link against the non-stubbed Tcl library.
  #--------------------------------------------------------------------
  
@@ -45,7 +54,7 @@
  
  #--------------------------------------------------------------------
  # This macro generates a line to use when building a library.  It
-@@ -1902,7 +1902,7 @@
+@@ -1902,7 +1902,7 @@ fi
            ;;
        *)
            MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)"
@@ -54,7 +63,7 @@
            ;;
      esac
  
-@@ -1941,7 +1941,7 @@
+@@ -1941,7 +1941,7 @@ case "`uname -s`" in
        ;;
      *)
        if test "${SHARED_BUILD}" = "1" ; then
diff -r 54d000a4c87b -r eb6ce2d91b12 lang/tcl-itcl/patches/patch-ag
--- a/lang/tcl-itcl/patches/patch-ag    Wed May 12 23:38:34 2004 +0000
+++ b/lang/tcl-itcl/patches/patch-ag    Wed May 12 23:38:35 2004 +0000
@@ -1,13 +1,16 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $
+$NetBSD: patch-ag,v 1.2 2004/05/12 23:38:35 minskim Exp $
 
---- itcl/generic/itcl_cmds.c.orig      Tue Aug 29 15:58:00 2000
-+++ itcl/generic/itcl_cmds.c   Fri Nov 10 01:24:15 2000
-@@ -62,7 +62,7 @@
+--- itcl/generic/itcl_cmds.c.orig      2000-08-28 22:58:00.000000000 -0500
++++ itcl/generic/itcl_cmds.c
+@@ -62,9 +62,9 @@ namespace eval ::itcl {\n\
              if {[info exists env(ITCL_LIBRARY)]} {\n\
                  lappend dirs $env(ITCL_LIBRARY)\n\
              }\n\
 -            lappend dirs [file join [file dirname $tcl_library] itcl$version]\n\
 +            lappend dirs [file join [file dirname $tcl_library] tcl itcl$version]\n\
              set bindir [file dirname [info nameofexecutable]]\n\
-             lappend dirs [file join $bindir .. lib itcl$version]\n\
+-            lappend dirs [file join $bindir .. lib itcl$version]\n\
++            lappend dirs [file join $bindir .. lib tcl itcl$version]\n\
              lappend dirs [file join $bindir .. library]\n\
+             lappend dirs [file join $bindir .. .. library]\n\
+             lappend dirs [file join $bindir .. .. itcl library]\n\
diff -r 54d000a4c87b -r eb6ce2d91b12 lang/tcl-itcl/patches/patch-ah
--- a/lang/tcl-itcl/patches/patch-ah    Wed May 12 23:38:34 2004 +0000
+++ b/lang/tcl-itcl/patches/patch-ah    Wed May 12 23:38:35 2004 +0000
@@ -1,13 +1,16 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $
+$NetBSD: patch-ah,v 1.2 2004/05/12 23:38:35 minskim Exp $
 
---- itk/generic/itk_cmds.c.orig        Tue Aug 29 15:58:00 2000
-+++ itk/generic/itk_cmds.c     Fri Nov 10 01:30:43 2000
-@@ -55,7 +55,7 @@
+--- itk/generic/itk_cmds.c.orig        2000-08-28 22:58:00.000000000 -0500
++++ itk/generic/itk_cmds.c
+@@ -55,9 +55,9 @@ namespace eval ::itk {\n\
              if {[info exists env(ITK_LIBRARY)]} {\n\
                  lappend dirs $env(ITK_LIBRARY)\n\
              }\n\
 -            lappend dirs [file join [file dirname $tcl_library] itk$version]\n\
 +            lappend dirs [file join [file dirname $tcl_library] tcl itk$version]\n\
              set bindir [file dirname [info nameofexecutable]]\n\
-             lappend dirs [file join $bindir .. lib itk$version]\n\
+-            lappend dirs [file join $bindir .. lib itk$version]\n\
++            lappend dirs [file join $bindir .. lib tcl itk$version]\n\
              lappend dirs [file join $bindir .. library]\n\
+             lappend dirs [file join $bindir .. .. library]\n\
+             lappend dirs [file join $bindir .. .. itk library]\n\
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/courier-auth Do not use install-strip target sinc...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/tcl Install regex.h, which is used in tclRegexp.h.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/courier-auth Do not use install-strip target sinc...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/tcl Install regex.h, which is used in tclRegexp.h.
Indexes:
Home | Main Index | Thread Index | Old Index