Attachment #76495 for bug #110255

View | Details | Raw Unified | Return to bug 110255
Collapse All | Expand All




	${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

.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}
	@${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

Lines 1-22 Link Here

(-)lang/tcl84/files/patch-aa (-22 / +67 lines)
1	--- Makefile.in Sat Jun 4 16:39:25 2005	1	--- Makefile.in.orig Thu Oct 19 19:26:15 2006
2	+++ Makefile.in Thu Jun 9 07:12:23 2005	2	+++ Makefile.in Mon Mar 12 18:09:29 2007
3	@@ -59,2 +59,4 @@	3	@@ -57,6 +57,8 @@
		4
		5	# Directory in which to install the include file tcl.h:
4	INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)	6	INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
5	+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic	7	+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
6	+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix	8	+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
7		9
8	@@ -92,3 +94,3 @@	10	# Path to the private tcl header dir:
		11	PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
		12	@@ -102,7 +104,7 @@
		13	#CFLAGS = $(CFLAGS_DEBUG)
		14	#CFLAGS = $(CFLAGS_OPTIMIZE)
9	#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)	15	#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
10	-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)	16	-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)
11	+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)	17	+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)
12		18
13	@@ -447,3 +449,4 @@	19	# Flags to pass to the linker
		20	LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
		21	@@ -463,7 +465,8 @@
		22
		23	all: binaries libraries doc
14		24
15	-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh	25	-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
16	+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \	26	+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
17	+ libtcl${SHORT_TCL_VER}.a tclsh	27	+ libtcl${SHORT_TCL_VER}.a tclsh
18		28
19	@@ -458,2 +461,11 @@	29	libraries:
		30
		31	@@ -474,6 +477,15 @@
		32	${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
		33	rm -f $@
20	@MAKE_LIB@	34	@MAKE_LIB@
21	+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so	35	+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
22	+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \	36	+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
Lines 28-34 Link Here
28	+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}	42	+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
29	+ $(RANLIB) libtcl${SHORT_TCL_VER}.a	43	+ $(RANLIB) libtcl${SHORT_TCL_VER}.a
30		44
31	@@ -604,2 +616,8 @@	45	${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
		46	rm -f $@
		47	@@ -600,7 +612,7 @@
		48	dltest.marker:
		49	cd dltest ; $(MAKE)
		50
		51	-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
		52	+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
		53
		54	install: $(INSTALL_TARGETS)
		55
		56	@@ -629,6 +641,12 @@
		57	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
		58	@@INSTALL_LIB@
32	@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)	59	@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
33	+ @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so	60	+ @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
34	+ @echo "Installing libtcl${SHORT_TCL_VER}.a"	61	+ @echo "Installing libtcl${SHORT_TCL_VER}.a"
Lines 37-43 Link Here
37	+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)	64	+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
38	+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a	65	+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
39	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \	66	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
40	@@ -611,4 +629,5 @@	67	echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
		68	$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
		69	@@ -636,8 +654,9 @@
		70	fi
		71	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
41	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)	72	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
42	- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"	73	- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
43	- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh	74	- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
Lines 45-94 Link Here
45	+ @mkdir -p $(SCRIPT_INSTALL_DIR)	76	+ @mkdir -p $(SCRIPT_INSTALL_DIR)
46	+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh	77	+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
47	@if test "$(STUB_LIB_FILE)" != "" ; then \	78	@if test "$(STUB_LIB_FILE)" != "" ; then \
48	@@ -619,3 +638,4 @@	79	echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
		80	@INSTALL_STUB_LIB@ ; \
		81	@@ -645,7 +664,8 @@
		82	@EXTRA_INSTALL_BINARIES@
		83
49	install-libraries: libraries	84	install-libraries: libraries
50	- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \	85	- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
51	+ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \	86	+ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
52	+ $(SCRIPT_INSTALL_DIR); \	87	+ $(SCRIPT_INSTALL_DIR); \
53	do \	88	do \
54	@@ -641,7 +661,13 @@	89	if [ ! -d $$i ] ; then \
		90	echo "Making directory $$i"; \
		91	@@ -667,11 +687,17 @@
		92	chmod +x $(SRC_DIR)/install-sh; \
		93	fi
55	@echo "Installing header files";	94	@echo "Installing header files";
56	- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \	95	- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
57	- $(GENERIC_DIR)/tclPlatDecls.h; \	96	- $(GENERIC_DIR)/tclPlatDecls.h; \
58	+ @for i in $(GENERIC_DIR)/*.h ; \	97	+ @for i in $(GENERIC_DIR)/*.h ; \
59	do \	98	+ do \
60	- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
61	+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \	99	+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
62	done;	100	+ done;
63	+ @for i in $(UNIX_DIR)/*.h ; \	101	+ @for i in $(UNIX_DIR)/*.h ; \
64	+ do \	102	do \
		103	- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
65	+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \	104	+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
66	+ done;	105	done;
67	+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h	106	+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
68	+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h	107	+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
69	+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h	108	+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h
70	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";	109	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
71	@@ -712,18 +738,20 @@	110	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
		111	do \
		112	@@ -720,20 +746,22 @@
		113	else true; \
72	fi; \	114	fi; \
73	done;	115	done;
74	- @echo "Installing and cross-linking top-level (.1) docs";	116	- @echo "Installing and cross-linking top-level (.1) docs";
75	- @for i in $(TOP_DIR)/doc/*.1; do \	117	- @for i in $(TOP_DIR)/doc/*.1; do \
76	- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \	118	- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
77	- done	119	- done
78	+ @echo "Installing top-level (.1) docs";	120	-
79	+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.1 $(MAN1_INSTALL_DIR)/
80
81	- @echo "Installing and cross-linking C API (.3) docs";	121	- @echo "Installing and cross-linking C API (.3) docs";
82	- @for i in $(TOP_DIR)/doc/*.3; do \	122	- @for i in $(TOP_DIR)/doc/*.3; do \
83	- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \	123	- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
84	- done	124	- done
85	+ @echo "Installing C API (.3) docs";	125	-
86	+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)/
87
88	- @echo "Installing and cross-linking command (.n) docs";	126	- @echo "Installing and cross-linking command (.n) docs";
89	- @for i in $(TOP_DIR)/doc/*.n; do \	127	- @for i in $(TOP_DIR)/doc/*.n; do \
90	- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \	128	- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
91	- done	129	- done
		130	+ @echo "Installing top-level (.1) docs";
		131	+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.1 $(MAN1_INSTALL_DIR)/
		132	+
		133	+ @echo "Installing C API (.3) docs";
		134	+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)/
		135	+
92	+ @echo "Installing command (.n) docs";	136	+ @echo "Installing command (.n) docs";
93	+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)/	137	+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)/
94	+ @echo "**********"	138	+ @echo "**********"
Lines 101-103 Link Here
101	+ @echo "conflicting with another version of Tcl/Tks."	145	+ @echo "conflicting with another version of Tcl/Tks."
102		146
103	# Optional target to install private headers	147	# Optional target to install private headers
		148	install-private-headers: libraries

Return to bug 110255

Lines 631-644 Link Here

(-)lang/tcl84/Makefile (-9 / +6 lines)
631	${REINPLACE_CMD} \	631	${REINPLACE_CMD} \
632	-e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \	632	-e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \
633	-e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile	633	-e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile
634	.if defined(NO_INSTALL_MANPAGES) \|\| defined(WITHOUT_TCL84_MAN)
635	${REINPLACE_CMD} -e 's\|^MAN_INSTALL_DIR.*$$\|MAN_INSTALL_DIR = ${WRKDIR}\|' \
636	${WRKSRC}/Makefile
637	. for mp in ${MAN1} ${MAN3} ${MANN}
638	@${REINPLACE_CMD} -e 's\|^.so man.macros\|.so ${DATADIR}/man.macros\|' \
639	${WRKSRC}/../doc/${mp}
640	. endfor
641	.endif
642	.if ${BLACKHOLE} != '' && ${BLACKHOLE} != 0	634	.if ${BLACKHOLE} != '' && ${BLACKHOLE} != 0
643	# ====================================================	635	# ====================================================
644	# net.inet.tcp.blackhole is non-zero. Some http-tests	636	# net.inet.tcp.blackhole is non-zero. Some http-tests
Lines 649-657 Link Here
649	.endif	641	.endif
650		642
651	post-install:	643	post-install:
652	.if !defined(WITHOUT_TCL84_MAN) && !defined(NO_INSTALL_MANPAGES)	644	.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_MAN)
653	${MKDIR} ${DATADIR}	645	${MKDIR} ${DATADIR}
654	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}	646	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
		647	. for mp in ${MAN1} ${MAN3} ${MANN}
		648	@${REINPLACE_CMD} -e 's\|^.so man.macros\|.so ${DATADIR}/man.macros\|' \
		649	${WRKSRC}/../doc/${mp}
		650	. endfor
		651	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
655	.endif	652	.endif
656		653
657	regression-test: build	654	regression-test: build