diff options
author | gahr <gahr@FreeBSD.org> | 2015-06-24 15:46:58 +0800 |
---|---|---|
committer | gahr <gahr@FreeBSD.org> | 2015-06-24 15:46:58 +0800 |
commit | 50cedf6a8e6cdae62225cadf3aba99c9ce99c5a8 (patch) | |
tree | 447481c99b13b7834e1ca617e9d3dc68320f2ed7 /lang/tcl85/files | |
parent | 2405d18fad7ac8506d85f70974d2ba3d3626930b (diff) | |
download | freebsd-ports-gnome-50cedf6a8e6cdae62225cadf3aba99c9ce99c5a8.tar.gz freebsd-ports-gnome-50cedf6a8e6cdae62225cadf3aba99c9ce99c5a8.tar.zst freebsd-ports-gnome-50cedf6a8e6cdae62225cadf3aba99c9ce99c5a8.zip |
- Add a couple of symlinks needed by databases/casstcl
- Bump PORTREVISION
- While at it, make makepatch-ify
Diffstat (limited to 'lang/tcl85/files')
-rw-r--r-- | lang/tcl85/files/patch-Makefile.in (renamed from lang/tcl85/files/patch-unix-Makefile.in) | 28 | ||||
-rw-r--r-- | lang/tcl85/files/patch-configure (renamed from lang/tcl85/files/patch-unix-configure) | 8 | ||||
-rw-r--r-- | lang/tcl85/files/patch-generic-tclPort.h | 4 | ||||
-rw-r--r-- | lang/tcl85/files/patch-installManPage (renamed from lang/tcl85/files/patch-unix-installManPage) | 6 | ||||
-rw-r--r-- | lang/tcl85/files/patch-tclUnixPort.h (renamed from lang/tcl85/files/patch-unix-tclUnixPort.h) | 8 |
5 files changed, 28 insertions, 26 deletions
diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-Makefile.in index fc11ac28aace..cbefea072527 100644 --- a/lang/tcl85/files/patch-unix-Makefile.in +++ b/lang/tcl85/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2014-07-23 15:03:24.000000000 +0200 -+++ Makefile.in 2014-07-24 09:54:20.000000000 +0200 -@@ -54,6 +54,8 @@ +--- Makefile.in.orig 2015-03-06 15:13:58 UTC ++++ Makefile.in +@@ -54,6 +54,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC # Directory in which to install the include file tcl.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -9,7 +9,7 @@ # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -152,8 +154,8 @@ +@@ -152,8 +154,8 @@ INSTALL_STRIP_PROGRAM = -s INSTALL_STRIP_LIBRARY = -S -x INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c @@ -20,7 +20,7 @@ INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA_DIR = ${INSTALL} -d -m 755 -@@ -546,7 +548,7 @@ +@@ -546,7 +548,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ all: binaries libraries doc @@ -29,7 +29,7 @@ libraries: -@@ -557,6 +559,15 @@ +@@ -557,6 +559,15 @@ doc: ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} rm -f $@ @MAKE_LIB@ @@ -45,7 +45,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ -@@ -701,7 +712,7 @@ +@@ -701,7 +712,7 @@ gentommath_h: dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) @@ -54,7 +54,7 @@ install: $(INSTALL_TARGETS) -@@ -727,21 +738,29 @@ +@@ -727,21 +738,29 @@ install-binaries: binaries @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @@ -90,7 +90,7 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -749,7 +768,7 @@ +@@ -749,7 +768,7 @@ install-libraries: libraries $(INSTALL_T else true; \ fi; \ done; @@ -99,7 +99,7 @@ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -@@ -758,50 +777,61 @@ +@@ -758,50 +777,63 @@ install-libraries: libraries $(INSTALL_T fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; @@ -108,17 +108,19 @@ - $(GENERIC_DIR)/tclTomMath.h \ - $(GENERIC_DIR)/tclTomMathDecls.h ; \ + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ + do \ +- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ + $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ + done; + @for i in $(UNIX_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ ++ do \ + $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \ done; + @ln -sf generic/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h + @ln -sf generic/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h + @ln -sf generic/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h ++ @ln -sf generic/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h ++ @ln -sf generic/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 @LDAIX_SRC@ @DTRACE_SRC@; \ diff --git a/lang/tcl85/files/patch-unix-configure b/lang/tcl85/files/patch-configure index 532f42345f10..94997ecbf88d 100644 --- a/lang/tcl85/files/patch-unix-configure +++ b/lang/tcl85/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-07-23 15:03:24.000000000 +0200 -+++ configure 2014-07-23 17:04:12.000000000 +0200 -@@ -7641,7 +7641,11 @@ +--- configure.orig 2015-03-06 15:13:58 UTC ++++ configure +@@ -7647,7 +7647,11 @@ fi ;; FreeBSD-*) @@ -12,4 +12,4 @@ + TCL_LIB_VERSIONS_OK=nodots SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" - TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" + SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@" diff --git a/lang/tcl85/files/patch-generic-tclPort.h b/lang/tcl85/files/patch-generic-tclPort.h index c767eee2f67e..6de98528dd8d 100644 --- a/lang/tcl85/files/patch-generic-tclPort.h +++ b/lang/tcl85/files/patch-generic-tclPort.h @@ -1,5 +1,5 @@ ---- ../generic/tclPort.h.orig 2013-04-03 16:57:25.000000000 +0200 -+++ ../generic/tclPort.h 2013-04-03 16:57:35.000000000 +0200 +--- ../generic/tclPort.h.orig 2013-04-03 16:57:25 UTC ++++ ../generic/tclPort.h @@ -20,7 +20,7 @@ #if defined(_WIN32) # include "tclWinPort.h" diff --git a/lang/tcl85/files/patch-unix-installManPage b/lang/tcl85/files/patch-installManPage index faa571e09f8e..c73f6f44c067 100644 --- a/lang/tcl85/files/patch-unix-installManPage +++ b/lang/tcl85/files/patch-installManPage @@ -1,6 +1,6 @@ ---- installManPage.orig 2013-01-15 15:06:06.000000000 +0100 -+++ installManPage 2013-01-15 15:07:17.000000000 +0100 -@@ -100,7 +100,7 @@ +--- installManPage.orig 2015-03-06 15:13:58 UTC ++++ installManPage +@@ -99,7 +99,7 @@ SrcDir=`dirname $ManPage` First="" for Target in $Names; do diff --git a/lang/tcl85/files/patch-unix-tclUnixPort.h b/lang/tcl85/files/patch-tclUnixPort.h index cd63d3b2b4d5..d91d22a955e8 100644 --- a/lang/tcl85/files/patch-unix-tclUnixPort.h +++ b/lang/tcl85/files/patch-tclUnixPort.h @@ -1,7 +1,7 @@ ---- tclUnixPort.h.orig 2012-08-02 15:43:23.269506562 +0200 -+++ tclUnixPort.h 2012-08-02 15:43:25.167507612 +0200 -@@ -631,7 +631,9 @@ - EXTERN struct tm *TclpGmtime(CONST time_t *); +--- tclUnixPort.h.orig 2015-02-12 15:13:16 UTC ++++ tclUnixPort.h +@@ -625,7 +625,9 @@ typedef int socklen_t; + # include <pthread.h> /* #define localtime(x) TclpLocaltime(x) * #define gmtime(x) TclpGmtime(x) */ -# undef inet_ntoa |