From c21997867b6cef1f93e23ce90630dbf3b801dd47 Mon Sep 17 00:00:00 2001 From: mm Date: Thu, 26 Feb 2009 14:19:53 +0000 Subject: - Disable install of function manpages by default - Add manual page for tclsh8.x and wish8.x - Bump PORTREVISION --- lang/tcl84/Makefile | 40 ++++++++++++++++++++++++---------------- lang/tcl84/files/patch-aa | 38 +++++++++++++++++--------------------- lang/tcl84/pkg-plist | 4 ++-- 3 files changed, 43 insertions(+), 39 deletions(-) (limited to 'lang/tcl84') 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 +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 -- cgit