From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 13 09:40:05 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A601516A403 for ; Tue, 13 Mar 2007 09:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 8C84C13C469 for ; Tue, 13 Mar 2007 09:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2D9e5fA070496 for ; Tue, 13 Mar 2007 09:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2D9e52b070495; Tue, 13 Mar 2007 09:40:05 GMT (envelope-from gnats) Resent-Date: Tue, 13 Mar 2007 09:40:05 GMT Resent-Message-Id: <200703130940.l2D9e52b070495@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 30A2F16A40B for ; Tue, 13 Mar 2007 09:33:40 +0000 (UTC) (envelope-from rebum@mail.vx.sk) Received: from mail.vx.sk (neo.vx.sk [88.198.35.14]) by mx1.freebsd.org (Postfix) with ESMTP id 9676913C45B for ; Tue, 13 Mar 2007 09:33:39 +0000 (UTC) (envelope-from rebum@mail.vx.sk) Received: from localhost (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 89BDF3F474 for ; Tue, 13 Mar 2007 10:33:38 +0100 (CET) Received: from mail.vx.sk ([127.0.0.1]) by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id EbWcDizgcJnN for ; Tue, 13 Mar 2007 10:33:34 +0100 (CET) Received: by mail.vx.sk (Postfix, from userid 1001) id DEB613F472; Tue, 13 Mar 2007 10:33:34 +0100 (CET) Message-Id: <20070313093334.DEB613F472@mail.vx.sk> Date: Tue, 13 Mar 2007 10:33:34 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/110255: [MAINTAINER] lang/tcl84 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2007 09:40:05 -0000 >Number: 110255 >Category: ports >Synopsis: [MAINTAINER] lang/tcl84 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 13 09:40:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 6.2-RELEASE >Organization: >Environment: FreeBSD 6.2-RELEASE i386 and amd64 >Description: This update changes the following: - improved handling of WITH_TCL84_MAN - no changes in package, no portrevision bump required Portlint -A and tinderbox do not complain. >How-To-Repeat: >Fix: diff -Nbur lang/tcl84.orig/Makefile lang/tcl84/Makefile --- lang/tcl84.orig/Makefile Thu Mar 8 15:00:58 2007 +++ lang/tcl84/Makefile Mon Mar 12 18:15:47 2007 @@ -631,14 +631,6 @@ ${REINPLACE_CMD} \ -e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \ -e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile -.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_TCL84_MAN) - ${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \ - ${WRKSRC}/Makefile -. for mp in ${MAN1} ${MAN3} ${MANN} - @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ - ${WRKSRC}/../doc/${mp} -. endfor -.endif .if ${BLACKHOLE} != '' && ${BLACKHOLE} != 0 # ==================================================== # net.inet.tcp.blackhole is non-zero. Some http-tests @@ -649,9 +641,14 @@ .endif post-install: -.if !defined(WITHOUT_TCL84_MAN) && !defined(NO_INSTALL_MANPAGES) +.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_MAN) ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} +. 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 regression-test: build diff -Nbur lang/tcl84.orig/files/patch-aa lang/tcl84/files/patch-aa --- lang/tcl84.orig/files/patch-aa Wed Jun 29 15:44:01 2005 +++ lang/tcl84/files/patch-aa Mon Mar 12 18:09:37 2007 @@ -1,22 +1,36 @@ ---- Makefile.in Sat Jun 4 16:39:25 2005 -+++ Makefile.in Thu Jun 9 07:12:23 2005 -@@ -59,2 +59,4 @@ +--- Makefile.in.orig Thu Oct 19 19:26:15 2006 ++++ Makefile.in Mon Mar 12 18:09:29 2007 +@@ -57,6 +57,8 @@ + + # Directory in which to install the include file tcl.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix -@@ -92,3 +94,3 @@ + # Path to the private tcl header dir: + PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ +@@ -102,7 +104,7 @@ + #CFLAGS = $(CFLAGS_DEBUG) + #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) +CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) -@@ -447,3 +449,4 @@ + # Flags to pass to the linker + LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +@@ -463,7 +465,8 @@ + + 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) \ + libtcl${SHORT_TCL_VER}.a tclsh -@@ -458,2 +461,11 @@ + libraries: + +@@ -474,6 +477,15 @@ + ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} + rm -f $@ @MAKE_LIB@ + @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so + if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ @@ -28,7 +42,20 @@ + ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} + $(RANLIB) libtcl${SHORT_TCL_VER}.a -@@ -604,2 +616,8 @@ + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} + rm -f $@ +@@ -600,7 +612,7 @@ + dltest.marker: + cd dltest ; $(MAKE) + +-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@ ++INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@ + + install: $(INSTALL_TARGETS) + +@@ -629,6 +641,12 @@ + @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 + @echo "Installing libtcl${SHORT_TCL_VER}.a" @@ -37,7 +64,11 @@ + @(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 \ -@@ -611,4 +629,5 @@ + echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ + $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ +@@ -636,8 +654,9 @@ + fi + @echo "Installing tclsh as $(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 @@ -45,50 +76,63 @@ + @mkdir -p $(SCRIPT_INSTALL_DIR) + @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh @if test "$(STUB_LIB_FILE)" != "" ; then \ -@@ -619,3 +638,4 @@ + echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ + @INSTALL_STUB_LIB@ ; \ +@@ -645,7 +664,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); \ do \ -@@ -641,7 +661,13 @@ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +@@ -667,11 +687,17 @@ + chmod +x $(SRC_DIR)/install-sh; \ + fi @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ - $(GENERIC_DIR)/tclPlatDecls.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)"; -@@ -712,18 +738,20 @@ + @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ + do \ +@@ -720,20 +746,22 @@ + else true; \ fi; \ 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); \ - done -+ @echo "Installing top-level (.1) docs"; -+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.1 $(MAN1_INSTALL_DIR)/ - +- - @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 "**********" @@ -101,3 +145,4 @@ + @echo "conflicting with another version of Tcl/Tks." # Optional target to install private headers + install-private-headers: libraries >Release-Note: >Audit-Trail: >Unformatted: