diff options
| author | mi <mi@FreeBSD.org> | 2008-04-21 11:59:03 +0800 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2008-04-21 11:59:03 +0800 |
| commit | 248277f277b33a5a999c00918c60c7152be21e43 (patch) | |
| tree | 75eed067b4500936868f775067600b1d10fe293a /www/websh | |
| parent | 7e35c252e6aeed3326fd938e4c8170192ecf6692 (diff) | |
| download | freebsd-ports-gnome-248277f277b33a5a999c00918c60c7152be21e43.tar.gz freebsd-ports-gnome-248277f277b33a5a999c00918c60c7152be21e43.tar.zst freebsd-ports-gnome-248277f277b33a5a999c00918c60c7152be21e43.zip | |
Fix up the makefile post-configure to avoid useless
PACKAGE_-definitions, which may conflict with the
(equally useless) Apache ones.
Insist on TCL-8.4 -- using 8.5 causes self-test failures
including seg-faults... These are being investigated.
Diffstat (limited to 'www/websh')
| -rw-r--r-- | www/websh/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/www/websh/Makefile b/www/websh/Makefile index 123c72441685..f6b20ec31657 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -7,7 +7,7 @@ PORTNAME= websh PORTVERSION= 3.6.0b4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www tcl MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR=tcl/${PORTNAME}/source @@ -50,8 +50,10 @@ post-patch: ${REINPLACE_CMD} -e 's,\.html,.whtml,g' ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 post-configure: - # "STUBS" are for wimps: - ${REINPLACE_CMD} -e 's,tclstub,tcl,' ${WRKSRC}/Makefile + # Remove the "STUBS" and the PACKAGE_* defines, which may conflict + # with Apache's definitions: + ${REINPLACE_CMD} -e 's,tclstub,tcl,' \ + -e 's,-DPACKAGE_[^=]*=."[^"]*",,g' ${WRKSRC}/Makefile post-build test: ${SETENV} LANG=C ${GMAKE} -C ${WRKSRC} test | ${AWK} '\ |