svn commit: r366876 - in head/lang/tcl86: . files

[Pietro Cerutti]

Author: gahr
Date: Mon Sep  1 13:10:58 2014
New Revision: 366876
URL: http://svnweb.freebsd.org/changeset/ports/366876
QAT: https://qat.redports.org/buildarchive/r366876/

Log:
  - Fix packaging
  - Bump PORTREVISION
  
  PR:		193216
  Submitted by:	Alex <iakrevetko at gmail.com>

Modified:
  head/lang/tcl86/Makefile
  head/lang/tcl86/files/patch-unix-Makefile.in

Modified: head/lang/tcl86/Makefile
==============================================================================
--- head/lang/tcl86/Makefile	Mon Sep  1 13:03:25 2014	(r366875)
+++ head/lang/tcl86/Makefile	Mon Sep  1 13:10:58 2014	(r366876)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.6.2
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION} \
 		${MASTER_SITE_TCLTK}

Modified: head/lang/tcl86/files/patch-unix-Makefile.in
==============================================================================
--- head/lang/tcl86/files/patch-unix-Makefile.in	Mon Sep  1 13:03:25 2014	(r366875)
+++ head/lang/tcl86/files/patch-unix-Makefile.in	Mon Sep  1 13:10:58 2014	(r366876)
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	2014-08-26 17:23:08.000000000 +0200
-+++ Makefile.in	2014-09-01 09:32:00.000000000 +0200
++++ Makefile.in	2014-09-01 15:03:50.000000000 +0200
 @@ -54,6 +54,8 @@
  
  # Directory in which to install the include file tcl.h:
@@ -76,7 +76,7 @@
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
-@@ -811,12 +824,12 @@
+@@ -811,12 +824,20 @@
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
@@ -86,6 +86,14 @@
 +	@echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig"
 +	@$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig
 +	@$(INSTALL_DATA) tcl.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tcl.pc
++	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
++		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
++	    do \
++	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
++	    done;
++	@echo "Customizing tcl module path"; \
++	    echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \
++	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
  
  install-libraries: libraries
 -	@for i in "$(SCRIPT_INSTALL_DIR)"; \
@@ -93,7 +101,7 @@
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -824,7 +837,13 @@
+@@ -824,7 +845,13 @@
  		else true; \
  		fi; \
  	    done;
@@ -108,7 +116,18 @@
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -844,31 +863,23 @@
+@@ -833,42 +860,26 @@
+ 		fi; \
+ 	    done;
+ 	@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@; \
+-	    do \
+-	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
+-	    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.8.8 as a Tcl Module";
@@ -142,9 +161,6 @@
 -	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
 -	fi
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm;
-+	@echo "Customizing tcl module path"; \
-+	    echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \
-+	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
  
  install-tzdata:
  	@for i in tzdata; \