head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.8 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.6 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.2 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 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.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.1.1.0.6 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2010.02.10.18.17.11; author joerg; state dead; branches; next 1.4; 1.4 date 2009.12.17.18.35.26; author abs; state Exp; branches; next 1.3; 1.3 date 2005.11.04.09.56.09; author rillig; state Exp; branches; next 1.2; 1.2 date 2004.10.10.11.58.29; author grant; state Exp; branches; next 1.1; 1.1 date 2004.03.08.19.22.27; author minskim; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.03.08.19.22.27; author minskim; state Exp; branches; next ; desc @@ 1.5 log @Retire TCL 8.3 @ text @$NetBSD: patch-aa,v 1.4 2009/12/17 18:35:26 abs Exp $ --- unix/Makefile.in.orig 2001-10-20 00:24:15.000000000 +0000 +++ unix/Makefile.in @@@@ -35,7 +35,7 @@@@ mandir = @@mandir@@ # to be different than those used for actually reference files at # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix # when installing files. -INSTALL_ROOT = +INSTALL_ROOT = $(DESTDIR) # Path for the platform independent Tcl scripting libraries: TCL_LIBRARY = $(prefix)/lib/tcl$(VERSION) @@@@ -87,7 +87,7 @@@@ CFLAGS_OPTIMIZE = @@CFLAGS_OPTIMIZE@@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @@CFLAGS@@ @@CFLAGS_DEFAULT@@ +CFLAGS += @@CFLAGS@@ @@CFLAGS_DEFAULT@@ # Flags to pass to the linker LDFLAGS_DEBUG = @@LDFLAGS_DEBUG@@ @@@@ -169,8 +169,8 @@@@ SHELL = /bin/sh INSTALL_STRIP_PROGRAM = -s INSTALL_STRIP_LIBRARY = -S -S -INSTALL = @@srcdir@@/install-sh -c -INSTALL_PROGRAM = ${INSTALL} +INSTALL := ${LIBTOOL} --mode=install @@srcdir@@/install-sh -c +INSTALL_PROGRAM = ${INSTALL} -s INSTALL_LIBRARY = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 @@@@ -187,8 +187,8 @@@@ TCL_EXE = tclsh # configure script. You shouldn't normally need to modify any of # these definitions by hand. -STLIB_LD = @@STLIB_LD@@ -SHLIB_LD = @@SHLIB_LD@@ +STLIB_LD = ${AR} cr +SHLIB_LD = ${LIBTOOL} --mode=link @@CC@@ -rpath ${PREFIX}/lib SHLIB_CFLAGS = @@SHLIB_CFLAGS@@ SHLIB_SUFFIX = @@SHLIB_SUFFIX@@ @@@@ -235,8 +235,9 @@@@ DLTEST_DIR = @@TCL_SRC_DIR@@/unix/dltest # Must be absolute to so the corresponding tcltest's tcl_library is absolute. TCL_BUILDTIME_LIBRARY = @@TCL_SRC_DIR@@/library -CC = @@CC@@ #CC = purify -best-effort @@CC@@ -DPURIFY +CC = ${LIBTOOL} --mode=compile @@CC@@ +LD = ${LIBTOOL} --mode=link @@CC@@ ${LDFLAGS} #---------------------------------------------------------------- # The information below should be usable as is. The configure @@@@ -420,6 +421,7 @@@@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE @@MAKE_LIB@@ if test "x@@DL_OBJS@@" = "xtclLoadAout.o"; then \ $(RANLIB) ${TCL_LIB_FILE}; \ + $(TOUCH) ${TCL_LIB_FILE}; \ fi ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @@@@ -440,11 +442,11 @@@@ objs: ${OBJS} tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} - ${CC} ${LDFLAGS} ${TCLSH_OBJS} @@TCL_BUILD_LIB_SPEC@@ ${LIBS} \ + ${LD} ${LDFLAGS} ${TCLSH_OBJS} @@TCL_BUILD_LIB_SPEC@@ ${LIBS} \ @@TCL_LD_SEARCH_FLAGS@@ -o tclsh tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST} - ${CC} ${LDFLAGS} ${TCLTEST_OBJS} @@TCL_BUILD_LIB_SPEC@@ ${LIBS} \ + ${LD} ${LDFLAGS} ${TCLTEST_OBJS} @@TCL_BUILD_LIB_SPEC@@ ${LIBS} \ @@TCL_LD_SEARCH_FLAGS@@ -o tcltest # Note, in the target below TCL_LIBRARY needs to be set or else @@@@ -538,7 +540,7 @@@@ install-binaries: binaries chmod +x $(SRC_DIR)/install-sh; \ fi @@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) + @@$(INSTALL_LIBRARY) $(TCL_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) @@if test "x@@DL_OBJS@@" = "xtclLoadAout.o"; then \ (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \ fi @@@@ -989,7 +991,7 @@@@ tclUnixInit.o: $(UNIX_DIR)/tclUnixInit.c xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \ @@DL_OBJS@@ ${BUILD_DLTEST} - ${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \ + ${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \ @@DL_OBJS@@ @@TCL_BUILD_LIB_SPEC@@ ${LIBS} \ @@TCL_LD_SEARCH_FLAGS@@ -L/usr/openwin/lib -lXt -o xttest @ 1.4 log @PKG_DESTDIR_SUPPORT @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2005/11/04 09:56:09 rillig Exp $ @ 1.3 log @Fixed wrong use of WRKSRC. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2004/10/10 11:58:29 grant Exp $ d3 1 a3 1 --- unix/Makefile.in.orig 2001-10-20 10:24:15.000000000 +1000 d5 9 @ 1.2 log @fix build on Darwin: - libtool needs -dynamiclib on Darwin to create shared libraries - don't use libtool to create the static libtclstub.a, do it the same way that tcl 8.4 does - name library libtcl83 (as opposed to libtcl8.3) like other platforms - remove PLIST unnecessary hack for Darwin shlib name @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Makefile.in.orig 2001-10-20 10:24:15.000000000 +1000 +++ Makefile.in @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $ d3 3 a5 3 --- Makefile.in.orig Fri Oct 19 20:24:15 2001 +++ Makefile.in Tue Oct 7 21:57:52 2003 @@@@ -87,7 +87,7 @@@@ d14 1 a14 1 @@@@ -169,8 +169,8 @@@@ d25 1 a25 1 @@@@ -187,8 +187,8 @@@@ d31 1 a31 1 +STLIB_LD = ${LIBTOOL} --mode=link @@CC@@ -rpath ${PREFIX}/lib d36 1 a36 1 @@@@ -235,8 +235,9 @@@@ d47 1 a47 1 @@@@ -420,6 +421,7 @@@@ d55 1 a55 1 @@@@ -440,11 +442,11 @@@@ d69 1 a69 1 @@@@ -538,7 +540,7 @@@@ d78 1 a78 1 @@@@ -989,7 +991,7 @@@@ @ 1.1.1.1 log @Reimport tcl-8.3.4 into lang/tcl83 before updating Tcl/Tk to 8.4.5, because many packages still need 8.3. OK'ed by the maintainer (jwise@@). @ text @@