diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2009-02-26 19:28:39 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2009-02-26 19:28:39 +0000 |
| commit | 6786fd3c44825a8ef76e65568b3d973a0fb618dd (patch) | |
| tree | ae25ad6fcbb6007724cac5a312d8773f7857b856 /lang/tcl85 | |
| parent | b97b749e21de4ab7319ca1192afb86878109bf11 (diff) | |
| download | ports-6786fd3c44825a8ef76e65568b3d973a0fb618dd.tar.gz ports-6786fd3c44825a8ef76e65568b3d973a0fb618dd.zip | |
- Unbreak and fix patch from last commit
Notes
Notes:
svn path=/head/; revision=229102
Diffstat (limited to 'lang/tcl85')
| -rw-r--r-- | lang/tcl85/files/patch-unix-Makefile.in | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in index 66dd98728f1b..24d2e4fd3857 100644 --- a/lang/tcl85/files/patch-unix-Makefile.in +++ b/lang/tcl85/files/patch-unix-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2008-12-22 18:45:06.000000000 +0100 -+++ Makefile.in 2009-02-26 11:53:11.121953378 +0100 +--- Makefile.in.orig 2008-12-22 15:16:08.000000000 +0100 ++++ Makefile.in 2009-02-26 11:52:42.428721740 +0100 @@ -55,6 +55,8 @@ # Directory in which to install the include file tcl.h: @@ -9,7 +9,7 @@ # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -101,7 +103,7 @@ +@@ -98,7 +100,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) @@ -18,12 +18,9 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -579,9 +581,10 @@ - SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ - $(OO_SRCS) $(STUB_SRCS) @PLAT_SRCS@ @ZLIB_SRCS@ +@@ -538,7 +540,8 @@ --all: binaries libraries doc packages -+all: binaries libraries doc + all: binaries libraries doc -binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh +binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ @@ -31,7 +28,7 @@ libraries: -@@ -592,6 +595,15 @@ +@@ -549,6 +552,15 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f $@ @MAKE_LIB@ @@ -47,16 +44,16 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -726,7 +738,7 @@ +@@ -697,7 +709,7 @@ dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) --INSTALL_TARGETS = install-binaries install-libraries install-doc install-packages @EXTRA_INSTALL@ +-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@ +INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@ install: $(INSTALL_TARGETS) -@@ -755,6 +767,13 @@ +@@ -726,6 +738,13 @@ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) @@ -70,7 +67,7 @@ @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -762,8 +781,9 @@ +@@ -733,8 +752,9 @@ fi @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" @$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION) @@ -82,7 +79,7 @@ @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -771,7 +791,8 @@ +@@ -742,7 +762,8 @@ @EXTRA_INSTALL_BINARIES@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs @@ -92,12 +89,11 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -793,14 +814,21 @@ - chmod +x $(UNIX_DIR)/install-sh; \ +@@ -764,13 +785,17 @@ + chmod +x $(SRC_DIR)/../unix/install-sh; \ fi @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ -- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \ - $(GENERIC_DIR)/tclPlatDecls.h \ - $(GENERIC_DIR)/tclTomMath.h \ - $(GENERIC_DIR)/tclTomMathDecls.h ; \ @@ -113,14 +109,10 @@ + @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 + @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h -+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOO.h "$(INCLUDE_INSTALL_DIR)"/tclOO.h -+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOODecls.h "$(INCLUDE_INSTALL_DIR)"/tclOODecls.h -+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h -+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h "$(INCLUDE_INSTALL_DIR)"/tclTomMathDecls.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 @DTRACE_SRC@; \ -@@ -866,20 +894,25 @@ +@@ -836,20 +861,25 @@ else true; \ fi; \ done; |