summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2004-05-29 21:37:38 +0000
committerClement Laforet <clement@FreeBSD.org>2004-05-29 21:37:38 +0000
commit96f28baafc7d1552a3fad9cb15377c2945fe0b62 (patch)
tree0a7b348594ef59b425b9f5cc800cb7fb853d0333
parentAdd xorg-manpages, a port of X.Org release 6.7.0's manpages, modeled after (diff)
- Fix build if WITH_APR_FROM_PORTS is defined.
- Advertise ServerToken i.e.: Apache/2.0.49 (FreeBSD) Server at satan.cultdeadsheep.org Port 80
Notes
Notes: svn path=/head/; revision=110319
-rw-r--r--www/apache2/Makefile3
-rw-r--r--www/apache20/Makefile3
2 files changed, 6 insertions, 0 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 037c0464c3b1..81d048263e0a 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -111,6 +111,7 @@ BROKEN= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is
LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr
CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \
--with-apr-util=${LOCALBASE}/bin/apu-config
+CONFIGURE_ENV+= LTFLAGS="--tag=CXX"
PLIST_SUB+= PORTS_APR="@comment "
.else
. if exists(${LOCALBASE}/lib/libapr-0.so)
@@ -169,6 +170,8 @@ post-patch:
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
+ @${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
+ ${WRKSRC}/server/core.c
pre-install:
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 037c0464c3b1..81d048263e0a 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -111,6 +111,7 @@ BROKEN= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is
LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr
CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \
--with-apr-util=${LOCALBASE}/bin/apu-config
+CONFIGURE_ENV+= LTFLAGS="--tag=CXX"
PLIST_SUB+= PORTS_APR="@comment "
.else
. if exists(${LOCALBASE}/lib/libapr-0.so)
@@ -169,6 +170,8 @@ post-patch:
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
+ @${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
+ ${WRKSRC}/server/core.c
pre-install:
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL