diff options
| author | miwi <miwi@FreeBSD.org> | 2007-03-13 18:05:58 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2007-03-13 18:05:58 +0800 |
| commit | 84117c52c1842ca7390a61a1fed3d26d4e574624 (patch) | |
| tree | 3e94077c7a999d126e8afac9c7392482aae3039a /lang | |
| parent | f89d41e5fceed6919201148d8ee6af3d1b812091 (diff) | |
| download | freebsd-ports-graphics-84117c52c1842ca7390a61a1fed3d26d4e574624.tar.gz freebsd-ports-graphics-84117c52c1842ca7390a61a1fed3d26d4e574624.tar.zst freebsd-ports-graphics-84117c52c1842ca7390a61a1fed3d26d4e574624.zip | |
- Improved handling of WITH_TCL83_MAN
- Manpages are not installed by default (default on for Tcl 8.4)
PR: 110239
Submitted by: Martin Matuska <martin@matuska.org> (maintainer)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl83/Makefile | 14 | ||||
| -rw-r--r-- | lang/tcl83/files/patch-aa | 27 |
2 files changed, 22 insertions, 19 deletions
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile index afc06ee93ce..393a256bcb3 100644 --- a/lang/tcl83/Makefile +++ b/lang/tcl83/Makefile @@ -7,7 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.3.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang tcl83 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -28,7 +28,7 @@ TCL_VER= 8.3 NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=83 -OPTIONS= TCL83_MAN "Install tcl 8.3 manpages" on \ +OPTIONS= TCL83_MAN "Install tcl 8.3 manpages" off \ TCLSH_WRAPPER "Require tclsh wrapper from ports" off .include <bsd.port.pre.mk> @@ -437,17 +437,13 @@ post-configure: ${REINPLACE_CMD} \ -e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TCLBASE}|' \ ${WRKSRC}/tclConfig.sh -.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TCL83_MAN) - ${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \ - ${WRKSRC}/Makefile -.endif post-install: -.if exists(${PKGINSTALL}) - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} -.endif ${INSTALL_DATA} ${FILESDIR}/koi8-u.enc \ ${PREFIX}/lib/tcl${TCL_VER}/encoding/ +.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL83_MAN) + @cd ${WRKSRC} && ${MAKE} -f Makefile install-doc +.endif test: cd ${WRKSRC} && ${MAKE} test diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa index b3dde591957..ef01e4c0193 100644 --- a/lang/tcl83/files/patch-aa +++ b/lang/tcl83/files/patch-aa @@ -1,11 +1,9 @@ --- Makefile.in.orig Fri Oct 18 22:44:46 2002 -+++ Makefile.in Tue Nov 12 21:45:50 2002 -@@ -53,7 +53,9 @@ - SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) ++++ Makefile.in Mon Mar 12 17:53:11 2007 +@@ -54,6 +54,8 @@ # Directory in which to install the include file tcl.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) + INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix @@ -47,6 +45,15 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} +@@ -533,7 +544,7 @@ + cd dltest; if test -f configure; then ./configure; else \ + $(DLTEST_DIR)/configure; fi + +-install: install-binaries install-libraries install-doc ++install: install-binaries install-libraries + + install-strip: + $(MAKE) install \ @@ -561,6 +572,12 @@ @$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) @@ -89,14 +96,14 @@ - @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 @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; |