cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 8.5.2

Browse Source
This commit is contained in:
Martin Matuska 2008-04-02 12:02:41 +00:00
parent 66c8639175
commit a87b3f53eb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=210378
18 changed files with 186 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/tcl85/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= tcl
PORTVERSION= 8.5.1
PORTVERSION= 8.5.2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
@ -711,8 +711,8 @@ post-patch:
-e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \
-e 's|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
-e 's|$$(SCRIPT_INSTALL_DIR)/tclConfig.sh|$$(SCRIPT_INSTALL_DIR)/tclConfig${THREADS_SUFFIX}.sh|g' \
-e 's|/tclsh$$(VERSION)|/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
-e 's|/tclConfig.sh|/tclConfig${THREADS_SUFFIX}.sh|g' \
${WRKSRC}/Makefile.in
.endif

6
lang/tcl85/distinfo
View File

@ -1,3 +1,3 @@
MD5 (tcl8.5.1-src.tar.gz) = 1b5f9a043f53c5828dcde3684e3264d5
SHA256 (tcl8.5.1-src.tar.gz) = 691620f7f31cbc551158111080861bc05e4a86c29932232334c74787073b0c94
SIZE (tcl8.5.1-src.tar.gz) = 4357002
MD5 (tcl8.5.2-src.tar.gz) = 2eeff7a61844b3e6de5202da1275cff1
SHA256 (tcl8.5.2-src.tar.gz) = df65f8dc634f7eef059753a8859629da5119f3e8647136b9d6ce6479b00b75cb
SIZE (tcl8.5.2-src.tar.gz) = 4372573

20
lang/tcl85/files/patch-tests-fCmd.test
View File

@ -1,20 +0,0 @@
--- ../tests/fCmd.test.orig Mon Nov 13 20:46:35 2006
+++ ../tests/fCmd.test Sun Apr 29 21:31:35 2007
@@ -572,7 +572,7 @@
set msg
} {1 {error copying "td2" to "~/td1/td2": permission denied}}
test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} \
- {unix notRoot} {
+ -constraints {unixOnly notRoot} -match regexp -body {
cleanup
file mkdir ~/td1/td2
set td2name [file join [file dirname ~] [file tail ~] td1 td2]
@@ -581,7 +581,7 @@
file attributes $td2name -permissions 0755
file delete -force ~/td1
set msg
-} "1 {error copying \"~/td1\" to \"td1\": \"[file join $::env(HOME) td1 td2]\": permission denied}"
+} -result "1 {error copying \"~/td1\" to \"td1\": \".*[file join $::env(HOME) td1 td2]\": permission denied}"
test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} \
{unix notRoot xdev} {
cleanup /tmp

78
lang/tcl85/files/patch-unix-Makefile.in
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Thu Apr 26 19:33:51 2007
+++ Makefile.in Sun Apr 29 22:33:58 2007
@@ -54,6 +54,8 @@
--- Makefile.in.orig 2008-03-28 19:41:53.000000000 +0100
+++ Makefile.in 2008-04-02 11:49:46.000000000 +0200
@@ -55,6 +55,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@
@@ -97,7 +99,7 @@
@@ -98,7 +100,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@
@@ -540,7 +542,8 @@
@@ -538,7 +540,8 @@
all: binaries libraries doc
@ -28,7 +28,7 @@
libraries:
@@ -551,6 +554,15 @@
@@ -549,6 +552,15 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f $@
@MAKE_LIB@
@ -44,7 +44,7 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@@ -699,7 +711,7 @@
@@ -697,7 +709,7 @@
dltest.marker: ${STUB_LIB_FILE}
cd dltest ; $(MAKE)
@ -53,43 +53,43 @@
install: $(INSTALL_TARGETS)
@@ -728,6 +740,13 @@
@@ -726,6 +738,13 @@
@echo "Installing $(LIB_FILE) to $(LIB_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 "$(LIB_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 \
+ $(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
+ "$(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
+
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
@@ -735,8 +754,9 @@
@@ -733,8 +752,9 @@
fi
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)
- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
- @$(INSTALL_DATA) tclConfig.sh "$(LIB_INSTALL_DIR)"/tclConfig.sh
+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
+ @mkdir -p $(SCRIPT_INSTALL_DIR)
+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
+ @mkdir -p "$(SCRIPT_INSTALL_DIR)"
+ @$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
@@ -744,7 +764,8 @@
@@ -742,7 +762,8 @@
@EXTRA_INSTALL_BINARIES@
install-libraries: libraries $(INSTALL_TZDATA) install-msgs
- @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 \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -766,13 +787,17 @@
@@ -764,13 +785,17 @@
chmod +x $(SRC_DIR)/../unix/install-sh; \
fi
@echo "Installing header files";
@ -99,37 +99,37 @@
- $(GENERIC_DIR)/tclTomMathDecls.h ; \
+ @for i in $(GENERIC_DIR)/*.h ; \
+ do \
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
+ done;
+ @for i in $(UNIX_DIR)/*.h ; \
do \
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
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
+ @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 $(UNIX_DIR)/ldAix; \
do \
@@ -839,18 +864,27 @@
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
$(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \
@@ -838,18 +863,27 @@
done;
@echo "Installing and cross-linking top-level (.1) docs";
@for i in $(TOP_DIR)/doc/*.1; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MAN1_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MAN1_INSTALL_DIR)"; \
done
@echo "Installing and cross-linking C API (.3) docs";
@for i in $(TOP_DIR)/doc/*.3; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MAN3_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MAN3_INSTALL_DIR)"; \
done
@echo "Installing and cross-linking command (.n) docs";
@for i in $(TOP_DIR)/doc/*.n; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
done
+
+ @echo "**********"

8
lang/tcl85/pkg-plist
View File

@ -355,6 +355,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Mendoza
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Rio_Gallegos
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Juan
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Luis
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Tucuman
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Ushuaia
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Anguilla
@ -425,6 +426,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Maceio
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Managua
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Manaus
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Marigot
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Martinique
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mazatlan
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mendoza
@ -463,6 +465,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Sao_Paulo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Scoresbysund
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Shiprock
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Barthelemy
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Johns
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Kitts
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Lucia
@ -485,6 +488,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Knox
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Marengo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Petersburg
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Tell_City
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vevay
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vincennes
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Winamac
@ -531,6 +535,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Dushanbe
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Gaza
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Harbin
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ho_Chi_Minh
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Hong_Kong
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Hovd
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Irkutsk
@ -543,6 +548,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Karachi
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kashgar
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Katmandu
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kolkata
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Krasnoyarsk
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kuala_Lumpur
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kuching
@ -811,7 +817,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa
lib/tcl%%TCL_VER%%/word.tcl
lib/tcl8/8.4/http-2.5.3.tm
lib/tcl8/8.4/http-2.7.tm
lib/tcl8/8.4/platform/shell-1.1.3.tm
lib/tcl8/8.4/platform-1.0.3.tm
lib/tcl8/8.5/msgcat-1.4.2.tm

6
lang/tcl86/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= tcl
PORTVERSION= 8.5.1
PORTVERSION= 8.5.2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
@ -711,8 +711,8 @@ post-patch:
-e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \
-e 's|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
-e 's|$$(SCRIPT_INSTALL_DIR)/tclConfig.sh|$$(SCRIPT_INSTALL_DIR)/tclConfig${THREADS_SUFFIX}.sh|g' \
-e 's|/tclsh$$(VERSION)|/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
-e 's|/tclConfig.sh|/tclConfig${THREADS_SUFFIX}.sh|g' \
${WRKSRC}/Makefile.in
.endif

6
lang/tcl86/distinfo
View File

@ -1,3 +1,3 @@
MD5 (tcl8.5.1-src.tar.gz) = 1b5f9a043f53c5828dcde3684e3264d5
SHA256 (tcl8.5.1-src.tar.gz) = 691620f7f31cbc551158111080861bc05e4a86c29932232334c74787073b0c94
SIZE (tcl8.5.1-src.tar.gz) = 4357002
MD5 (tcl8.5.2-src.tar.gz) = 2eeff7a61844b3e6de5202da1275cff1
SHA256 (tcl8.5.2-src.tar.gz) = df65f8dc634f7eef059753a8859629da5119f3e8647136b9d6ce6479b00b75cb
SIZE (tcl8.5.2-src.tar.gz) = 4372573

20
lang/tcl86/files/patch-tests-fCmd.test
View File

@ -1,20 +0,0 @@
--- ../tests/fCmd.test.orig Mon Nov 13 20:46:35 2006
+++ ../tests/fCmd.test Sun Apr 29 21:31:35 2007
@@ -572,7 +572,7 @@
set msg
} {1 {error copying "td2" to "~/td1/td2": permission denied}}
test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} \
- {unix notRoot} {
+ -constraints {unixOnly notRoot} -match regexp -body {
cleanup
file mkdir ~/td1/td2
set td2name [file join [file dirname ~] [file tail ~] td1 td2]
@@ -581,7 +581,7 @@
file attributes $td2name -permissions 0755
file delete -force ~/td1
set msg
-} "1 {error copying \"~/td1\" to \"td1\": \"[file join $::env(HOME) td1 td2]\": permission denied}"
+} -result "1 {error copying \"~/td1\" to \"td1\": \".*[file join $::env(HOME) td1 td2]\": permission denied}"
test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} \
{unix notRoot xdev} {
cleanup /tmp

78
lang/tcl86/files/patch-unix-Makefile.in
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Thu Apr 26 19:33:51 2007
+++ Makefile.in Sun Apr 29 22:33:58 2007
@@ -54,6 +54,8 @@
--- Makefile.in.orig 2008-03-28 19:41:53.000000000 +0100
+++ Makefile.in 2008-04-02 11:49:46.000000000 +0200
@@ -55,6 +55,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@
@@ -97,7 +99,7 @@
@@ -98,7 +100,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@
@@ -540,7 +542,8 @@
@@ -538,7 +540,8 @@
all: binaries libraries doc
@ -28,7 +28,7 @@
libraries:
@@ -551,6 +554,15 @@
@@ -549,6 +552,15 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f $@
@MAKE_LIB@
@ -44,7 +44,7 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@@ -699,7 +711,7 @@
@@ -697,7 +709,7 @@
dltest.marker: ${STUB_LIB_FILE}
cd dltest ; $(MAKE)
@ -53,43 +53,43 @@
install: $(INSTALL_TARGETS)
@@ -728,6 +740,13 @@
@@ -726,6 +738,13 @@
@echo "Installing $(LIB_FILE) to $(LIB_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 "$(LIB_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 \
+ $(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
+ "$(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
+
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
@@ -735,8 +754,9 @@
@@ -733,8 +752,9 @@
fi
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)
- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
- @$(INSTALL_DATA) tclConfig.sh "$(LIB_INSTALL_DIR)"/tclConfig.sh
+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
+ @mkdir -p $(SCRIPT_INSTALL_DIR)
+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
+ @mkdir -p "$(SCRIPT_INSTALL_DIR)"
+ @$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
@@ -744,7 +764,8 @@
@@ -742,7 +762,8 @@
@EXTRA_INSTALL_BINARIES@
install-libraries: libraries $(INSTALL_TZDATA) install-msgs
- @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 \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -766,13 +787,17 @@
@@ -764,13 +785,17 @@
chmod +x $(SRC_DIR)/../unix/install-sh; \
fi
@echo "Installing header files";
@ -99,37 +99,37 @@
- $(GENERIC_DIR)/tclTomMathDecls.h ; \
+ @for i in $(GENERIC_DIR)/*.h ; \
+ do \
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
+ done;
+ @for i in $(UNIX_DIR)/*.h ; \
do \
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
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
+ @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 $(UNIX_DIR)/ldAix; \
do \
@@ -839,18 +864,27 @@
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
$(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \
@@ -838,18 +863,27 @@
done;
@echo "Installing and cross-linking top-level (.1) docs";
@for i in $(TOP_DIR)/doc/*.1; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MAN1_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MAN1_INSTALL_DIR)"; \
done
@echo "Installing and cross-linking C API (.3) docs";
@for i in $(TOP_DIR)/doc/*.3; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MAN3_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MAN3_INSTALL_DIR)"; \
done
@echo "Installing and cross-linking command (.n) docs";
@for i in $(TOP_DIR)/doc/*.n; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
done
+
+ @echo "**********"

8
lang/tcl86/pkg-plist
View File

@ -355,6 +355,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Mendoza
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Rio_Gallegos
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Juan
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Luis
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Tucuman
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Ushuaia
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Anguilla
@ -425,6 +426,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Maceio
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Managua
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Manaus
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Marigot
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Martinique
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mazatlan
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mendoza
@ -463,6 +465,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Sao_Paulo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Scoresbysund
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Shiprock
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Barthelemy
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Johns
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Kitts
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Lucia
@ -485,6 +488,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Knox
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Marengo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Petersburg
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Tell_City
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vevay
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vincennes
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Winamac
@ -531,6 +535,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Dushanbe
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Gaza
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Harbin
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ho_Chi_Minh
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Hong_Kong
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Hovd
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Irkutsk
@ -543,6 +548,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Karachi
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kashgar
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Katmandu
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kolkata
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Krasnoyarsk
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kuala_Lumpur
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kuching
@ -811,7 +817,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa
lib/tcl%%TCL_VER%%/word.tcl
lib/tcl8/8.4/http-2.5.3.tm
lib/tcl8/8.4/http-2.7.tm
lib/tcl8/8.4/platform/shell-1.1.3.tm
lib/tcl8/8.4/platform-1.0.3.tm
lib/tcl8/8.5/msgcat-1.4.2.tm

6
x11-toolkits/tk85/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= tk
PORTVERSION= 8.5.1
PORTVERSION= 8.5.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
@ -419,8 +419,8 @@ post-patch:
-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
-e 's|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \
-e 's|tk$$(VERSION)/tkConfig.sh|tk$$(VERSION)/tkConfig${THREADS_SUFFIX}.sh|g' \
-e 's|/wish$$(VERSION)|/wish$$(VERSION)${THREADS_SUFFIX}|g' \
-e 's|/tkConfig.sh|/tkConfig${THREADS_SUFFIX}.sh|g' \
-e 's|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)|${WRKDIR}|g' \
-e 's|$$(MINOR_VERSION)$$(TCLPATCHL)|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}|g' \
${WRKSRC}/Makefile.in

6
x11-toolkits/tk85/distinfo
View File

@ -1,3 +1,3 @@
MD5 (tk8.5.1-src.tar.gz) = d95d4a180cd60b3736395bf80c7322c0
SHA256 (tk8.5.1-src.tar.gz) = d25126147f5fa8423de35cefd07b37583cf9c281a396f49450de42251e095fe7
SIZE (tk8.5.1-src.tar.gz) = 3759545
MD5 (tk8.5.2-src.tar.gz) = bd014bd3e1a818e06ad375b95241452d
SHA256 (tk8.5.2-src.tar.gz) = a2a28bb651dd1ba67fabc5be5deb120c0d75418ef84dc59ee6c0005d42e46e5a
SIZE (tk8.5.2-src.tar.gz) = 3763820

68
x11-toolkits/tk85/files/patch-unix::Makefile.in
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig 2007-12-17 18:57:25.000000000 +0100
+++ Makefile.in 2007-12-29 22:02:15.000000000 +0100
--- Makefile.in.orig 2008-03-28 19:46:36.000000000 +0100
+++ Makefile.in 2008-04-02 12:27:05.000000000 +0200
@@ -65,6 +65,8 @@
# Directory in which to install the include file tk.h:
@ -45,7 +45,7 @@
# Additional search flags needed to find the various shared libraries
# at run-time. The first symbol is for use when creating a binary
@@ -552,6 +554,8 @@
@@ -550,6 +552,8 @@
$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
$(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
@ -54,7 +54,7 @@
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
SHELL_ENV = \
@@ -577,6 +581,12 @@
@@ -575,6 +579,12 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
rm -f $@
@MAKE_LIB@
@ -67,7 +67,7 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@@ -676,7 +686,7 @@
@@ -674,7 +684,7 @@
gdb ./wish --command=gdb.run
rm gdb.run
@ -76,78 +76,78 @@
install: $(INSTALL_TARGETS)
@@ -689,7 +699,8 @@
@@ -687,7 +697,8 @@
# 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); \
@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \
do \
if [ ! -d $$i ] ; then \
@@ -721,10 +732,15 @@
if [ ! -d "$$i" ] ; then \
@@ -719,10 +730,15 @@
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
"$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
fi
+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_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 as $(BIN_INSTALL_DIR)/wish$(VERSION)"
@$(INSTALL_PROGRAM) wish $(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
- @$(INSTALL_DATA) tkConfig.sh "$(LIB_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
+ @mkdir -p "$(LIB_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@ ; \
@@ -735,6 +751,7 @@
@@ -733,6 +749,7 @@
@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 $(SCRIPT_INSTALL_DIR)/ttk; \
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; \
do \
@@ -749,10 +766,14 @@
@@ -747,10 +764,14 @@
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
- @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} $(GENERIC_DIR)/*.h "$(GENERIC_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;
+ j=`basename $$i` ; \
+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
+ 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; \
@@ -832,17 +853,17 @@
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
@@ -830,17 +851,17 @@
done;
@echo "Installing and cross-linking top-level (.1) docs";
@for i in $(TOP_DIR)/doc/*.1; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MAN1_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MAN1_INSTALL_DIR)"; \
done
@echo "Installing and cross-linking C API (.3) docs";
@for i in $(TOP_DIR)/doc/*.3; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MAN3_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MAN3_INSTALL_DIR)"; \
done
@echo "Installing and cross-linking command (.n) docs";
@for i in $(TOP_DIR)/doc/*.n; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
done
# Optional target to install private headers

1
x11-toolkits/tk85/pkg-plist
View File

@ -82,6 +82,7 @@ lib/tk%%TK_VER%%/console.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/teapot.ppm
%%DEMOS%%lib/tk%%TK_VER%%/demos/items.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/ixset
%%DEMOS%%lib/tk%%TK_VER%%/demos/knightstour.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/label.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/labelframe.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/license.terms

6
x11-toolkits/tk86/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= tk
PORTVERSION= 8.5.1
PORTVERSION= 8.5.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
@ -419,8 +419,8 @@ post-patch:
-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
-e 's|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \
-e 's|tk$$(VERSION)/tkConfig.sh|tk$$(VERSION)/tkConfig${THREADS_SUFFIX}.sh|g' \
-e 's|/wish$$(VERSION)|/wish$$(VERSION)${THREADS_SUFFIX}|g' \
-e 's|/tkConfig.sh|/tkConfig${THREADS_SUFFIX}.sh|g' \
-e 's|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)|${WRKDIR}|g' \
-e 's|$$(MINOR_VERSION)$$(TCLPATCHL)|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}|g' \
${WRKSRC}/Makefile.in

6
x11-toolkits/tk86/distinfo
View File

@ -1,3 +1,3 @@
MD5 (tk8.5.1-src.tar.gz) = d95d4a180cd60b3736395bf80c7322c0
SHA256 (tk8.5.1-src.tar.gz) = d25126147f5fa8423de35cefd07b37583cf9c281a396f49450de42251e095fe7
SIZE (tk8.5.1-src.tar.gz) = 3759545
MD5 (tk8.5.2-src.tar.gz) = bd014bd3e1a818e06ad375b95241452d
SHA256 (tk8.5.2-src.tar.gz) = a2a28bb651dd1ba67fabc5be5deb120c0d75418ef84dc59ee6c0005d42e46e5a
SIZE (tk8.5.2-src.tar.gz) = 3763820

68
x11-toolkits/tk86/files/patch-unix::Makefile.in
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig 2007-12-17 18:57:25.000000000 +0100
+++ Makefile.in 2007-12-29 22:02:15.000000000 +0100
--- Makefile.in.orig 2008-03-28 19:46:36.000000000 +0100
+++ Makefile.in 2008-04-02 12:27:05.000000000 +0200
@@ -65,6 +65,8 @@
# Directory in which to install the include file tk.h:
@ -45,7 +45,7 @@
# Additional search flags needed to find the various shared libraries
# at run-time. The first symbol is for use when creating a binary
@@ -552,6 +554,8 @@
@@ -550,6 +552,8 @@
$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
$(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
@ -54,7 +54,7 @@
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
SHELL_ENV = \
@@ -577,6 +581,12 @@
@@ -575,6 +579,12 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
rm -f $@
@MAKE_LIB@
@ -67,7 +67,7 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@@ -676,7 +686,7 @@
@@ -674,7 +684,7 @@
gdb ./wish --command=gdb.run
rm gdb.run
@ -76,78 +76,78 @@
install: $(INSTALL_TARGETS)
@@ -689,7 +699,8 @@
@@ -687,7 +697,8 @@
# 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); \
@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \
do \
if [ ! -d $$i ] ; then \
@@ -721,10 +732,15 @@
if [ ! -d "$$i" ] ; then \
@@ -719,10 +730,15 @@
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
"$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
fi
+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_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 as $(BIN_INSTALL_DIR)/wish$(VERSION)"
@$(INSTALL_PROGRAM) wish $(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
- @$(INSTALL_DATA) tkConfig.sh "$(LIB_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
+ @mkdir -p "$(LIB_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@ ; \
@@ -735,6 +751,7 @@
@@ -733,6 +749,7 @@
@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 $(SCRIPT_INSTALL_DIR)/ttk; \
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; \
do \
@@ -749,10 +766,14 @@
@@ -747,10 +764,14 @@
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
- @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} $(GENERIC_DIR)/*.h "$(GENERIC_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;
+ j=`basename $$i` ; \
+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
+ 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; \
@@ -832,17 +853,17 @@
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
@@ -830,17 +851,17 @@
done;
@echo "Installing and cross-linking top-level (.1) docs";
@for i in $(TOP_DIR)/doc/*.1; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MAN1_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MAN1_INSTALL_DIR)"; \
done
@echo "Installing and cross-linking C API (.3) docs";
@for i in $(TOP_DIR)/doc/*.3; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MAN3_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MAN3_INSTALL_DIR)"; \
done
@echo "Installing and cross-linking command (.n) docs";
@for i in $(TOP_DIR)/doc/*.n; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
+ ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
+ ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
done
# Optional target to install private headers

1
x11-toolkits/tk86/pkg-plist
View File

@ -82,6 +82,7 @@ lib/tk%%TK_VER%%/console.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/teapot.ppm
%%DEMOS%%lib/tk%%TK_VER%%/demos/items.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/ixset
%%DEMOS%%lib/tk%%TK_VER%%/demos/knightstour.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/label.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/labelframe.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/license.terms