diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl84/Makefile | 40 | ||||
| -rw-r--r-- | lang/tcl84/files/patch-aa | 38 | ||||
| -rw-r--r-- | lang/tcl84/pkg-plist | 4 | ||||
| -rw-r--r-- | lang/tcl85/Makefile | 38 | ||||
| -rw-r--r-- | lang/tcl85/files/patch-unix-Makefile.in | 55 | ||||
| -rw-r--r-- | lang/tcl85/pkg-plist | 4 | ||||
| -rw-r--r-- | lang/tcl86/Makefile | 38 | ||||
| -rw-r--r-- | lang/tcl86/pkg-plist | 4 |
8 files changed, 124 insertions, 97 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index ee3a8649fb3f..e5f286522371 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -7,6 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.4.19 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang tcl MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -32,7 +33,7 @@ PLIST_SUB= TCL_VER="${TCL_VER}" SHORT_TCL_VER="${SHORT_TCL_VER}" EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/ .if !defined(BUILDING_TCL_THREADS) -OPTIONS= TCL84_MAN "Install tcl 8.4 manpages" on +OPTIONS= TCL84_MAN "Install tcl 8.4 function manpages" off .else USE_TCL= ${SHORT_TCL_VER} PLIST= ${PKGDIR}/pkg-plist.threads @@ -41,22 +42,20 @@ THREADS_SUFFIX= -threads .include <bsd.port.pre.mk> +DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} + +.if !defined(NO_INSTALL_MANPAGES) +MAN1= tclsh${TCL_VER}${THREADS_SUFFIX}.1 +.endif + .if defined(BUILDING_TCL_THREADS) CONFIGURE_ARGS+= --enable-threads CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" .else CONFIGURE_ARGS+= --disable-threads -.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_TCL84_MAN) - -PLIST_SUB+= INSTMAN='@comment ' - -.else - -DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} -PLIST_SUB+= INSTMAN='' -MAN1= tclsh.1 +.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_MAN) MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ @@ -615,8 +614,12 @@ LATEST_LINK= tcl84${THREADS_SUFFIX} TCLBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} -.if defined(BUILDING_TCL_THREADS) post-patch: + @${REINPLACE_CMD} -e 's|tclsh |tclsh${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Tclsh |Tclsh${TCL_VER}${THREADS_SUFFIX} |g' \ + -e 's|tclsh\\fR|tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Tclsh\\fR|Tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' \ + -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ + ${WRKSRC}/../doc/tclsh.1 +.if defined(BUILDING_TCL_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \ @@ -654,19 +657,24 @@ do-install: @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries @${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX} @${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh -.else +.endif + post-install: -.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_MAN) ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} -. for mp in ${MAN1} ${MAN3} ${MANN} +.if !defined(NO_INSTALL_MANPAGES) + ${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_TCL84_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 -.endif # !defined(BUILDING_TCL_THREADS) +.endif # !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL84_MAN) + +.endif # !defined(NO_INSTALL_MANPAGES) regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa index 2fa6098a8c0f..fb257bf34bde 100644 --- a/lang/tcl84/files/patch-aa +++ b/lang/tcl84/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Oct 19 19:26:15 2006 -+++ Makefile.in Mon Mar 12 18:09:29 2007 +--- 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 @@ # Directory in which to install the include file tcl.h: @@ -18,7 +18,7 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -463,7 +465,8 @@ +@@ -469,7 +471,8 @@ all: binaries libraries doc @@ -28,7 +28,7 @@ libraries: -@@ -474,6 +477,15 @@ +@@ -480,6 +483,15 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f $@ @MAKE_LIB@ @@ -44,8 +44,8 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -600,7 +612,7 @@ - dltest.marker: +@@ -606,7 +618,7 @@ + dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) -INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@ @@ -53,7 +53,7 @@ install: $(INSTALL_TARGETS) -@@ -629,6 +641,12 @@ +@@ -635,6 +647,12 @@ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) @@ -66,7 +66,7 @@ @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -636,8 +654,9 @@ +@@ -642,8 +660,9 @@ fi @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @@ -78,7 +78,7 @@ @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -645,7 +664,8 @@ +@@ -651,7 +670,8 @@ @EXTRA_INSTALL_BINARIES@ install-libraries: libraries @@ -88,7 +88,7 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -667,11 +687,17 @@ +@@ -673,11 +693,17 @@ chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing header files"; @@ -107,9 +107,9 @@ + @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 \ -@@ -720,20 +746,22 @@ + @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ + $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \ +@@ -727,20 +753,20 @@ else true; \ fi; \ done; @@ -117,22 +117,18 @@ - @for i in $(TOP_DIR)/doc/*.1; do \ - $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$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); \ - done -- ++ @echo "Installing C API (.3) docs"; ++ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)/ + - @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); \ - done -+ @echo "Installing top-level (.1) docs"; -+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.1 $(MAN1_INSTALL_DIR)/ -+ -+ @echo "Installing C API (.3) docs"; -+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)/ -+ + @echo "Installing command (.n) docs"; + ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)/ + @echo "**********" diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist index 4ff921b8f69d..611463646a25 100644 --- a/lang/tcl84/pkg-plist +++ b/lang/tcl84/pkg-plist @@ -124,8 +124,8 @@ lib/tcl%%TCL_VER%%/tclIndex lib/tcl%%TCL_VER%%/tcltest2.2/pkgIndex.tcl lib/tcl%%TCL_VER%%/tcltest2.2/tcltest.tcl lib/tcl%%TCL_VER%%/word.tcl -%%INSTMAN%%%%DATADIR%%/man.macros -%%INSTMAN%%@dirrm %%DATADIR%% +%%DATADIR%%/man.macros +@dirrm %%DATADIR%% @dirrm lib/tcl%%TCL_VER%%/tcltest2.2 @dirrm lib/tcl%%TCL_VER%%/opt0.4 @dirrm lib/tcl%%TCL_VER%%/msgcat1.3 diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile index f8fbe9a7e3c0..ac8ba9c2021b 100644 --- a/lang/tcl85/Makefile +++ b/lang/tcl85/Makefile @@ -7,6 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.5.6 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -31,7 +32,7 @@ PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER} EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/ .if !defined(BUILDING_TCL_THREADS) -OPTIONS= TCL85_MAN "Install tcl 8.5 manpages" off \ +OPTIONS= TCL85_MAN "Install tcl 8.5 function manpages" off \ TZDATA "Install tcl timezone data" off .else USE_TCL= ${SHORT_TCL_VER} @@ -41,12 +42,18 @@ THREADS_SUFFIX= -threads .include <bsd.port.pre.mk> +DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} + .if defined(WITH_TZDATA) PLIST_SUB+= TZDATA="" .else PLIST_SUB+= TZDATA="@comment " .endif +.if !defined(NO_INSTALL_MANPAGES) +MAN1= tclsh${TCL_VER}${THREADS_SUFFIX}.1 +.endif + .if defined(BUILDING_TCL_THREADS) . if (${ARCH} == "ia64") BROKEN= does not compile on ia64 @@ -65,16 +72,8 @@ CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS CONFIGURE_ARGS+= --disable-threads -.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TCL85_MAN) - -PLIST_SUB+= INSTMAN='@comment ' - -.else - -DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} -PLIST_SUB+= INSTMAN='' -MAN1= tclsh.1 +.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN) MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ @@ -701,8 +700,12 @@ LATEST_LINK= tcl85${THREADS_SUFFIX} TCLBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} -.if defined(BUILDING_TCL_THREADS) post-patch: + @${REINPLACE_CMD} -e 's|tclsh |tclsh${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Tclsh |Tclsh${TCL_VER}${THREADS_SUFFIX} |g' \ + -e 's|tclsh\\fR|tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Tclsh\\fR|Tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' \ + -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ + ${WRKSRC}/../doc/tclsh.1 +.if defined(BUILDING_TCL_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \ @@ -740,22 +743,27 @@ do-install: @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries @${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX} @${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh -.else +.endif + post-install: .if defined(WITH_TZDATA) @cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV} .endif -.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN) ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} +.if !defined(NO_INSTALL_MANPAGES) + ${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) . for mp in ${MAN1} ${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 -.endif # !defined(BUILDING_TCL_THREADS) +.endif # !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL85_MAN) + +.endif # !defined(NO_INSTALL_MANPAGES) regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in index 333badbf8c00..66dd98728f1b 100644 --- a/lang/tcl85/files/patch-unix-Makefile.in +++ b/lang/tcl85/files/patch-unix-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2008-03-28 19:41:53.000000000 +0100 -+++ Makefile.in 2008-04-02 11:49:46.000000000 +0200 +--- Makefile.in.orig 2008-12-22 18:45:06.000000000 +0100 ++++ Makefile.in 2009-02-26 11:53:11.121953378 +0100 @@ -55,6 +55,8 @@ # Directory in which to install the include file tcl.h: @@ -9,7 +9,7 @@ # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -98,7 +100,7 @@ +@@ -101,7 +103,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) @@ -18,9 +18,12 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -538,7 +540,8 @@ +@@ -579,9 +581,10 @@ + SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ + $(OO_SRCS) $(STUB_SRCS) @PLAT_SRCS@ @ZLIB_SRCS@ - all: binaries libraries doc +-all: binaries libraries doc packages ++all: binaries libraries doc -binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh +binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ @@ -28,7 +31,7 @@ libraries: -@@ -549,6 +552,15 @@ +@@ -592,6 +595,15 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f $@ @MAKE_LIB@ @@ -44,16 +47,16 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -697,7 +709,7 @@ +@@ -726,7 +738,7 @@ dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) --INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@ +-INSTALL_TARGETS = install-binaries install-libraries install-doc install-packages @EXTRA_INSTALL@ +INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@ install: $(INSTALL_TARGETS) -@@ -726,6 +738,13 @@ +@@ -755,6 +767,13 @@ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) @@ -67,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) \ -@@ -733,8 +752,9 @@ +@@ -762,8 +781,9 @@ fi @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" @$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION) @@ -79,7 +82,7 @@ @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -742,7 +762,8 @@ +@@ -771,7 +791,8 @@ @EXTRA_INSTALL_BINARIES@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs @@ -89,36 +92,42 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -764,13 +785,17 @@ - chmod +x $(SRC_DIR)/../unix/install-sh; \ +@@ -793,14 +814,21 @@ + chmod +x $(UNIX_DIR)/install-sh; \ fi @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ +- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \ - $(GENERIC_DIR)/tclPlatDecls.h \ - $(GENERIC_DIR)/tclTomMath.h \ - $(GENERIC_DIR)/tclTomMathDecls.h ; \ + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ $(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 "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ $(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)"/tclOO.h "$(INCLUDE_INSTALL_DIR)"/tclOO.h ++ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOODecls.h "$(INCLUDE_INSTALL_DIR)"/tclOODecls.h ++ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h ++ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h "$(INCLUDE_INSTALL_DIR)"/tclTomMathDecls.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 @DTRACE_SRC@; \ -@@ -838,18 +863,27 @@ +@@ -866,20 +894,25 @@ + else true; \ + fi; \ done; - @echo "Installing and cross-linking top-level (.1) docs"; - @for i in $(TOP_DIR)/doc/*.1; do \ +- @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)"; \ - done +- done @echo "Installing and cross-linking C API (.3) docs"; @for i in $(TOP_DIR)/doc/*.3; do \ diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist index 467e0aaf0c9b..82e1c7ec5379 100644 --- a/lang/tcl85/pkg-plist +++ b/lang/tcl85/pkg-plist @@ -822,8 +822,8 @@ lib/tcl8/8.4/platform/shell-1.1.4.tm lib/tcl8/8.4/platform-1.0.3.tm lib/tcl8/8.5/msgcat-1.4.2.tm lib/tcl8/8.5/tcltest-2.3.0.tm -%%INSTMAN%%%%DATADIR%%/man.macros -%%INSTMAN%%@dirrm %%DATADIR%% +%%DATADIR%%/man.macros +@dirrm %%DATADIR%% %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/SystemV %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Pacific diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index b20f698fad26..f43c378029fb 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -7,6 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.6.b.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -31,7 +32,7 @@ PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER} EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/ .if !defined(BUILDING_TCL_THREADS) -OPTIONS= TCL86_MAN "Install tcl 8.6 manpages" off \ +OPTIONS= TCL86_MAN "Install tcl 8.6 function manpages" off \ TZDATA "Install tcl timezone data" off .else USE_TCL= ${SHORT_TCL_VER} @@ -41,12 +42,18 @@ THREADS_SUFFIX= -threads .include <bsd.port.pre.mk> +DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} + .if defined(WITH_TZDATA) PLIST_SUB+= TZDATA="" .else PLIST_SUB+= TZDATA="@comment " .endif +.if !defined(NO_INSTALL_MANPAGES) +MAN1= tclsh${TCL_VER}${THREADS_SUFFIX}.1 +.endif + .if defined(BUILDING_TCL_THREADS) . if (${ARCH} == "ia64") BROKEN= does not compile on ia64 @@ -65,16 +72,7 @@ CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS CONFIGURE_ARGS+= --disable-threads -.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TCL86_MAN) - -PLIST_SUB+= INSTMAN='@comment ' - -.else - -DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} -PLIST_SUB+= INSTMAN='' - -MAN1= tclsh.1 +.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_DOC) MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ @@ -703,8 +701,12 @@ LATEST_LINK= tcl86${THREADS_SUFFIX} TCLBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} -.if defined(BUILDING_TCL_THREADS) post-patch: + @${REINPLACE_CMD} -e 's|tclsh |tclsh${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Tclsh |Tclsh${TCL_VER}${THREADS_SUFFIX} |g' \ + -e 's|tclsh\\fR|tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Tclsh\\fR|Tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' \ + -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ + ${WRKSRC}/../doc/tclsh.1 +.if defined(BUILDING_TCL_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \ @@ -742,22 +744,26 @@ do-install: @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries @${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX} @${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh -.else +.endif + post-install: .if defined(WITH_TZDATA) @cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV} .endif -.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL86_MAN) ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} +.if !defined(NO_INSTALL_MANPAGES) + ${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_TCL86_MAN) . for mp in ${MAN1} ${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 +.endif # !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL86_MAN) -.endif # !defined(BUILDING_TCL_THREADS) +.endif # !defined(NO_INSTALL_MANPAGES) regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist index e679e0de86fe..db44c63bad5b 100644 --- a/lang/tcl86/pkg-plist +++ b/lang/tcl86/pkg-plist @@ -832,8 +832,8 @@ lib/tcl8/8.4/platform/shell-1.1.4.tm lib/tcl8/8.4/platform-1.0.3.tm lib/tcl8/8.5/msgcat-1.4.2.tm lib/tcl8/8.5/tcltest-2.3.0.tm -%%INSTMAN%%%%DATADIR%%/man.macros -%%INSTMAN%%@dirrm %%DATADIR%% +%%DATADIR%%/man.macros +@dirrm %%DATADIR%% %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/SystemV %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Pacific |