Date: Tue, 4 Jun 2013 10:37:26 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319853 - in head: lang/tcl84 lang/tcl84/files x11-toolkits/tk84 x11-toolkits/tk84/files Message-ID: <201306041037.r54AbQoZ047495@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Jun 4 10:37:25 2013 New Revision: 319853 URL: http://svnweb.freebsd.org/changeset/ports/319853 Log: - Update to 8.4.20 Release notes: http://www.tcl.tk/software/tcltk/8.4.html This is the twentieth and *FINAL* patch release of Tcl/Tk 8.4. With this release, support for Tcl/Tk 8.4 comes to an end. These ports are going to be deprecated soon. Please use 8.5 or 8.6. Deleted: head/x11-toolkits/tk84/files/extra-lastevent-patch Modified: head/lang/tcl84/Makefile head/lang/tcl84/Makefile.man head/lang/tcl84/distinfo (contents, props changed) head/lang/tcl84/files/patch-aa head/lang/tcl84/files/patch-configure (contents, props changed) head/lang/tcl84/pkg-plist head/x11-toolkits/tk84/Makefile head/x11-toolkits/tk84/distinfo (contents, props changed) head/x11-toolkits/tk84/files/patch-aa (contents, props changed) head/x11-toolkits/tk84/files/patch-ab head/x11-toolkits/tk84/pkg-plist Modified: head/lang/tcl84/Makefile ============================================================================== --- head/lang/tcl84/Makefile Tue Jun 4 10:37:12 2013 (r319852) +++ head/lang/tcl84/Makefile Tue Jun 4 10:37:25 2013 (r319853) @@ -2,12 +2,13 @@ # $FreeBSD$ PORTNAME= tcl -PORTVERSION= 8.4.19 -PORTREVISION= 4 +DISTVERSION= 8.4.20 PORTEPOCH= 1 CATEGORIES= lang tcl -MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} -DISTNAME= ${PORTNAME}${PORTVERSION}-src +MASTER_SITES= ${MASTER_SITE_TCLTK} \ + SF/tcl/Tcl/${PORTVERSION} +MASTER_SITE_SUBDIR= tcl8_4 +DISTNAME= ${PORTNAME}${DISTVERSION}-src MAINTAINER= tcltk@FreeBSD.org COMMENT= Tool Command Language Modified: head/lang/tcl84/Makefile.man ============================================================================== --- head/lang/tcl84/Makefile.man Tue Jun 4 10:37:12 2013 (r319852) +++ head/lang/tcl84/Makefile.man Tue Jun 4 10:37:25 2013 (r319853) @@ -237,7 +237,6 @@ MAN3= TCL_MEM_DEBUG.${MAN_SUFFIX}.3 \ Tcl_GetMaster.${MAN_SUFFIX}.3 \ Tcl_GetMathFuncInfo.${MAN_SUFFIX}.3 \ Tcl_GetNameOfExecutable.${MAN_SUFFIX}.3 \ - Tcl_GetOSTypeFromObj.${MAN_SUFFIX}.3 \ Tcl_GetObjResult.${MAN_SUFFIX}.3 \ Tcl_GetObjType.${MAN_SUFFIX}.3 \ Tcl_GetOpenFile.${MAN_SUFFIX}.3 \ @@ -298,10 +297,6 @@ MAN3= TCL_MEM_DEBUG.${MAN_SUFFIX}.3 \ Tcl_ListObjLength.${MAN_SUFFIX}.3 \ Tcl_ListObjReplace.${MAN_SUFFIX}.3 \ Tcl_LogCommandInfo.${MAN_SUFFIX}.3 \ - Tcl_MacConvertTextResource.${MAN_SUFFIX}.3 \ - Tcl_MacEvalResource.${MAN_SUFFIX}.3 \ - Tcl_MacFindResource.${MAN_SUFFIX}.3 \ - Tcl_MacSetEventProc.${MAN_SUFFIX}.3 \ Tcl_Main.${MAN_SUFFIX}.3 \ Tcl_MakeFileChannel.${MAN_SUFFIX}.3 \ Tcl_MakeSafe.${MAN_SUFFIX}.3 \ @@ -316,7 +311,6 @@ MAN3= TCL_MEM_DEBUG.${MAN_SUFFIX}.3 \ Tcl_NewIntObj.${MAN_SUFFIX}.3 \ Tcl_NewListObj.${MAN_SUFFIX}.3 \ Tcl_NewLongObj.${MAN_SUFFIX}.3 \ - Tcl_NewOSTypeObj.${MAN_SUFFIX}.3 \ Tcl_NewObj.${MAN_SUFFIX}.3 \ Tcl_NewStringObj.${MAN_SUFFIX}.3 \ Tcl_NewUnicodeObj.${MAN_SUFFIX}.3 \ @@ -394,7 +388,6 @@ MAN3= TCL_MEM_DEBUG.${MAN_SUFFIX}.3 \ Tcl_SetLongObj.${MAN_SUFFIX}.3 \ Tcl_SetMainLoop.${MAN_SUFFIX}.3 \ Tcl_SetMaxBlockTime.${MAN_SUFFIX}.3 \ - Tcl_SetOSTypeObj.${MAN_SUFFIX}.3 \ Tcl_SetObjErrorCode.${MAN_SUFFIX}.3 \ Tcl_SetObjLength.${MAN_SUFFIX}.3 \ Tcl_SetObjResult.${MAN_SUFFIX}.3 \ @@ -581,7 +574,6 @@ MANN= SafeBase.${MAN_SUFFIX}.n \ registry.${MAN_SUFFIX}.n \ regsub.${MAN_SUFFIX}.n \ rename.${MAN_SUFFIX}.n \ - resource.${MAN_SUFFIX}.n \ return.${MAN_SUFFIX}.n \ scan.${MAN_SUFFIX}.n \ seek.${MAN_SUFFIX}.n \ Modified: head/lang/tcl84/distinfo ============================================================================== --- head/lang/tcl84/distinfo Tue Jun 4 10:37:12 2013 (r319852) +++ head/lang/tcl84/distinfo Tue Jun 4 10:37:25 2013 (r319853) @@ -1,2 +1,2 @@ -SHA256 (tcl8.4.19-src.tar.gz) = 1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9 -SIZE (tcl8.4.19-src.tar.gz) = 3658647 +SHA256 (tcl8.4.20-src.tar.gz) = fcb317b65c69f1d6962057c5622a80980bc22ffadf25c1cc50b6d02ff6c2cf40 +SIZE (tcl8.4.20-src.tar.gz) = 3173758 Modified: head/lang/tcl84/files/patch-aa ============================================================================== --- head/lang/tcl84/files/patch-aa Tue Jun 4 10:37:12 2013 (r319852) +++ head/lang/tcl84/files/patch-aa Tue Jun 4 10:37:25 2013 (r319853) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2008-04-17 22:29:49.000000000 +0200 -+++ Makefile.in 2009-02-26 11:41:29.840998305 +0100 -@@ -57,6 +57,8 @@ +--- Makefile.in.orig 2013-05-28 17:05:26.000000000 +0200 ++++ Makefile.in 2013-06-03 14:45:07.000000000 +0200 +@@ -56,6 +56,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@ -@@ -102,7 +104,7 @@ +@@ -101,7 +103,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@ -@@ -469,7 +471,8 @@ +@@ -468,7 +470,8 @@ all: binaries libraries doc @@ -28,7 +28,7 @@ libraries: -@@ -480,6 +483,15 @@ +@@ -479,6 +482,15 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f $@ @MAKE_LIB@ @@ -44,7 +44,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -606,7 +618,7 @@ +@@ -605,7 +617,7 @@ dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) @@ -53,10 +53,14 @@ install: $(INSTALL_TARGETS) -@@ -635,6 +647,12 @@ - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" +@@ -631,9 +643,15 @@ + @if test ! -x $(SRC_DIR)/install-sh; then \ + chmod +x $(SRC_DIR)/install-sh; \ + fi +- @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" ++ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" @@INSTALL_LIB@ - @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) + @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE) + @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so + @echo "Installing libtcl${SHORT_TCL_VER}.a" + @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \ @@ -66,7 +70,7 @@ @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -642,8 +660,9 @@ +@@ -641,8 +659,9 @@ fi @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @@ -78,17 +82,17 @@ @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -651,7 +670,8 @@ +@@ -668,7 +687,8 @@ @EXTRA_INSTALL_BINARIES@ install-libraries: libraries -- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ -+ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ -+ $(SCRIPT_INSTALL_DIR); \ +- @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \ ++ @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \ ++ "$(SCRIPT_INSTALL_DIR)"; \ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -673,11 +693,17 @@ +@@ -690,11 +710,17 @@ chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing header files"; Modified: head/lang/tcl84/files/patch-configure ============================================================================== --- head/lang/tcl84/files/patch-configure Tue Jun 4 10:37:12 2013 (r319852) +++ head/lang/tcl84/files/patch-configure Tue Jun 4 10:37:25 2013 (r319853) @@ -1,6 +1,6 @@ ---- configure.orig 2008-04-17 22:29:49.000000000 +0200 -+++ configure 2010-12-09 09:23:49.635333169 +0100 -@@ -2570,7 +2570,7 @@ +--- configure.orig 2013-05-28 17:05:26.000000000 +0200 ++++ configure 2013-06-03 14:49:34.000000000 +0200 +@@ -2589,7 +2589,7 @@ LDFLAGS_ORIG="$LDFLAGS" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" @@ -9,37 +9,3 @@ ECHO_VERSION='`echo ${VERSION}`' TCL_LIB_VERSIONS_OK=ok CFLAGS_DEBUG=-g -@@ -3434,25 +3434,26 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="${CC} -shared" -+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="$LDFLAGS -export-dynamic" -+ LDFLAGS="" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - if test "${TCL_THREADS}" = "1" ; then -- # The -pthread needs to go in the CFLAGS, not LIBS -+ # The -pthread needs to go in the LDFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` -- CFLAGS="$CFLAGS -pthread" -- LDFLAGS="$LDFLAGS -pthread" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS" - fi - case $system in -- FreeBSD-3.*) -+ FreeBSD-*) - # FreeBSD-3 doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - esac Modified: head/lang/tcl84/pkg-plist ============================================================================== --- head/lang/tcl84/pkg-plist Tue Jun 4 10:37:12 2013 (r319852) +++ head/lang/tcl84/pkg-plist Tue Jun 4 10:37:25 2013 (r319853) @@ -115,6 +115,9 @@ lib/tcl%%TCL_VER%%/msgcat1.3/msgcat.tcl lib/tcl%%TCL_VER%%/msgcat1.3/pkgIndex.tcl lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl +lib/tcl%%TCL_VER%%/platform/pkgIndex.tcl +lib/tcl%%TCL_VER%%/platform/platform.tcl +lib/tcl%%TCL_VER%%/platform/shell.tcl lib/tcl%%TCL_VER%%/package.tcl lib/tcl%%TCL_VER%%/parray.tcl lib/tcl%%TCL_VER%%/safe.tcl @@ -125,6 +128,7 @@ lib/tcl%%TCL_VER%%/tcltest2.2/pkgIndex.t lib/tcl%%TCL_VER%%/tcltest2.2/tcltest.tcl lib/tcl%%TCL_VER%%/word.tcl @dirrm lib/tcl%%TCL_VER%%/tcltest2.2 +@dirrm lib/tcl%%TCL_VER%%/platform @dirrm lib/tcl%%TCL_VER%%/opt0.4 @dirrm lib/tcl%%TCL_VER%%/msgcat1.3 @dirrm lib/tcl%%TCL_VER%%/http2.5 Modified: head/x11-toolkits/tk84/Makefile ============================================================================== --- head/x11-toolkits/tk84/Makefile Tue Jun 4 10:37:12 2013 (r319852) +++ head/x11-toolkits/tk84/Makefile Tue Jun 4 10:37:25 2013 (r319853) @@ -1,11 +1,11 @@ # $FreeBSD$ PORTNAME= tk -PORTVERSION= 8.4.19 -PORTREVISION= 3 +PORTVERSION= 8.4.20 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk -MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_TCLTK} \ + SF/tcl/Tcl/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org @@ -69,7 +69,6 @@ post-patch: s|@TK_BUILD_STUB_LIB_PATH@|@TK_STUB_LIB_PATH@|; \ s|@TK_SRC_DIR@|${PREFIX}/include/tk${TK_VER}|' \ ${WRKSRC}/tkConfig.sh.in - @(cd ${WRKSRC}/..; ${PATCH} -p0 < ${PATCHDIR}/extra-lastevent-patch) @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in Modified: head/x11-toolkits/tk84/distinfo ============================================================================== --- head/x11-toolkits/tk84/distinfo Tue Jun 4 10:37:12 2013 (r319852) +++ head/x11-toolkits/tk84/distinfo Tue Jun 4 10:37:25 2013 (r319853) @@ -1,2 +1,2 @@ -SHA256 (tk8.4.19-src.tar.gz) = d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f -SIZE (tk8.4.19-src.tar.gz) = 3362694 +SHA256 (tk8.4.20-src.tar.gz) = 61f8a8dcbfb959986439b8e30a86688376671b8b3cac77b466671bbfaef244bd +SIZE (tk8.4.20-src.tar.gz) = 2957023 Modified: head/x11-toolkits/tk84/files/patch-aa ============================================================================== --- head/x11-toolkits/tk84/files/patch-aa Tue Jun 4 10:37:12 2013 (r319852) +++ head/x11-toolkits/tk84/files/patch-aa Tue Jun 4 10:37:25 2013 (r319853) @@ -1,39 +1,5 @@ --- configure.orig 2008-04-17 17:14:08.000000000 +0200 +++ configure 2010-12-09 09:27:23.108864895 +0100 -@@ -2929,25 +2929,26 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" -+ SHLIB_LD="${CC} -shared" - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="$LDFLAGS -export-dynamic" -+ LDFLAGS="" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - if test "${TCL_THREADS}" = "1" ; then -- # The -pthread needs to go in the CFLAGS, not LIBS -+ # The -pthread needs to go in the LDFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` -- CFLAGS="$CFLAGS -pthread" -- LDFLAGS="$LDFLAGS -pthread" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS" - fi - case $system in -- FreeBSD-3.*) -+ FreeBSD-*) - # FreeBSD-3 doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - esac @@ -3427,6 +3428,7 @@ #define _POSIX_PTHREAD_SEMANTICS 1 EOF Modified: head/x11-toolkits/tk84/files/patch-ab ============================================================================== --- head/x11-toolkits/tk84/files/patch-ab Tue Jun 4 10:37:12 2013 (r319852) +++ head/x11-toolkits/tk84/files/patch-ab Tue Jun 4 10:37:25 2013 (r319853) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2008-04-17 17:14:08.000000000 +0200 -+++ Makefile.in 2013-01-11 14:38:01.000000000 +0100 -@@ -64,6 +64,8 @@ +--- Makefile.in.orig 2013-06-03 19:29:08.000000000 +0200 ++++ Makefile.in 2013-06-04 11:31:11.000000000 +0200 +@@ -63,6 +63,8 @@ # Directory in which to install the include file tk.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -9,25 +9,25 @@ # Path to the private tk header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -94,7 +96,7 @@ +@@ -99,7 +101,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): -TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic +TCL_GENERIC_DIR = @prefix@/include/tcl@TCL_VERSION@/generic - # The directory containing the Tcl library archive file appropriate - # for this version of Tk: -@@ -107,7 +109,7 @@ + # The directory containing the platform specific Tcl sources and headers + # appropriate for this version of Tk: +@@ -116,7 +118,7 @@ TK_DBGX = @TK_DBGX@ # Flag, 1: we're building a shared lib, 0 we're not -TK_SHARED_BUILD = @TK_SHARED_BUILD@ -+TK_SHARED_BUILD = #@TK_SHARED_BUILD@ ++TK_SHARED_BUILD = ##@TK_SHARED_BUILD@ # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk TK_PKG_DIR = @TK_PKG_DIR@ -@@ -130,7 +132,7 @@ +@@ -139,7 +141,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) @@ -36,25 +36,16 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -265,7 +267,7 @@ - STLIB_LD = @STLIB_LD@ - SHLIB_LD = @SHLIB_LD@ - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ --TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ -+TK_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@ - - # Additional search flags needed to find the various shared libraries - # at run-time. The first symbol is for use when creating a binary -@@ -478,6 +480,8 @@ - default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \ - tkPort.h tkScrollbar.h tkText.h +@@ -498,6 +500,8 @@ + $(GENERIC_DIR)/tkIntPlatDecls.h \ + $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h + DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget - all: binaries libraries doc -@@ -497,6 +501,12 @@ + SHELL_ENV = \ +@@ -523,6 +527,12 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ rm -f $@ @MAKE_LIB@ @@ -67,26 +58,25 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -602,7 +612,7 @@ - gdb ./wish --command=gdb.run - rm gdb.run +@@ -630,7 +640,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 install-demos @EXTRA_INSTALL@ install: $(INSTALL_TARGETS) -@@ -615,7 +625,8 @@ +@@ -643,7 +653,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) $(TK_BUILD_EXP_FILE) wish -+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \ -+ libtk${SHORT_TK_VER}.a wish - @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \ +-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) ${WISH_EXE} ++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a ${WISH_EXE} + @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \ do \ - if [ ! -d $$i ] ; then \ -@@ -646,10 +657,15 @@ + if [ ! -d "$$i" ] ; then \ +@@ -686,20 +696,26 @@ $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ $(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \ fi @@ -94,48 +84,54 @@ + @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 as $(BIN_INSTALL_DIR)/wish$(VERSION)" - @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) -- @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" -- @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh + @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)" + @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)" +- @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" +- @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" + @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/tk$(VERSION)" + @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION) -+ @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh ++ @$(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@ ; \ -@@ -660,6 +676,7 @@ +- fi ++ fi; + @EXTRA_INSTALL_BINARIES@ + + install-libraries: libraries @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ - 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; \ + 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"; \ do \ -@@ -674,11 +691,14 @@ +@@ -714,14 +730,13 @@ chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ -- $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) ; \ +- @for i in $(PUBLIC_HDRS); \ + ${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h $(GENERIC_INCLUDE_INSTALL_DIR)/ -+ ${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h $(UNIX_INCLUDE_INSTALL_DIR)/ ++ ${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h $(UNIX_INCLUDE_INSTALL_DIR) + @for i in $(INSTALL_HDRS) ; \ do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ +- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ +- done; +- @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ +- do \ +- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \ - done; + j=`basename $$i` ; \ + ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \ + done -+ - @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ - do \ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \ -@@ -750,6 +770,7 @@ + @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; + @for i in $(TOP_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ + $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ +@@ -793,6 +808,7 @@ fi; \ done; @echo "Installing and cross-linking top-level (.1) docs"; + @mv $(TOP_DIR)/doc/wish.1 $(TOP_DIR)/doc/wish${TCL_VER}.1 @for i in $(TOP_DIR)/doc/*.1; do \ - $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \ + $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ done Modified: head/x11-toolkits/tk84/pkg-plist ============================================================================== --- head/x11-toolkits/tk84/pkg-plist Tue Jun 4 10:37:12 2013 (r319852) +++ head/x11-toolkits/tk84/pkg-plist Tue Jun 4 10:37:25 2013 (r319853) @@ -95,7 +95,6 @@ lib/tk%%TK_VER%%/demos/ruler.tcl lib/tk%%TK_VER%%/demos/sayings.tcl lib/tk%%TK_VER%%/demos/search.tcl lib/tk%%TK_VER%%/demos/spin.tcl -lib/tk%%TK_VER%%/demos/square lib/tk%%TK_VER%%/demos/states.tcl lib/tk%%TK_VER%%/demos/style.tcl lib/tk%%TK_VER%%/demos/tclIndex
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306041037.r54AbQoZ047495>