svn commit: r301943 - in head: lang/tcl85 lang/tcl85/files x11-toolkits/tk85 x11-toolkits/tk85/files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Fri Aug 3 18:32:19 UTC 2012
Hi Martin,
I found that NO_INSTALL_MANPAGES was replaced by DOCS option in this update.
Would it be better to use MANPAGES option (MANPAGES_DESC?=Build and
install man pages) instead?
Regards,
sunpoet
On Fri, Aug 3, 2012 at 5:17 PM, Martin Matuska <mm at freebsd.org> wrote:
> Author: mm
> Date: Fri Aug 3 09:17:41 2012
> New Revision: 301943
> URL: http://svn.freebsd.org/changeset/ports/301943
>
> Log:
> Update tcl85/tk85 to 8.5.12
>
> Modified:
> head/lang/tcl85/Makefile
> head/lang/tcl85/distinfo
> head/lang/tcl85/files/patch-unix-Makefile.in
> head/lang/tcl85/files/patch-unix-tclUnixPort.h
> head/lang/tcl85/pkg-plist
> head/lang/tcl85/pkg-plist.tm
> head/x11-toolkits/tk85/Makefile
> head/x11-toolkits/tk85/distinfo
> head/x11-toolkits/tk85/files/patch-unix::Makefile.in
> head/x11-toolkits/tk85/pkg-plist
>
> Modified: head/lang/tcl85/Makefile
> ==============================================================================
> --- head/lang/tcl85/Makefile Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/lang/tcl85/Makefile Fri Aug 3 09:17:41 2012 (r301943)
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME?= tcl
> -PORTVERSION= 8.5.11
> +PORTVERSION= 8.5.12
> CATEGORIES= lang
> MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
> PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
> @@ -34,9 +34,11 @@ PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_
> EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/
>
> .if !defined(BUILDING_TCL_THREADS) && !defined(BUILDING_TCL_TM)
> -OPTIONS= TCL85_MAN "Install tcl 8.5 function manpages" off \
> - TZDATA "Install tcl timezone data" off \
> - TCL_MODULES "Install tcl common modules" on
> +OPTIONS_DEFINE= TCL85_MAN TZDATA TCL_MODULES
> +OPTIONS_DEFAULT= TCL_MODULES
> +TCL85_MAN_DESC=Install tcl 8.5 function manpages
> +TZDATA_DESC=Install tcl timezone data
> +TCL_MODULES_DESC=Install tcl common modules
> .elif defined(BUILDING_TCL_THREADS)
> USE_TCL= ${SHORT_TCL_VER}
> PLIST= ${PKGDIR}/pkg-plist.threads
> @@ -53,19 +55,19 @@ PLIST= ${PKGDIR}/pkg-plist.tm
>
> .if !defined(BUILDING_TCL_TM)
>
> -.if !defined(WITHOUT_TCL_MODULES)
> -RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.3.tm:${PORTSDIR}/lang/tcl-modules
> +.if ${PORT_OPTIONS:MTCL_MODULES}
> +RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.4.tm:${PORTSDIR}/lang/tcl-modules
> .endif
>
> DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER}
>
> -.if defined(WITH_TZDATA)
> +.if ${PORT_OPTIONS:MTZDATA}
> PLIST_SUB+= TZDATA=""
> .else
> PLIST_SUB+= TZDATA="@comment "
> .endif
>
> -.if !defined(NO_INSTALL_MANPAGES)
> +.if ${PORT_OPTIONS:MDOCS}
> MAN1= tclsh${TCL_VER}${THREADS_SUFFIX}.1
> .endif
>
> @@ -758,24 +760,24 @@ do-install:
> .endif
>
> post-install:
> -.if defined(WITH_TZDATA)
> +.if ${PORT_OPTIONS:MTZDATA}
> @cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV}
> .endif
> ${MKDIR} ${DATADIR}
> ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
> -.if !defined(NO_INSTALL_MANPAGES)
> +.if ${PORT_OPTIONS:MDOCS}
> ${MKDIR} ${MANPREFIX}/man/man1
> ${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1
> -.if !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL85_MAN)
> +.if !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN}
> . for mp in ${MAN3} ${MANN}
> @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \
> ${WRKSRC}/../doc/${mp}
> . endfor
> @cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
>
> -.endif # !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL85_MAN)
> +.endif # !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN}
>
> -.endif # !defined(NO_INSTALL_MANPAGES)
> +.endif # ${PORT_OPTIONS:MDOCS}
>
> regression-test: build
> cd ${WRKSRC} && LC_ALL=C ${MAKE} test
>
> Modified: head/lang/tcl85/distinfo
> ==============================================================================
> --- head/lang/tcl85/distinfo Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/lang/tcl85/distinfo Fri Aug 3 09:17:41 2012 (r301943)
> @@ -1,2 +1,2 @@
> -SHA256 (tcl8.5.11-src.tar.gz) = 8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a
> -SIZE (tcl8.5.11-src.tar.gz) = 4484001
> +SHA256 (tcl8.5.12-src.tar.gz) = 20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2
> +SIZE (tcl8.5.12-src.tar.gz) = 4501505
>
> Modified: head/lang/tcl85/files/patch-unix-Makefile.in
> ==============================================================================
> --- head/lang/tcl85/files/patch-unix-Makefile.in Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/lang/tcl85/files/patch-unix-Makefile.in Fri Aug 3 09:17:41 2012 (r301943)
> @@ -1,6 +1,6 @@
> ---- Makefile.in.orig 2010-09-08 19:40:48.000000000 +0200
> -+++ Makefile.in 2010-09-17 16:35:44.992422365 +0200
> -@@ -55,6 +55,8 @@
> +--- Makefile.in.orig 2012-07-25 18:45:05.000000000 +0200
> ++++ Makefile.in 2012-08-02 15:10:04.590514599 +0200
> +@@ -54,6 +54,8 @@
>
> # 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@
> -@@ -101,7 +103,7 @@
> +@@ -100,7 +102,7 @@
> #CFLAGS = $(CFLAGS_DEBUG)
> #CFLAGS = $(CFLAGS_OPTIMIZE)
> #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
> @@ -18,7 +18,7 @@
>
> # Flags to pass to the linker
> LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
> -@@ -538,7 +540,7 @@
> +@@ -541,7 +543,7 @@
>
> all: binaries libraries doc
>
> @@ -27,7 +27,7 @@
>
> libraries:
>
> -@@ -549,6 +551,15 @@
> +@@ -552,6 +554,15 @@
> ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
> rm -f $@
> @MAKE_LIB@
> @@ -43,7 +43,7 @@
>
> ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
> rm -f $@
> -@@ -697,7 +708,7 @@
> +@@ -693,7 +704,7 @@
> dltest.marker: ${STUB_LIB_FILE}
> cd dltest ; $(MAKE)
>
> @@ -52,16 +52,16 @@
>
> install: $(INSTALL_TARGETS)
>
> -@@ -727,10 +738,18 @@
> - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
> +@@ -723,10 +734,18 @@
> + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
> @@INSTALL_LIB@
> - @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
> -+ @ln -sf $(LIB_FILE) "$(LIB_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
> + @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
> ++ @ln -sf $(LIB_FILE) "$(DLL_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
> ++ "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
> ++ @(cd "$(DLL_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
> ++ @chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
> +
> @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
> @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
> @@ -73,7 +73,7 @@
> @if test "$(STUB_LIB_FILE)" != "" ; then \
> echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
> @INSTALL_STUB_LIB@ ; \
> -@@ -738,7 +757,8 @@
> +@@ -734,7 +753,8 @@
> @EXTRA_INSTALL_BINARIES@
>
> install-libraries: libraries $(INSTALL_TZDATA) install-msgs
> @@ -83,16 +83,16 @@
> do \
> if [ ! -d "$$i" ] ; then \
> echo "Making directory $$i"; \
> -@@ -747,7 +767,7 @@
> +@@ -743,7 +763,7 @@
> else true; \
> fi; \
> done;
> -- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.3 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \
> +- @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; \
> do \
> if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
> echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
> -@@ -760,13 +780,17 @@
> +@@ -756,13 +776,17 @@
> chmod +x $(SRC_DIR)/../unix/install-sh; \
> fi
> @echo "Installing header files";
> @@ -101,35 +101,35 @@
> - $(GENERIC_DIR)/tclTomMath.h \
> - $(GENERIC_DIR)/tclTomMathDecls.h ; \
> + @for i in $(GENERIC_DIR)/*.h ; \
> - do \
> -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
> ++ do \
> + $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
> - done;
> ++ done;
> + @for i in $(UNIX_DIR)/*.h ; \
> -+ do \
> + do \
> +- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
> + $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
> -+ done;
> + 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
> + @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.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@; \
> -@@ -778,22 +802,11 @@
> +@@ -774,22 +798,11 @@
> do \
> $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
> done;
> -- @echo "Installing package http 2.7.7 as a Tcl Module";
> -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.7.tm;
> +- @echo "Installing package http 2.7.9 as a Tcl Module";
> +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.9.tm;
> @echo "Installing library opt0.4 directory";
> @for i in $(TOP_DIR)/library/opt/*.tcl ; \
> do \
> $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
> done;
> -- @echo "Installing package msgcat 1.4.4 as a Tcl Module";
> -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.4.tm;
> -- @echo "Installing package tcltest 2.3.3 as a Tcl Module";
> -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.3.tm;
> +- @echo "Installing package msgcat 1.4.5 as a Tcl Module";
> +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.5.tm;
> +- @echo "Installing package tcltest 2.3.4 as a Tcl Module";
> +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
> -
> - @echo "Installing package platform 1.0.10 as a Tcl Module";
> - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;
> @@ -138,7 +138,7 @@
>
> @echo "Installing library encoding directory";
> @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
> -@@ -805,6 +818,28 @@
> +@@ -801,6 +814,28 @@
> "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
> fi
>
> @@ -152,12 +152,12 @@
> + else true; \
> + fi; \
> + done;
> -+ @echo "Installing package http 2.7.7 as a Tcl Module";
> -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.7.tm;
> -+ @echo "Installing package msgcat 1.4.4 as a Tcl Module";
> -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.4.tm;
> -+ @echo "Installing package tcltest 2.3.3 as a Tcl Module";
> -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.3.tm;
> ++ @echo "Installing package http 2.7.9 as a Tcl Module";
> ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.9.tm;
> ++ @echo "Installing package msgcat 1.4.5 as a Tcl Module";
> ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.5.tm;
> ++ @echo "Installing package tcltest 2.3.4 as a Tcl Module";
> ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.4.tm;
> +
> + @echo "Installing package platform 1.0.10 as a Tcl Module";
> + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm;
> @@ -167,7 +167,7 @@
> install-tzdata: ${TCL_EXE}
> @echo "Installing time zone data"
> @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
> -@@ -829,21 +864,26 @@
> +@@ -825,21 +860,26 @@
> else true; \
> fi; \
> done;
>
> Modified: head/lang/tcl85/files/patch-unix-tclUnixPort.h
> ==============================================================================
> --- head/lang/tcl85/files/patch-unix-tclUnixPort.h Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/lang/tcl85/files/patch-unix-tclUnixPort.h Fri Aug 3 09:17:41 2012 (r301943)
> @@ -1,12 +1,13 @@
> ---- tclUnixPort.h.orig Wed Jan 17 13:14:18 2007
> -+++ tclUnixPort.h Wed Jan 17 13:08:39 2007
> -@@ -628,6 +628,9 @@
> - EXTERN struct tm * TclpLocaltime(CONST time_t *);
> - EXTERN struct tm * TclpGmtime(CONST time_t *);
> - EXTERN char * TclpInetNtoa(struct in_addr);
> -+#ifdef inet_ntoa
> -+# undef inet_ntoa
> -+#endif
> +--- 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 *);
> /* #define localtime(x) TclpLocaltime(x)
> * #define gmtime(x) TclpGmtime(x) */
> - # undef inet_ntoa
> +-# undef inet_ntoa
> ++# ifdef inet_ntoa
> ++# undef inet_ntoa
> ++# endif
> + # define inet_ntoa(x) TclpInetNtoa(x)
> + # ifdef HAVE_PTHREAD_ATTR_GET_NP
> + # define TclpPthreadGetAttrs pthread_attr_get_np
>
> Modified: head/lang/tcl85/pkg-plist
> ==============================================================================
> --- head/lang/tcl85/pkg-plist Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/lang/tcl85/pkg-plist Fri Aug 3 09:17:41 2012 (r301943)
> @@ -389,6 +389,7 @@ lib/tcl%%TCL_VER%%/tclIndex
> %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Coral_Harbour
> %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Cordoba
> %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Costa_Rica
> +%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Creston
> %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Cuiaba
> %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Curacao
> %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Danmarkshavn
>
> Modified: head/lang/tcl85/pkg-plist.tm
> ==============================================================================
> --- head/lang/tcl85/pkg-plist.tm Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/lang/tcl85/pkg-plist.tm Fri Aug 3 09:17:41 2012 (r301943)
> @@ -1,8 +1,8 @@
> -lib/tcl8/8.4/http-2.7.7.tm
> +lib/tcl8/8.4/http-2.7.9.tm
> lib/tcl8/8.4/platform/shell-1.1.4.tm
> lib/tcl8/8.4/platform-1.0.10.tm
> -lib/tcl8/8.5/msgcat-1.4.4.tm
> -lib/tcl8/8.5/tcltest-2.3.3.tm
> +lib/tcl8/8.5/msgcat-1.4.5.tm
> +lib/tcl8/8.5/tcltest-2.3.4.tm
> @dirrmtry lib/tcl8/8.3
> @dirrmtry lib/tcl8/8.4/platform
> @dirrmtry lib/tcl8/8.4
>
> Modified: head/x11-toolkits/tk85/Makefile
> ==============================================================================
> --- head/x11-toolkits/tk85/Makefile Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/x11-toolkits/tk85/Makefile Fri Aug 3 09:17:41 2012 (r301943)
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME= tk
> -PORTVERSION= 8.5.11
> +PORTVERSION= 8.5.12
> CATEGORIES= x11-toolkits
> MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
> PKGNAMESUFFIX?= ${THREADS_SUFFIX}
> @@ -37,9 +37,12 @@ SUB_FILES= pkgIndex.tcl
> .if !defined(BUILDING_TK_THREADS)
> USE_TCL= ${SHORT_TK_VER}
>
> -OPTIONS= TK85_MAN "Install tk 8.5 function manpages" off \
> - XFT "Use Xft fonts" on \
> - DEMOS "Install demos" off
> +OPTIONS_DEFINE= TK85_MAN XFT DEMOS
> +OPTIONS_DEFAULT= XFT
> +TK85_MAN_DESC= Install tk 8.5 function manpages
> +XFT_DESC= Use Xft fonts
> +DEMOS_DESC= Install demos
> +
> .else
> USE_TK= ${SHORT_TK_VER}
> PLIST= ${PKGDIR}/pkg-plist.threads
>
> Modified: head/x11-toolkits/tk85/distinfo
> ==============================================================================
> --- head/x11-toolkits/tk85/distinfo Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/x11-toolkits/tk85/distinfo Fri Aug 3 09:17:41 2012 (r301943)
> @@ -1,2 +1,2 @@
> -SHA256 (tk8.5.11-src.tar.gz) = d35810b33a0931656f1d128e7e0776cc0c4d8b9c72af322cab5a7ee30485eb70
> -SIZE (tk8.5.11-src.tar.gz) = 3809826
> +SHA256 (tk8.5.12-src.tar.gz) = c453d820925bf526bbe8a0d1c17ab3168b076fcb9844bea797ad75e3b9ad9291
> +SIZE (tk8.5.12-src.tar.gz) = 3826062
>
> Modified: head/x11-toolkits/tk85/files/patch-unix::Makefile.in
> ==============================================================================
> --- head/x11-toolkits/tk85/files/patch-unix::Makefile.in Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/x11-toolkits/tk85/files/patch-unix::Makefile.in Fri Aug 3 09:17:41 2012 (r301943)
> @@ -1,6 +1,6 @@
> ---- Makefile.in.orig 2010-09-02 20:12:14.000000000 +0200
> -+++ Makefile.in 2010-09-17 16:52:49.592479499 +0200
> -@@ -65,6 +65,8 @@
> +--- Makefile.in.orig 2012-07-25 18:45:53.000000000 +0200
> ++++ Makefile.in 2012-08-02 15:34:29.280510279 +0200
> +@@ -64,6 +64,8 @@
>
> # Directory in which to install the include file tk.h:
> INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
> @@ -9,7 +9,7 @@
>
> # Path to the private tk header dir:
> PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
> -@@ -101,7 +103,7 @@
> +@@ -100,7 +102,7 @@
> # The directory containing the Tcl sources and headers appropriate
> # for this version of Tk ("srcdir" will be replaced or has already
> # been replaced by the configure script):
> @@ -18,7 +18,7 @@
>
> # The directory containing the platform specific Tcl sources and headers
> # appropriate for this version of Tk:
> -@@ -115,7 +117,7 @@
> +@@ -114,7 +116,7 @@
> TCL_LIB_FLAG = @TCL_LIB_FLAG@
>
> # Flag, 1: we're building a shared lib, 0 we're not
> @@ -27,7 +27,7 @@
>
> # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
> TK_PKG_DIR = @TK_PKG_DIR@
> -@@ -138,7 +140,7 @@
> +@@ -137,7 +139,7 @@
> #CFLAGS = $(CFLAGS_DEBUG)
> #CFLAGS = $(CFLAGS_OPTIMIZE)
> #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
> @@ -36,7 +36,7 @@
>
> # Flags to pass to the linker
> LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
> -@@ -271,7 +273,7 @@
> +@@ -272,7 +274,7 @@
> STLIB_LD = @STLIB_LD@
> SHLIB_LD = @SHLIB_LD@
> SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
> @@ -45,16 +45,16 @@
>
> # Additional search flags needed to find the various shared libraries
> # at run-time. The first symbol is for use when creating a binary
> -@@ -554,6 +556,8 @@
> - $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
> - $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM at _PRIVATE_HDRS)
> +@@ -557,6 +559,8 @@
> +
> + DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
>
> +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntDecls.h tkIntXlibDecls.h
> +
> - DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget
> -
> SHELL_ENV = \
> -@@ -579,6 +583,12 @@
> + @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
> + export @LD_LIBRARY_PATH_VAR@; \
> +@@ -580,6 +584,12 @@
> ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
> rm -f $@
> @MAKE_LIB@
> @@ -67,51 +67,55 @@
>
> ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
> rm -f $@
> -@@ -685,7 +695,7 @@
> - valgrindshell: tktest at EXEEXT@
> - $(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest at EXEEXT@ $(SCRIPT)
> +@@ -690,7 +700,7 @@
> + valgrindshell: $(TKTEST_EXE)
> + $(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(SCRIPT)
>
> -INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
> +INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
>
> install: $(INSTALL_TARGETS)
>
> -@@ -698,7 +708,7 @@
> +@@ -703,7 +713,7 @@
> # some ranlibs write to current directory, and this might not always be
> # possible (e.g. if installing as root).
>
> --install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) wish at EXEEXT@
> -+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) wish at EXEEXT@ libtk${SHORT_TK_VER}.a
> +-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
> ++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} libtk${SHORT_TK_VER}.a
> @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
> "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
> do \
> -@@ -725,10 +735,15 @@
> - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
> +@@ -738,14 +748,19 @@
> + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
> @@INSTALL_LIB@
> - @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
> -+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
> + @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
> ++ @ln -sf $(DLL_INSTALL_DIR)/$(TK_LIB_FILE) $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
> + @echo "Installing libtk${SHORT_TK_VER}.a"
> -+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
> -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
> - @echo "Installing wish at EXEEXT@ as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
> - @$(INSTALL_PROGRAM) wish at EXEEXT@ "$(BIN_INSTALL_DIR)"/wish$(VERSION)@EXEEXT@
> ++ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
> ++ @chmod 555 $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
> + @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
> + $(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
> + chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
> + fi
> + @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
> + @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
> - @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
> -- @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)"/tkConfig.sh
> +- @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
> + @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/tk$(VERSION)"
> + @mkdir -p "$(CONFIG_INSTALL_DIR)"/tk$(VERSION)
> + @$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tk$(VERSION)/tkConfig.sh
> @if test "$(STUB_LIB_FILE)" != "" ; then \
> echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
> @INSTALL_STUB_LIB@ ; \
> -@@ -739,6 +754,7 @@
> +@@ -756,6 +771,7 @@
> @if test "$(@TK_WINDOWINGSYSTEM at _XLIB_HDRS)" != ""; then \
> - XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
> + XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)/X11"; fi; \
> for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
> + "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \
> - "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
> - "$(SCRIPT_INSTALL_DIR)"/msgs "$(SCRIPT_INSTALL_DIR)"/ttk; \
> + "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
> + "$(SCRIPT_INSTALL_DIR)/msgs" "$(SCRIPT_INSTALL_DIR)/ttk"; \
> do \
> -@@ -753,10 +769,14 @@
> +@@ -770,10 +786,14 @@
> chmod +x $(SRC_DIR)/install-sh; \
> fi
> @echo "Installing header files";
> @@ -128,8 +132,8 @@
> +
> @list='$(@TK_WINDOWINGSYSTEM at _XLIB_HDRS)'; for i in $$list ; \
> do \
> - $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
> -@@ -829,19 +849,15 @@
> + $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \
> +@@ -850,19 +870,15 @@
> else true; \
> fi; \
> done;
>
> Modified: head/x11-toolkits/tk85/pkg-plist
> ==============================================================================
> --- head/x11-toolkits/tk85/pkg-plist Fri Aug 3 07:03:55 2012 (r301942)
> +++ head/x11-toolkits/tk85/pkg-plist Fri Aug 3 09:17:41 2012 (r301943)
> @@ -104,7 +104,6 @@ lib/tk%%TK_VER%%/console.tcl
> %%DEMOS%%lib/tk%%TK_VER%%/demos/sayings.tcl
> %%DEMOS%%lib/tk%%TK_VER%%/demos/search.tcl
> %%DEMOS%%lib/tk%%TK_VER%%/demos/spin.tcl
> -%%DEMOS%%lib/tk%%TK_VER%%/demos/square
> %%DEMOS%%lib/tk%%TK_VER%%/demos/states.tcl
> %%DEMOS%%lib/tk%%TK_VER%%/demos/style.tcl
> %%DEMOS%%lib/tk%%TK_VER%%/demos/tclIndex
> _______________________________________________
> svn-ports-all at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
--
Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net> <sunpoet at FreeBSD.org>
4096R/CC57E36B 8AD8 68F2 7D2B 0A10 7E9B 8CC0 DC44 247E CC57 E36B
http://people.FreeBSD.org/~sunpoet/pgpkeys.txt
More information about the svn-ports-head
mailing list