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

(-)lang/tcl83/Makefile (-9 / +5 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	tcl
8
PORTNAME=	tcl
9
PORTVERSION=	8.3.5
9
PORTVERSION=	8.3.5
10
PORTREVISION=	6
10
PORTREVISION=	7
11
CATEGORIES=	lang tcl83
11
CATEGORIES=	lang tcl83
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	tcl
13
MASTER_SITE_SUBDIR=	tcl
Lines 28-34 Link Here
28
NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
28
NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
29
PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=83
29
PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=83
30
30
31
OPTIONS=	TCL83_MAN "Install tcl 8.3 manpages" on \
31
OPTIONS=	TCL83_MAN "Install tcl 8.3 manpages" off \
32
		TCLSH_WRAPPER "Require tclsh wrapper from ports" off
32
		TCLSH_WRAPPER "Require tclsh wrapper from ports" off
33
33
34
.include <bsd.port.pre.mk>
34
.include <bsd.port.pre.mk>
Lines 437-453 Link Here
437
	${REINPLACE_CMD} \
437
	${REINPLACE_CMD} \
438
		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TCLBASE}|' \
438
		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TCLBASE}|' \
439
		${WRKSRC}/tclConfig.sh
439
		${WRKSRC}/tclConfig.sh
440
.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TCL83_MAN)
441
	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
442
		${WRKSRC}/Makefile
443
.endif
444
440
445
post-install:
441
post-install:
446
.if exists(${PKGINSTALL})
447
	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
448
.endif
449
	${INSTALL_DATA} ${FILESDIR}/koi8-u.enc \
442
	${INSTALL_DATA} ${FILESDIR}/koi8-u.enc \
450
		${PREFIX}/lib/tcl${TCL_VER}/encoding/
443
		${PREFIX}/lib/tcl${TCL_VER}/encoding/
444
.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL83_MAN)
445
	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc
446
.endif
451
447
452
test:
448
test:
453
	cd ${WRKSRC} && ${MAKE} test
449
	cd ${WRKSRC} && ${MAKE} test
(-)lang/tcl83/files/patch-aa (-10 / +17 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	Fri Oct 18 22:44:46 2002
1
--- Makefile.in.orig	Fri Oct 18 22:44:46 2002
2
+++ Makefile.in	Tue Nov 12 21:45:50 2002
2
+++ Makefile.in	Mon Mar 12 17:53:11 2007
3
@@ -53,7 +53,9 @@
3
@@ -54,6 +54,8 @@
4
 SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
5
 
4
 
6
 # Directory in which to install the include file tcl.h:
5
 # Directory in which to install the include file tcl.h:
7
-INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
6
 INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
8
+INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
9
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
7
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
10
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
8
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
11
 
9
 
Lines 47-52 Link Here
47
 
45
 
48
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
46
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
49
 	rm -f ${STUB_LIB_FILE}
47
 	rm -f ${STUB_LIB_FILE}
48
@@ -533,7 +544,7 @@
49
 	cd dltest; if test -f configure; then ./configure; else \
50
 	    $(DLTEST_DIR)/configure; fi
51
 
52
-install: install-binaries install-libraries install-doc
53
+install: install-binaries install-libraries
54
 
55
 install-strip:
56
 	$(MAKE) install \
50
@@ -561,6 +572,12 @@
57
@@ -561,6 +572,12 @@
51
 	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
58
 	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
52
 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
59
 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
Lines 89-102 Link Here
89
-	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
96
-	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
90
-		$(GENERIC_DIR)/tclPlatDecls.h ; \
97
-		$(GENERIC_DIR)/tclPlatDecls.h ; \
91
+	@for i in $(GENERIC_DIR)/*.h ; \
98
+	@for i in $(GENERIC_DIR)/*.h ; \
92
 	    do \
99
+	    do \
93
-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
94
+	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
100
+	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
95
 	    done;
101
+	    done;
96
+	@for i in $(UNIX_DIR)/*.h ; \
102
+	@for i in $(UNIX_DIR)/*.h ; \
97
+  	    do \
103
 	    do \
104
-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
98
+	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
105
+	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
99
+ 	    done;
106
 	    done;
100
+	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
107
+	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
101
+	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
108
+	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
102
 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
109
 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";

Return to bug 110239