svn commit: r352471 - in head/lang/tcl85: . files
Pietro Cerutti
gahr at FreeBSD.org
Mon Apr 28 08:17:50 UTC 2014
Author: gahr
Date: Mon Apr 28 08:17:49 2014
New Revision: 352471
URL: http://svnweb.freebsd.org/changeset/ports/352471
QAT: https://qat.redports.org/buildarchive/r352471/
Log:
- Fix PLIST with non-standard OPTIONS
PR: 188712
Submitted by: Allen Hewes <rallenh at hotmail.com>
Modified:
head/lang/tcl85/files/patch-unix-Makefile.in
head/lang/tcl85/pkg-plist
Modified: head/lang/tcl85/files/patch-unix-Makefile.in
==============================================================================
--- head/lang/tcl85/files/patch-unix-Makefile.in Mon Apr 28 08:17:25 2014 (r352470)
+++ head/lang/tcl85/files/patch-unix-Makefile.in Mon Apr 28 08:17:49 2014 (r352471)
@@ -1,5 +1,5 @@
--- Makefile.in.orig 2013-09-13 18:07:56.000000000 +0200
-+++ Makefile.in 2014-02-03 10:23:39.000000000 +0100
++++ Makefile.in 2014-04-28 09:48:13.000000000 +0200
@@ -54,6 +54,8 @@
# Directory in which to install the include file tcl.h:
@@ -77,11 +77,11 @@
fi; \
done;
- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \
-+ @for i in opt0.4 http1.0 encoding; \
++ @for i in encoding; \
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -748,51 +766,53 @@
+@@ -748,51 +766,61 @@
fi; \
done;
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
@@ -109,11 +109,6 @@
done;
- @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/";
- @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \
-- do \
-- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
-- done;
-- @echo "Installing package http 2.7.12 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.12.tm;
+ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
+ @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
@@ -123,6 +118,17 @@
+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
+
+install-tm:
++ @for i in opt0.4 http1.0; \
+ do \
+- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
++ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
++ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
++ $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
++ else true; \
++ fi; \
+ done;
+- @echo "Installing package http 2.7.12 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.12.tm;
@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
@for i in $(TOP_DIR)/library/opt/*.tcl ; \
do \
@@ -163,7 +169,7 @@
install-tzdata:
@for i in tzdata; \
do \
-@@ -1564,7 +1584,7 @@
+@@ -1564,7 +1592,7 @@
match=1; \
fi; \
done; \
@@ -172,7 +178,7 @@
done
#
-@@ -1581,7 +1601,7 @@
+@@ -1581,7 +1609,7 @@
match=1; \
fi; \
done; \
Modified: head/lang/tcl85/pkg-plist
==============================================================================
--- head/lang/tcl85/pkg-plist Mon Apr 28 08:17:25 2014 (r352470)
+++ head/lang/tcl85/pkg-plist Mon Apr 28 08:17:49 2014 (r352471)
@@ -108,8 +108,6 @@ lib/tcl%%TCL_VER%%/encoding/shiftjis.enc
lib/tcl%%TCL_VER%%/encoding/symbol.enc
lib/tcl%%TCL_VER%%/encoding/tis-620.enc
lib/tcl%%TCL_VER%%/history.tcl
-lib/tcl%%TCL_VER%%/http1.0/http.tcl
-lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
lib/tcl%%TCL_VER%%/init.tcl
lib/tcl%%TCL_VER%%/msgs/af.msg
lib/tcl%%TCL_VER%%/msgs/af_za.msg
@@ -238,8 +236,6 @@ lib/tcl%%TCL_VER%%/msgs/zh_cn.msg
lib/tcl%%TCL_VER%%/msgs/zh_hk.msg
lib/tcl%%TCL_VER%%/msgs/zh_sg.msg
lib/tcl%%TCL_VER%%/msgs/zh_tw.msg
-lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
-lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
lib/tcl%%TCL_VER%%/package.tcl
lib/tcl%%TCL_VER%%/parray.tcl
lib/tcl%%TCL_VER%%/safe.tcl
@@ -1556,14 +1552,18 @@ lib/tcl%%TCL_VER%%/word.tcl
%%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Africa
%%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata
%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.12.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.12.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl
+%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.2.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
+%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
+%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.12.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.5.tm
- at dirrm lib/tcl%%TCL_VER%%/platform
- at dirrm lib/tcl%%TCL_VER%%/opt0.4
+%%MODULES%%@dirrm lib/tcl%%TCL_VER%%/platform
+%%MODULES%%@dirrm lib/tcl%%TCL_VER%%/opt0.4
+%%MODULES%%@dirrm lib/tcl%%TCL_VER%%/http1.0
@dirrm lib/tcl%%TCL_VER%%/msgs
- at dirrm lib/tcl%%TCL_VER%%/http1.0
@dirrm lib/tcl%%TCL_VER%%/encoding
@dirrmtry lib/tcl%%TCL_VER%%
@dirrm include/tcl%%TCL_VER%%/unix
More information about the svn-ports-all
mailing list