summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2003-05-13 19:13:01 +0000
committerdinoex <dinoex@FreeBSD.org>2003-05-13 19:13:01 +0000
commit9a188b129c60d255083f7470d725ca1ade531794 (patch)
tree4b0bb90f03c8a0d25fa61eaa82af954e5ed7bc95
parent18f94b44d3bfeced819c107303318944b0045362 (diff)
downloadFreeBSD-ports-9a188b129c60d255083f7470d725ca1ade531794.zip
FreeBSD-ports-9a188b129c60d255083f7470d725ca1ade531794.tar.gz
- use configures --includedir
- TCL_INCLUDE_SPEC is now set in tclConfig.sh - cleanup makefile
-rw-r--r--lang/tcl84/Makefile17
-rw-r--r--lang/tcl84/files/patch-aa2
2 files changed, 10 insertions, 9 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 8b59dafd..00c7049 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tcl
PORTVERSION= 8.4.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -21,7 +22,7 @@ PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared
+CONFIGURE_ARGS= --enable-shared --includedir=${LOCALBASE}/include/tcl${TCL_VER}
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
MAKE_ENV= SHORT_TCL_VER=84
PKGINSTALL= ${PKGDIR}/pkg-install.tclsh
@@ -29,9 +30,13 @@ PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.tclsh
TCL_VER= 8.4
NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html
USE_REINPLACE= YES
-
PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=84
+.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
+CONFIGURE_ARGS+= --enable-threads
+PKGNAMESUFFIX?= -threads
+.endif
+
MAN1= tclsh.1
MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
@@ -583,11 +588,9 @@ MLINKS= Access.3 Tcl_Access.3 \
pkgMkIndex.n pkg_mkIndex.n \
safe.n SafeBase.n
-.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
-CONFIGURE_ARGS+= --enable-threads
-PKGNAMESUFFIX?= -threads
-USE_REINPLACE= YES
+.include <bsd.port.pre.mk>
+.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/configure
@@ -598,8 +601,6 @@ post-configure:
${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
${WRKSRC}/tclConfig.sh
-.include <bsd.port.pre.mk>
-
post-install:
.if exists(${PKGINSTALL})
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index 8dd7dfa..f887651 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -5,7 +5,7 @@
# Directory in which to install the include file tcl.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
OpenPOWER on IntegriCloud