diff options
author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-04-23 11:51:52 +0000 |
---|---|---|
committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-04-23 11:51:52 +0000 |
commit | fef02240eadfe71a1e40b737f40b3d44c610f203 (patch) | |
tree | 85fa201a8b2f77aa2eeebf378af8a1d9cc666b3a /lang/tcl83/files/patch-aa | |
parent | Convert j* categories to USES=pkgconfig (diff) |
- Remove lang/tcl83 and x11-toolkits/tk83 (expired)
- Remove references to Tcl/Tk 8.3 from bsd.tcl.mk
- Update ports that required 8.3+ to require 8.4+ (since 8.5 is the
default, I don't expect this change to cause much trouble)
Notes
Notes:
svn path=/head/; revision=316351
Diffstat (limited to 'lang/tcl83/files/patch-aa')
-rw-r--r-- | lang/tcl83/files/patch-aa | 143 |
1 files changed, 0 insertions, 143 deletions
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa deleted file mode 100644 index ef01e4c01930..000000000000 --- a/lang/tcl83/files/patch-aa +++ /dev/null @@ -1,143 +0,0 @@ ---- Makefile.in.orig Fri Oct 18 22:44:46 2002 -+++ Makefile.in Mon Mar 12 17:53:11 2007 -@@ -54,6 +54,8 @@ - - # Directory in which to install the include file tcl.h: - INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - - # Top-level directory in which to install manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) -@@ -87,7 +89,7 @@ - #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@ -@@ -407,7 +409,8 @@ - - all: binaries libraries doc - --binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh -+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ -+ libtcl${SHORT_TCL_VER}.a tclsh - - libraries: - -@@ -418,7 +421,15 @@ - ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} - rm -f ${TCL_LIB_FILE} - @MAKE_LIB@ -- $(RANLIB) ${TCL_LIB_FILE} -+ @ln -sf $(TCL_LIB_FILE) ./libtcl${SHORT_TCL_VER}.so -+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ -+ $(RANLIB) ${TCL_LIB_FILE}; \ -+ fi -+ -+libtcl${SHORT_TCL_VER}.a: ${OBJS} -+ rm -f libtcl${SHORT_TCL_VER}.a -+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} -+ $(RANLIB) libtcl${SHORT_TCL_VER}.a - - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f ${STUB_LIB_FILE} -@@ -533,7 +544,7 @@ - cd dltest; if test -f configure; then ./configure; else \ - $(DLTEST_DIR)/configure; fi - --install: install-binaries install-libraries install-doc -+install: install-binaries install-libraries - - install-strip: - $(MAKE) install \ -@@ -561,6 +572,12 @@ - @$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) - @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so -+ @echo "Installing libtcl${SHORT_TCL_VER}.a" -+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \ -+ $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a - @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -568,8 +585,9 @@ - fi - @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" - @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) -- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" -- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh -+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/" -+ @mkdir -p $(SCRIPT_INSTALL_DIR) -+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh - @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ - echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_LIBRARY) $(STUB_LIB_FILE) \ -@@ -577,7 +595,8 @@ - fi - - install-libraries: libraries -- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ -+ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ -+ $(SCRIPT_INSTALL_DIR); \ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -@@ -599,11 +618,16 @@ - chmod +x $(SRC_DIR)/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ -- $(GENERIC_DIR)/tclPlatDecls.h ; \ -+ @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ - done; -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ - do \ -@@ -661,7 +685,6 @@ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.1) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) - @echo "Installing C API (.3) docs"; - @cd $(TOP_DIR)/doc; for i in *.3; \ - do \ -@@ -671,7 +694,6 @@ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking C API (.3) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) - @echo "Installing command (.n) docs"; - @cd $(TOP_DIR)/doc; for i in *.n; \ - do \ -@@ -681,7 +703,14 @@ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking command (.n) docs"; -- @$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) -+ @echo "**********" -+ @echo "IMPORTANT:" -+ @echo "**********" -+ @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" -+ @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" -+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" -+ @echo "There are NOT default place, but good place to avoid" -+ @echo "conflicting with another version of Tcl/Tks." - - Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status |