diff options
Diffstat (limited to 'lang/tcl-itcl/patches')
-rw-r--r-- | lang/tcl-itcl/patches/patch-aa | 22 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ab | 71 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ac | 31 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ad | 71 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ae | 13 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-af | 24 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ag | 13 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ah | 13 |
8 files changed, 258 insertions, 0 deletions
diff --git a/lang/tcl-itcl/patches/patch-aa b/lang/tcl-itcl/patches/patch-aa new file mode 100644 index 00000000000..df8c86eb89e --- /dev/null +++ b/lang/tcl-itcl/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/02/23 20:36:28 jtb Exp $ + +--- itcl/configure.orig Tue Aug 29 15:58:00 2000 ++++ itcl/configure Fri Nov 10 01:10:13 2000 +@@ -1119,7 +1119,7 @@ + ;; + *) + CYGPATH=echo +- RELPATH=.. ++ RELPATH=../.. + ;; + esac + +@@ -1598,7 +1598,7 @@ + ;; + *) + MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)" +- MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(\$@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}" ++ MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${\$@_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0" + ;; + esac + diff --git a/lang/tcl-itcl/patches/patch-ab b/lang/tcl-itcl/patches/patch-ab new file mode 100644 index 00000000000..872a181f722 --- /dev/null +++ b/lang/tcl-itcl/patches/patch-ab @@ -0,0 +1,71 @@ +$NetBSD: patch-ab,v 1.1.1.1 2001/02/23 20:36:30 jtb Exp $ + +--- itcl/Makefile.in.orig Tue Aug 29 15:58:00 2000 ++++ itcl/Makefile.in Thu Nov 9 23:54:52 2000 +@@ -115,7 +115,7 @@ + + SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@ + +-ITCL_LIBRARY = $(prefix)/lib/itcl$(VERSION) ++ITCL_LIBRARY = $(prefix)/lib/tcl/itcl$(VERSION) + + ITCL_GENERIC_DIR_NATIVE = @ITCL_GENERIC_DIR_NATIVE@ + ITCL_UNIX_DIR_NATIVE = @ITCL_UNIX_DIR_NATIVE@ +@@ -150,16 +150,16 @@ + DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@@VERSION@ +-pkglibdir = $(libdir)/@PACKAGE@@VERSION@ ++pkglibdir = $(libdir)/tcl/@PACKAGE@@VERSION@ + pkgincludedir = $(includedir)/@PACKAGE@@VERSION@ + + top_builddir = . + + #INSTALL = $(top_srcdir)/../config/install-sh -c +-INSTALL = $(TCLSH_PROG) `@CYGPATH@ $(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@ + +@@ -172,7 +172,7 @@ + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +-CC = @CC@ ++CC = ${LIBTOOL} --mode=compile @CC@ + CFLAGS_DEBUG = @CFLAGS_DEBUG@ + CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ + CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ +@@ -187,7 +187,7 @@ + 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@ + STLIB_LD = @STLIB_LD@ +@@ -230,7 +230,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 $@ + + #======================================================================== +@@ -420,7 +420,7 @@ + #======================================================================== + + install-lib-binaries: installdirs +- @list='$(lib_BINARIES)'; for p in $$list; do \ ++ @list='${itcl_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 \ diff --git a/lang/tcl-itcl/patches/patch-ac b/lang/tcl-itcl/patches/patch-ac new file mode 100644 index 00000000000..bfc9877153b --- /dev/null +++ b/lang/tcl-itcl/patches/patch-ac @@ -0,0 +1,31 @@ +$NetBSD: patch-ac,v 1.1.1.1 2001/02/23 20:36:30 jtb Exp $ + +--- itk/configure.orig Tue Aug 29 15:58:00 2000 ++++ itk/configure Fri Nov 10 01:11:17 2000 +@@ -1119,7 +1119,7 @@ + ;; + *) + CYGPATH=echo +- RELPATH=.. ++ RELPATH=../.. + ;; + esac + +@@ -1902,7 +1902,7 @@ + ;; + *) + MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)" +- MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(\$@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}" ++ MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${\$@_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0" + ;; + esac + +@@ -1941,7 +1941,7 @@ + ;; + *) + if test "${SHARED_BUILD}" = "1" ; then +- SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_STUB_LIB_SPEC} ../itcl/${itclstub_LIB_FILE}" ++ SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_STUB_LIB_SPEC} ../itcl/itclStubLib.lo" + eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}" + RANLIB=: + else diff --git a/lang/tcl-itcl/patches/patch-ad b/lang/tcl-itcl/patches/patch-ad new file mode 100644 index 00000000000..74ae8b5878b --- /dev/null +++ b/lang/tcl-itcl/patches/patch-ad @@ -0,0 +1,71 @@ +$NetBSD: patch-ad,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $ + +--- itk/Makefile.in.orig Tue Aug 29 15:58:00 2000 ++++ itk/Makefile.in Thu Nov 9 23:58:09 2000 +@@ -103,7 +103,7 @@ + + SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@ + +-ITK_LIBRARY = $(prefix)/lib/itk$(VERSION) ++ITK_LIBRARY = $(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 = $(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,7 +175,7 @@ + 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@ + STLIB_LD = @STLIB_LD@ +@@ -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 $@ + + #======================================================================== +@@ -394,7 +394,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 \ diff --git a/lang/tcl-itcl/patches/patch-ae b/lang/tcl-itcl/patches/patch-ae new file mode 100644 index 00000000000..5c6d97afd4f --- /dev/null +++ b/lang/tcl-itcl/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $ + +--- iwidgets2.2.0/Makefile.in.orig Tue Aug 29 15:58:00 2000 ++++ iwidgets2.2.0/Makefile.in Thu Nov 9 17:34:21 2000 +@@ -40,7 +40,7 @@ + INSTALL_ROOT = + + # Path name to use when installing library scripts: +-SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets$(VERSION) ++SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/tcl/iwidgets$(VERSION) + + # Directory in which to install the archive libtcl.a: + LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib diff --git a/lang/tcl-itcl/patches/patch-af b/lang/tcl-itcl/patches/patch-af new file mode 100644 index 00000000000..638279167ce --- /dev/null +++ b/lang/tcl-itcl/patches/patch-af @@ -0,0 +1,24 @@ +$NetBSD: patch-af,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $ + +--- iwidgets3.0.0/Makefile.in.orig Tue Aug 29 15:58:00 2000 ++++ iwidgets3.0.0/Makefile.in Fri Nov 10 00:01:46 2000 +@@ -40,7 +40,7 @@ + INSTALL_ROOT = + + # Path name to use when installing library scripts: +-SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets$(VERSION) ++SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/tcl/iwidgets$(VERSION) + + # Directory in which to install the archive libtcl.a: + LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib +@@ -163,8 +163,8 @@ + + install-libraries: + @$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR) +- @rm -f $(LIB_INSTALL_DIR)/iwidgets +- $(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/iwidgets ++ @rm -f $(LIB_INSTALL_DIR)/tcl/iwidgets ++ $(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/tcl/iwidgets + @$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/scripts + @echo "Installing files from $(GENERIC_DIR) into $(SCRIPT_INSTALL_DIR)" + @for i in $(GENERIC_DIR)/*.tcl $(GENERIC_DIR)/*.itk $(GENERIC_DIR)/*.itcl $(GENERIC_DIR)/tclIndex $(GENERIC_DIR)/*.gif ; \ diff --git a/lang/tcl-itcl/patches/patch-ag b/lang/tcl-itcl/patches/patch-ag new file mode 100644 index 00000000000..11c7a79c4f4 --- /dev/null +++ b/lang/tcl-itcl/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2001/02/23 20:36:31 jtb 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 @@ + 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 .. library]\n\ diff --git a/lang/tcl-itcl/patches/patch-ah b/lang/tcl-itcl/patches/patch-ah new file mode 100644 index 00000000000..d8686aadada --- /dev/null +++ b/lang/tcl-itcl/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1.1.1 2001/02/23 20:36:31 jtb 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 @@ + 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 .. library]\n\ |