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.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.1.1.0.10 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.8 pkgsrc-2004Q4-base:1.1.1.1 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.15.29; author joerg; state dead; branches; next 1.4; 1.4 date 2009.12.17.18.23.49; author abs; state Exp; branches; next 1.3; 1.3 date 2005.11.05.03.27.56; author rillig; state Exp; branches; next 1.2; 1.2 date 2005.05.10.16.17.07; author agc; state Exp; branches; next 1.1; 1.1 date 2004.03.08.20.07.40; author minskim; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.03.08.20.07.40; author minskim; state Exp; branches; next ; desc @@ 1.5 log @Retire tk83 @ text @$NetBSD: patch-aa,v 1.4 2009/12/17 18:23:49 abs Exp $ --- unix/Makefile.in.orig 2001-10-20 00:24:40.000000000 +0000 +++ unix/Makefile.in @@@@ -37,7 +37,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) # Directory from which applications will reference the library of Tcl # scripts (note: you can set the TK_LIBRARY environment variable at @@@@ -76,7 +76,7 @@@@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/ma # The directory containing the Tcl sources and headers appropriate # for this version of Tk ("srcdir" will be replaced or has already # been replaced by the configure script): -TCL_GENERIC_DIR = @@TCL_SRC_DIR@@/generic +TCL_GENERIC_DIR = $(TCL_BIN_DIR)/../include/tcl/generic # The directory containing the Tcl library archive file appropriate # for this version of Tk: @@@@ -100,7 +100,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@@ @@@@ -159,8 +159,8 @@@@ SHELL = /bin/sh # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. -INSTALL = @@srcdir@@/install-sh -c -INSTALL_PROGRAM = ${INSTALL} +INSTALL = ${LIBTOOL} --mode=install @@srcdir@@/install-sh -c +INSTALL_PROGRAM = ${INSTALL} -s INSTALL_DATA = ${INSTALL} -m 644 # The following specifies which Tcl executable to use for make targets @@@@ -209,7 +209,7 @@@@ WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11 # The values of the symbolis normally set by the configure script. STLIB_LD = @@STLIB_LD@@ -SHLIB_LD = @@SHLIB_LD@@ +SHLIB_LD = ${LIBTOOL} --mode=link @@CC@@ -rpath ${PREFIX}/lib SHLIB_LD_LIBS = @@SHLIB_LD_LIBS@@ # Additional search flags needed to find the various shared libraries @@@@ -240,7 +240,8 @@@@ TOOL_DIR = @@TCL_SRC_DIR@@/tools # either. #---------------------------------------------------------------- -CC = @@CC@@ +CC = ${LIBTOOL} --mode=compile @@CC@@ +LD = ${LIBTOOL} --mode=link @@CC@@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I${UNIX_DIR} -I${GENERIC_DIR} \ @@@@ -373,6 +374,7 @@@@ ${TK_LIB_FILE}: ${OBJS} rm -f ${TK_LIB_FILE} @@MAKE_LIB@@ $(RANLIB) ${TK_LIB_FILE} + ${TOUCH} ${TK_LIB_FILE} ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @@@@ -391,9 +393,9 @@@@ objs: ${OBJS} wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) - $(CC) $(LDFLAGS) $(WISH_OBJS) \ + $(LD) $(LDFLAGS) $(WISH_OBJS) \ @@TK_BUILD_LIB_SPEC@@ \ - $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish + $(WISH_LIBS) -o wish # This rule is executed if the user tried to run tktest without first # building tcltest in the Tcl bin directory. Just do it for them. @@@@ -402,12 +404,12 @@@@ ${TCL_BIN_DIR}/tcltest: make tcltest tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE) - ${CC} $(LDFLAGS) $(TKTEST_OBJS) \ + ${LD} $(LDFLAGS) $(TKTEST_OBJS) \ @@TK_BUILD_LIB_SPEC@@ \ - $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest + $(WISH_LIBS) -o tktest xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) - ${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \ + ${LD} $(LDFLAGS) test.o tkTest.o tkSquare.o \ @@TK_BUILD_LIB_SPEC@@ \ $(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest @@@@ -462,7 +464,7 @@@@ install-binaries: $(TK_LIB_FILE) $(TK_ST chmod +x $(UNIX_DIR)/mkLinks; \ fi @@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @@$(INSTALL_DATA) $(TK_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) @@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) @@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) @@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" @ 1.4 log @PKG_DESTDIR_SUPPORT @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $ @ 1.3 log @Fixed wrong use of WRKSRC. Converted explicit use of ${SED} to the SUBST framework. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2005/05/10 16:17:07 agc Exp $ d3 12 a14 3 --- unix/Makefile.in.orig 2001-10-20 01:24:40.000000000 +0100 +++ unix/Makefile.in 2005-05-10 17:01:34.000000000 +0100 @@@@ -76,7 +76,7 @@@@ d23 1 a23 1 @@@@ -100,7 +100,7 @@@@ d32 1 a32 1 @@@@ -159,8 +159,8 @@@@ d43 1 a43 1 @@@@ -209,7 +209,7 @@@@ d52 1 a52 1 @@@@ -240,7 +240,8 @@@@ d62 1 a62 1 @@@@ -373,6 +374,7 @@@@ d70 1 a70 1 @@@@ -391,9 +393,9 @@@@ d82 1 a82 1 @@@@ -402,12 +404,12 @@@@ d98 1 a98 1 @@@@ -462,7 +464,7 @@@@ @ 1.2 log @Don't include $(TK_CC_SEARCH_FLAGS) in the ${LD} link commands, since this does not work - as evidenced in numerous bulk build results. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $ d3 2 a4 2 --- Makefile.in.orig 2001-10-20 01:24:40.000000000 +0100 +++ Makefile.in 2005-05-10 17:01:34.000000000 +0100 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2004/01/05 11:24:18 jlam Exp $ d3 2 a4 2 --- Makefile.in.orig Sat Oct 20 02:24:40 2001 +++ Makefile.in d61 1 a61 1 @@@@ -391,7 +393,7 @@@@ d68 2 a69 1 $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish d71 2 d80 2 a81 1 $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest @ 1.1.1.1 log @Reimport tk-8.3.4 into x11/tk83 before updating Tk to 8.4.5, because many packages still need 8.3. OK'ed by the maintainer (jwise@@). @ text @@