head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.2 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.4.0.24 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.22 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.20 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.18 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.16 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.14 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.12 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.10 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.8 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.6 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.4 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.2 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.3.0.38 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.36 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.34 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.32 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.22 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2013.01.07.13.28.30; author wiz; state dead; branches; next 1.4; 1.4 date 2010.02.11.13.44.02; author joerg; state Exp; branches 1.4.24.1; next 1.3; 1.3 date 2005.10.26.04.22.38; author minskim; state Exp; branches; next 1.2; 1.2 date 2001.05.01.16.13.54; author jtb; state Exp; branches; next 1.1; 1.1 date 2001.02.23.20.36.31; author jtb; state Exp; branches 1.1.1.1; next ; 1.4.24.1 date 2013.01.14.13.34.11; author tron; state dead; branches; next ; 1.1.1.1 date 2001.02.23.20.36.31; author jtb; state Exp; branches; next ; desc @@ 1.5 log @Remove unused patches (after 3.4.1 update) @ text @$NetBSD: patch-ad,v 1.4 2010/02/11 13:44:02 joerg Exp $ --- itk/Makefile.in.orig Tue Aug 29 03:58:00 2000 +++ itk/Makefile.in @@@@ -103,7 +103,7 @@@@ SAMPLE_NEW_VAR=@@SAMPLE_NEW_VAR@@ -ITK_LIBRARY = $(prefix)/lib/itk$(VERSION) +ITK_LIBRARY = ${DESTDIR}$(prefix)/lib/tcl/itk$(VERSION) ITK_GENERIC_DIR_NATIVE = @@ITK_GENERIC_DIR_NATIVE@@ ITK_UNIX_DIR_NATIVE = @@ITK_UNIX_DIR_NATIVE@@ @@@@ -138,16 +138,16 @@@@ DESTDIR = pkgdatadir = $(datadir)/@@PACKAGE@@@@VERSION@@ -pkglibdir = $(libdir)/@@PACKAGE@@@@VERSION@@ +pkglibdir = ${DESTDIR}$(libdir)/tcl/@@PACKAGE@@@@VERSION@@ pkgincludedir = $(includedir)/@@PACKAGE@@@@VERSION@@ top_builddir = . #INSTALL = $(top_srcdir)/../config/install-sh -c -INSTALL = $(TCLSH_PROG) `@@CYGPATH@@ $(top_srcdir)/../config/installFile.tcl` -c -INSTALL_PROGRAM = @@INSTALL_PROGRAM@@ -INSTALL_DATA = @@INSTALL_DATA@@ -INSTALL_SCRIPT = @@INSTALL_SCRIPT@@ +INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL} +INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} +INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} +INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT} INSTALL_STRIP_FLAG = transform = @@program_transform_name@@ @@@@ -160,7 +160,7 @@@@ PACKAGE = @@PACKAGE@@ VERSION = @@VERSION@@ -CC = @@CC@@ +CC = ${LIBTOOL} --mode=compile @@CC@@ CFLAGS_DEBUG = @@CFLAGS_DEBUG@@ CFLAGS_DEFAULT = @@CFLAGS_DEFAULT@@ CFLAGS_OPTIMIZE = @@CFLAGS_OPTIMIZE@@ @@@@ -175,9 +175,9 @@@@ OBJEXT = @@OBJEXT@@ RANLIB = @@RANLIB@@ SHLIB_CFLAGS = @@SHLIB_CFLAGS@@ -SHLIB_LD = @@SHLIB_LD@@ +SHLIB_LD = ${LIBTOOL} --mode=link @@CC@@ -rpath ${PREFIX}/lib SHLIB_LDFLAGS = @@SHLIB_LDFLAGS@@ -SHLIB_LD_LIBS = @@SHLIB_LD_LIBS@@ +SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk -ltcl -lX11 -lm STLIB_LD = @@STLIB_LD@@ TCL_BIN_DIR = @@TCL_BIN_DIR@@ TCL_DEFS = @@TCL_DEFS@@ @@@@ -225,7 +225,7 @@@@ AR = ar CFLAGS = @@CFLAGS@@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) +CCLD = ${LIBTOOL} --mode=link @@CC@@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@@ #======================================================================== @@@@ -314,12 +314,10 @@@@ $(itk_LIB_FILE): $(itk_OBJECTS) -rm -f $(itk_LIB_FILE) @@MAKE_LIB@@ - $(RANLIB) $(itk_LIB_FILE) $(itkstub_LIB_FILE): $(itkstub_OBJECTS) -rm -f $(itkstub_LIB_FILE) @@MAKE_STATIC_LIB@@ - $(RANLIB) $(itkstub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@@@ -394,7 +392,7 @@@@ #======================================================================== install-lib-binaries: installdirs - @@list='$(lib_BINARIES)'; for p in $$list; do \ + @@list='${itk_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \ if test -f $$p; then \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ @ 1.4 log @Fix some issues where DESTDIR ended up included twice... @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2005/10/26 04:22:38 minskim Exp $ @ 1.4.24.1 log @Pullup ticket #4016 - requested by wiz lang/tcl-itcl: build fix update Revisions pulled up: - cad/tnt-mmtl/Makefile 1.20 - lang/tcl-itcl/DESCR 1.3 - lang/tcl-itcl/Makefile 1.25 - lang/tcl-itcl/PLIST 1.7 - lang/tcl-itcl/buildlink3.mk 1.12 - lang/tcl-itcl/distinfo 1.10 - lang/tcl-itcl/patches/patch-aa deleted - lang/tcl-itcl/patches/patch-ab deleted - lang/tcl-itcl/patches/patch-ac deleted - lang/tcl-itcl/patches/patch-ad deleted - lang/tcl-itcl/patches/patch-ag deleted - lang/tcl-itcl/patches/patch-ah deleted - sysutils/tkdesk/Makefile 1.21 --- Module Name: pkgsrc Committed By: wiz Date: Mon Jan 7 13:26:41 UTC 2013 Modified Files: pkgsrc/lang/tcl-itcl: DESCR Makefile PLIST buildlink3.mk distinfo Log Message: Update to 3.4.1, based on othyro's package from wip. This version compiles with tcl-8.5. --- Module Name: pkgsrc Committed By: wiz Date: Mon Jan 7 13:27:04 UTC 2013 Modified Files: pkgsrc/cad/tnt-mmtl: Makefile Log Message: Use tcl-itcl, bump PKGREVISION. --- Module Name: pkgsrc Committed By: wiz Date: Mon Jan 7 13:27:29 UTC 2013 Modified Files: pkgsrc/sysutils/tkdesk: Makefile Log Message: Bump PKGREVISION for tcl-itcl shlib path change. --- Module Name: pkgsrc Committed By: wiz Date: Mon Jan 7 13:28:30 UTC 2013 Removed Files: pkgsrc/lang/tcl-itcl/patches: patch-aa patch-ab patch-ac patch-ad patch-ag patch-ah Log Message: Remove unused patches (after 3.4.1 update) @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4 2010/02/11 13:44:02 joerg Exp $ @ 1.3 log @Update tcl-itcl to 3.2.1, a bug fix release. Also switch to Tcl/Tk 8.4. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2001/05/01 16:13:54 jtb Exp $ d10 1 a10 1 +ITK_LIBRARY = $(prefix)/lib/tcl/itk$(VERSION) d19 1 a19 1 +pkglibdir = $(libdir)/tcl/@@PACKAGE@@@@VERSION@@ @ 1.2 log @Don't use the tcl or tk stub libraries. Thanks to Nick Hudson for pointing out the problem. @ text @d1 1 a1 1 $NetBSD$ d53 1 a53 1 +SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk83 -ltcl83 -lX11 -lm @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- itk/Makefile.in.orig Tue Aug 29 15:58:00 2000 +++ itk/Makefile.in Thu Nov 9 23:58:09 2000 d45 1 a45 1 @@@@ -175,7 +175,7 @@@@ d52 2 a53 1 SHLIB_LD_LIBS = @@SHLIB_LD_LIBS@@ d55 2 d66 14 a79 1 @@@@ -394,7 +394,7 @@@@ @ 1.1.1.1 log @Initial import of tcl-itcl. Package submitted by Mark Davies in PR pkg/12060. Some minor adjustments by me. [incr Tcl] provides the extra language support needed to build large Tcl/Tk applications. It introduces the notion of objects, which act as building blocks for an application. Each object is a bag of data with a set of procedures or "methods" that are used to manipulate it. Objects are organized into "classes" with identical characteristics, and classes can inherit functionality from one another. This object-oriented paradigm adds another level of organization on top of the basic variable/procedure elements, and the resulting code is easier to understand and maintain. @ text @@