sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- prepare removal of www/apache2 in favor of www/apache20 for naming

Browse source 
consistency
- add entries in UPDATING (for apache22 too)

PR:		ports/78119
Repocopied by:	marcus
This commit is contained in:
Clement Laforet 2005-12-04 00:18:15 +00:00
parent fa7483a9ee
commit 05684b80dd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=150328
56 changed files with 82 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -1986,3 +1986,4 @@ www/firefox-devel|www/firefox|2005-11-29|Firefox 1.5 is now stable
japanese/uim|textproc/uim|2005-11-30|new category japanese/uim|textproc/uim|2005-11-30|new category
www/p5-HTML-Chuncks|www/p5-HTML-Chunks|2005-12-01|corrected directory www/p5-HTML-Chuncks|www/p5-HTML-Chunks|2005-12-01|corrected directory
devel/p5-Test-Builder-Tester|devel/p5-Test-Simple|2005-12-02|Included in Test::Simple package devel/p5-Test-Builder-Tester|devel/p5-Test-Simple|2005-12-02|Included in Test::Simple package
www/apache2|www/apache20|2005-12-03|renamed for consistency with other apache ports

7
Mk/bsd.apache.mk
View file

@ -34,7 +34,7 @@ AP_PORT_IS_MODULE= YES
#### for backward compatibility #### for backward compatibility
.elif ${USE_APACHE:L} == yes .elif ${USE_APACHE:L} == yes
. if defined(WITH_APACHE2) . if defined(WITH_APACHE2)
APACHE_PORT?= www/apache2 APACHE_PORT?= www/apache20
. else . else
APACHE_PORT?= www/apache13 APACHE_PORT?= www/apache13
. endif . endif
@ -293,9 +293,7 @@ IGNORE?= PREFIX must be egal to APXS_PREFIX.
AP_BUILDEXT= la AP_BUILDEXT= la
PLIST_SUB+= APACHEMODDIR="libexec/apache2" \ PLIST_SUB+= APACHEMODDIR="libexec/apache2" \
APACHEINCLUDEDIR="include/apache2" APACHEINCLUDEDIR="include/apache2"
# XXX We postpone www/apache2 => www/apache20 migration APACHE_PORT= www/apache${APACHE_VERSION}
#APACHE_PORT= www/apache${APACHE_VERSION}
APACHE_PORT= www/apache2
.elif ${APACHE_VERSION} >= "21" .elif ${APACHE_VERSION} >= "21"
AP_BUILDEXT= la AP_BUILDEXT= la
PLIST_SUB+= APACHEMODDIR="libexec/apache${APACHE_VERSION}" \ PLIST_SUB+= APACHEMODDIR="libexec/apache${APACHE_VERSION}" \
@ -307,6 +305,7 @@ PLIST_SUB+= APACHEMODDIR="libexec/apache" \
APACHEINCLUDEDIR="include/apache" APACHEINCLUDEDIR="include/apache"
APACHE_PORT?= www/apache13 APACHE_PORT?= www/apache13
.endif .endif
.for VAR in ${OVERRIDABLE_VARS} .for VAR in ${OVERRIDABLE_VARS}
. if defined(AP${APACHE_VERSION}_${VAR}) . if defined(AP${APACHE_VERSION}_${VAR})
${VAR} =${AP${APACHE_VERSION}_${VAR}} ${VAR} =${AP${APACHE_VERSION}_${VAR}}

15
UPDATING
View file

@ -6,6 +6,21 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port time you update your ports collection, before attempting any port
upgrades. upgrades.
20051203:
AFFECTS: users of www/apache2
AUTHOR: clement@FreeBSD.org
www/apache2 port directory was renamed to www/apache20 to keep
consistency with other apache ports.
20051203:
AFFECTS: users of www/apache22 and any web apps porters
AUTHOR: clement@FreeBSD.org
www/apache22 stop supporting ${LOCALBASE}/www/(data|error|cgi)(|-dist)
directory layout in favor of ${LOCALBASE}/www/apache22/(data|error|cgi).
FYI, ports layout may change soon.
20051202: 20051202:
AFFECTS: users of www/plone and cmf oriented zope modules AFFECTS: users of www/plone and cmf oriented zope modules
AUTHOR: filippo.natali@gmail.com AUTHOR: filippo.natali@gmail.com

2
databases/gnatsweb4/Makefile
View file

@ -17,7 +17,7 @@ COMMENT= Gnatsweb, a GNATS web interface
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
.ifdef WITH_APACHE2 .ifdef WITH_APACHE2
RUN_DEPENDS+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 RUN_DEPENDS+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20
.endif .endif
USE_PERL5_RUN= yes USE_PERL5_RUN= yes

6
devel/subversion-devel/Makefile
View file

@ -155,7 +155,7 @@ SVNGROUP?= svn
.endif .endif
.if defined(WITH_APACHE2_APR) .if defined(WITH_APACHE2_APR)
APACHE2_PORT?= www/apache2 APACHE2_PORT?= www/apache20
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
.if ${APACHE2_PORT} == "www/apache21" .if ${APACHE2_PORT} == "www/apache21"
@ -263,11 +263,11 @@ pre-extract:
.endif .endif
@${ECHO_MSG} "" @${ECHO_MSG} ""
.if defined(WITH_APACHE2_APR) .if defined(WITH_APACHE2_APR)
@${ECHO_MSG} "Using APR from www/apache2. If you have the devel/apr" @${ECHO_MSG} "Using APR from www/apache20. If you have the devel/apr"
@${ECHO_MSG} "port/package installed, you may need to remove it." @${ECHO_MSG} "port/package installed, you may need to remove it."
.else .else
@${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "You can link subversion against the APR built with"
@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port," @${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
@${ECHO_MSG} "by defining WITH_APACHE2_APR." @${ECHO_MSG} "by defining WITH_APACHE2_APR."
.endif .endif
@${ECHO_MSG} "" @${ECHO_MSG} ""

6
devel/subversion-freebsd/Makefile
View file

@ -155,7 +155,7 @@ SVNGROUP?= svn
.endif .endif
.if defined(WITH_APACHE2_APR) .if defined(WITH_APACHE2_APR)
APACHE2_PORT?= www/apache2 APACHE2_PORT?= www/apache20
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
.if ${APACHE2_PORT} == "www/apache21" .if ${APACHE2_PORT} == "www/apache21"
@ -263,11 +263,11 @@ pre-extract:
.endif .endif
@${ECHO_MSG} "" @${ECHO_MSG} ""
.if defined(WITH_APACHE2_APR) .if defined(WITH_APACHE2_APR)
@${ECHO_MSG} "Using APR from www/apache2. If you have the devel/apr" @${ECHO_MSG} "Using APR from www/apache20. If you have the devel/apr"
@${ECHO_MSG} "port/package installed, you may need to remove it." @${ECHO_MSG} "port/package installed, you may need to remove it."
.else .else
@${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "You can link subversion against the APR built with"
@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port," @${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
@${ECHO_MSG} "by defining WITH_APACHE2_APR." @${ECHO_MSG} "by defining WITH_APACHE2_APR."
.endif .endif
@${ECHO_MSG} "" @${ECHO_MSG} ""

6
devel/subversion/Makefile
View file

@ -155,7 +155,7 @@ SVNGROUP?= svn
.endif .endif
.if defined(WITH_APACHE2_APR) .if defined(WITH_APACHE2_APR)
APACHE2_PORT?= www/apache2 APACHE2_PORT?= www/apache20
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
.if ${APACHE2_PORT} == "www/apache21" .if ${APACHE2_PORT} == "www/apache21"
@ -263,11 +263,11 @@ pre-extract:
.endif .endif
@${ECHO_MSG} "" @${ECHO_MSG} ""
.if defined(WITH_APACHE2_APR) .if defined(WITH_APACHE2_APR)
@${ECHO_MSG} "Using APR from www/apache2. If you have the devel/apr" @${ECHO_MSG} "Using APR from www/apache20. If you have the devel/apr"
@${ECHO_MSG} "port/package installed, you may need to remove it." @${ECHO_MSG} "port/package installed, you may need to remove it."
.else .else
@${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "You can link subversion against the APR built with"
@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port," @${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
@${ECHO_MSG} "by defining WITH_APACHE2_APR." @${ECHO_MSG} "by defining WITH_APACHE2_APR."
.endif .endif
@${ECHO_MSG} "" @${ECHO_MSG} ""

6
devel/subversion16/Makefile
View file

@ -155,7 +155,7 @@ SVNGROUP?= svn
.endif .endif
.if defined(WITH_APACHE2_APR) .if defined(WITH_APACHE2_APR)
APACHE2_PORT?= www/apache2 APACHE2_PORT?= www/apache20
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
.if ${APACHE2_PORT} == "www/apache21" .if ${APACHE2_PORT} == "www/apache21"
@ -263,11 +263,11 @@ pre-extract:
.endif .endif
@${ECHO_MSG} "" @${ECHO_MSG} ""
.if defined(WITH_APACHE2_APR) .if defined(WITH_APACHE2_APR)
@${ECHO_MSG} "Using APR from www/apache2. If you have the devel/apr" @${ECHO_MSG} "Using APR from www/apache20. If you have the devel/apr"
@${ECHO_MSG} "port/package installed, you may need to remove it." @${ECHO_MSG} "port/package installed, you may need to remove it."
.else .else
@${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "You can link subversion against the APR built with"
@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port," @${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
@${ECHO_MSG} "by defining WITH_APACHE2_APR." @${ECHO_MSG} "by defining WITH_APACHE2_APR."
.endif .endif
@${ECHO_MSG} "" @${ECHO_MSG} ""

2
lang/php4/Makefile
View file

@ -131,7 +131,7 @@ APACHE_MPM!= ${APXS} -q MPM_NAME
.endif .endif
.if defined(WITH_APACHE2) .if defined(WITH_APACHE2)
APACHE_MPM?= ${WITH_MPM} APACHE_MPM?= ${WITH_MPM}
APACHE_PORT= www/apache2 APACHE_PORT= www/apache20
CONFIGURE_ARGS+=--with-apxs2=${APXS} CONFIGURE_ARGS+=--with-apxs2=${APXS}
SAPI_FILE= libexec/apache2/libphp4.so SAPI_FILE= libexec/apache2/libphp4.so
.if ${APACHE_MPM} == "worker" .if ${APACHE_MPM} == "worker"

2
lang/php5/Makefile
View file

@ -128,7 +128,7 @@ APACHE_MPM!= ${APXS} -q MPM_NAME
.endif .endif
.if defined(WITH_APACHE2) .if defined(WITH_APACHE2)
APACHE_MPM?= ${WITH_MPM} APACHE_MPM?= ${WITH_MPM}
APACHE_PORT= www/apache2 APACHE_PORT= www/apache20
CONFIGURE_ARGS+=--with-apxs2=${APXS} CONFIGURE_ARGS+=--with-apxs2=${APXS}
SAPI_FILE= libexec/apache2/libphp5.so SAPI_FILE= libexec/apache2/libphp5.so
.if ${APACHE_MPM} == "worker" .if ${APACHE_MPM} == "worker"

2
lang/php53/Makefile
View file

@ -128,7 +128,7 @@ APACHE_MPM!= ${APXS} -q MPM_NAME
.endif .endif
.if defined(WITH_APACHE2) .if defined(WITH_APACHE2)
APACHE_MPM?= ${WITH_MPM} APACHE_MPM?= ${WITH_MPM}
APACHE_PORT= www/apache2 APACHE_PORT= www/apache20
CONFIGURE_ARGS+=--with-apxs2=${APXS} CONFIGURE_ARGS+=--with-apxs2=${APXS}
SAPI_FILE= libexec/apache2/libphp5.so SAPI_FILE= libexec/apache2/libphp5.so
.if ${APACHE_MPM} == "worker" .if ${APACHE_MPM} == "worker"

2
misc/linux-opengroupware/Makefile
View file

@ -22,7 +22,7 @@ MAINTAINER= frank@opengroupware.org
COMMENT= Groupware package including mail, calendar, palm sync and much more COMMENT= Groupware package including mail, calendar, palm sync and much more
EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \ RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20 \
${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake ${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake

2
net/xbone-gui/Makefile
View file

@ -28,7 +28,7 @@ BUILD_DEPENDS= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-S
${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \ ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail\ ${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail\
${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6\ ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6\
${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \ ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20 \
${SITE_PERL}/${PERL_ARCH}/APR.pm:${PORTSDIR}/www/mod_perl2 \ ${SITE_PERL}/${PERL_ARCH}/APR.pm:${PORTSDIR}/www/mod_perl2 \
${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \ ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
${SITE_PERL}/Tk/Getopt.pm:${PORTSDIR}/x11-toolkits/p5-Tk-Getopt \ ${SITE_PERL}/Tk/Getopt.pm:${PORTSDIR}/x11-toolkits/p5-Tk-Getopt \

2
www/Makefile
View file

@ -27,7 +27,7 @@
SUBDIR += apache13-modssl SUBDIR += apache13-modssl
SUBDIR += apache13-modssl+ipv6 SUBDIR += apache13-modssl+ipv6
SUBDIR += apache13-ssl SUBDIR += apache13-ssl
SUBDIR += apache2 SUBDIR += apache20
SUBDIR += apache21 SUBDIR += apache21
SUBDIR += apache22 SUBDIR += apache22
SUBDIR += arena SUBDIR += arena

2
www/apache21/Makefile
View file

@ -144,7 +144,7 @@ WITH_PTHREAD_CFLAGS?= ${PTHREAD_CFLAGS}
.include "${APACHEDIR}/Makefile.doc" .include "${APACHEDIR}/Makefile.doc"
.include "${APACHEDIR}/Makefile.modules" .include "${APACHEDIR}/Makefile.modules"
WANT_APACHE= common21 WANT_APACHE= common21
.include "${APACHEDIR}/../apache2/Makefile.modules.3rd" .include "${APACHEDIR}/../apache20/Makefile.modules.3rd"
CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET} CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}

2
www/dpsearch/Makefile
View file

@ -102,7 +102,7 @@ CONFIGURE_ARGS+=--enable-idn
.if defined(WITH_DPSEARCH_APACHE) .if defined(WITH_DPSEARCH_APACHE)
.if defined (WITH_APACHE2) .if defined (WITH_APACHE2)
BUILD_DEPEND+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 BUILD_DEPEND+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20
.else .else
BUILD_DEPEND+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 BUILD_DEPEND+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
.endif .endif

2
www/gnome-user-share/Makefile
View file

@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_X_PREFIX= yes USE_X_PREFIX= yes
USE_APACHE= yes USE_APACHE= yes
APACHE_PORT= www/apache2 APACHE_PORT= www/apache20
USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2 USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2
USE_REINPLACE= yes USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15 USE_AUTOTOOLS= libtool:15

2
www/mod_access_identd/Makefile
View file

@ -19,5 +19,5 @@ AP_FAST_BUILD= YES
AP_GENPLIST= YES AP_GENPLIST= YES
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

2
www/mod_access_referer/Makefile
View file

@ -27,7 +27,7 @@ AP_GENPLIST= YES
PORTDOCS= HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html PORTDOCS= HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)

2
www/mod_accesscookie/Makefile
View file

@ -24,7 +24,7 @@ AP_LIB+= ${LOCALBASE}/lib/mysql -lmysqlclient
PORTDOCS= README PORTDOCS= README
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}

2
www/mod_auth_any/Makefile
View file

@ -26,5 +26,5 @@ AP_INC+= . -DWITH_APACHE2=1
WANT_APACHE= 13 WANT_APACHE= 13
.endif .endif
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

2
www/mod_auth_cookie_mysql/Makefile
View file

@ -26,7 +26,7 @@ AP_INC?= ${LOCALBASE}/include/mysql
AP_LIB?= ${LOCALBASE}/lib/mysql -lmysqlclient -lz AP_LIB?= ${LOCALBASE}/lib/mysql -lmysqlclient -lz
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
@(cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.so) @(cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.so)
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)

2
www/mod_auth_cookie_mysql2/Makefile
View file

@ -27,7 +27,7 @@ AP_LIB?= ${LOCALBASE}/lib/mysql -lmysqlclient -lz
PORTDOCS= mod_auth_cookie_mysql.html PORTDOCS= mod_auth_cookie_mysql.html
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

2
www/mod_auth_external2/Makefile
View file

@ -22,7 +22,7 @@ SHORTMODNAME= external_auth
PORTDOCS= AUTHENTICATORS INSTALL README PORTDOCS= AUTHENTICATORS INSTALL README
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

2
www/mod_auth_imap/Makefile
View file

@ -21,7 +21,7 @@ AP_GENPLIST= YES
PORTDOCS= htaccess-example httpd.conf-append-example PORTDOCS= htaccess-example httpd.conf-append-example
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
post-install: post-install:

2
www/mod_auth_mysql2/Makefile
View file

@ -29,7 +29,7 @@ AP_LIB+= ${LOCALBASE}/lib/mysql -lmysqlclient
PORTDOCS= INSTALL example_data.html htpasswd.sql PORTDOCS= INSTALL example_data.html htpasswd.sql
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}
@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}

2
www/mod_auth_mysql_another/Makefile
View file

@ -37,5 +37,5 @@ post-install:
@${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
.endif .endif
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

2
www/mod_auth_pam2/Makefile
View file

@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-2.0-${PORTVERSION}
MAINTAINER= apache@FreeBSD.org MAINTAINER= apache@FreeBSD.org
COMMENT= Allows users to use PAM modules for user authentication COMMENT= Allows users to use PAM modules for user authentication
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS= ${BUILD_DEPENDS}
LATEST_LINK= mod_auth_pam2 LATEST_LINK= mod_auth_pam2

2
www/mod_auth_pgsql2/Makefile
View file

@ -13,7 +13,7 @@ MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/
MAINTAINER= apache@FreeBSD.org MAINTAINER= apache@FreeBSD.org
COMMENT= Allows users to use PostgreSQL databases for user authentication COMMENT= Allows users to use PostgreSQL databases for user authentication
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PGSQL= yes USE_PGSQL= yes

2
www/mod_auth_useragent/Makefile
View file

@ -20,7 +20,7 @@ AP_GENPLIST= yes
PORTDOCS= README faq.html PORTDOCS= README faq.html
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}
.for f in ${PORTDOCS} .for f in ${PORTDOCS}

2
www/mod_bw/Makefile
View file

@ -24,7 +24,7 @@ SRC_FILE= bw_mod-0.6.c
PORTDOCS= APACHE2-LICENSE LICENSE bw_mod-0.6.txt PORTDOCS= APACHE2-LICENSE LICENSE bw_mod-0.6.txt
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
post-install: post-install:
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}
@cd ${WRKSRC} && \ @cd ${WRKSRC} && \

2
www/mod_cband/Makefile
View file

@ -23,7 +23,7 @@ ALL_TARGET= #
PORTDOCS= libpatricia.copyright PORTDOCS= libpatricia.copyright
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/libpatricia.copyright ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/libpatricia.copyright ${DOCSDIR}

2
www/mod_cfg_ldap/Makefile
View file

@ -29,7 +29,7 @@ PORTDOCS= AUTHORS cfg_ldap.conf ChangeLog COPYING INSTALL \
mod_cfg_ldap.schema README TODO mod_cfg_ldap.schema README TODO
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined (NOPORTDOCS) .if !defined (NOPORTDOCS)

2
www/mod_chroot/Makefile
View file

@ -18,7 +18,7 @@ AP_FAST_BUILD= YES
AP_GENPLIST= YES AP_GENPLIST= YES
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

2
www/mod_curb/Makefile
View file

@ -22,7 +22,7 @@ AP_GENPLIST= YES
PORTDOCS= README PORTDOCS= README
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
post-install: post-install:
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

2
www/mod_dosevasive20/Makefile
View file

@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/mod_dosevasive
PORTDOCS= LICENSE README test.pl PORTDOCS= LICENSE README test.pl
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-patch: post-patch:
@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \ @${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \

2
www/mod_evasive/Makefile
View file

@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/mod_dosevasive
PORTDOCS= LICENSE README test.pl PORTDOCS= LICENSE README test.pl
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-patch: post-patch:
@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \ @${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \

2
www/mod_evasive20/Makefile
View file

@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/mod_dosevasive
PORTDOCS= LICENSE README test.pl PORTDOCS= LICENSE README test.pl
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-patch: post-patch:
@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \ @${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \

2
www/mod_injection/Makefile
View file

@ -13,7 +13,7 @@ MASTER_SITES= http://pmade.org/distfiles/oss-releases/
MAINTAINER= apache@FreeBSD.org MAINTAINER= apache@FreeBSD.org
COMMENT= Injects text in the HTTP response after a HTML tag COMMENT= Injects text in the HTTP response after a HTML tag
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS= ${BUILD_DEPENDS}
APXS?= ${LOCALBASE}/sbin/apxs APXS?= ${LOCALBASE}/sbin/apxs

2
www/mod_log_config-st/Makefile
View file

@ -23,7 +23,7 @@ SHORTMODNAME= log_config
MODULENAME= mod_log_config-st MODULENAME= mod_log_config-st
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
@${CAT} ${PKGMESSAGE} @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

2
www/mod_log_mysql/Makefile
View file

@ -26,5 +26,5 @@ AP_INC+= ${LOCALBASE}/include/mysql
AP_LIB+= ${LOCALBASE}/lib/mysql -lmysqlclient AP_LIB+= ${LOCALBASE}/lib/mysql -lmysqlclient
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

2
www/mod_log_sql2/Makefile
View file

@ -29,7 +29,7 @@ CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
CONFIGURE_ARGS+= --with-dbi=${LOCALBASE} CONFIGURE_ARGS+= --with-dbi=${LOCALBASE}
LIB_DEPENDS+= dbi.0:${PORTSDIR}/databases/libdbi LIB_DEPENDS+= dbi.0:${PORTSDIR}/databases/libdbi
.endif .endif
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
. if ${AP_VER} == 13 . if ${AP_VER} == 13
WITHOUT_SSL= YES WITHOUT_SSL= YES
. endif . endif

2
www/mod_macro/Makefile
View file

@ -20,7 +20,7 @@ AP_GENPLIST= YES
PORTDOCS= ${PORTNAME}.html PORTDOCS= ${PORTNAME}.html
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)

2
www/mod_macro2/Makefile
View file

@ -20,7 +20,7 @@ AP_GENPLIST= YES
PORTDOCS= ${PORTNAME}.html PORTDOCS= ${PORTNAME}.html
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

2
www/mod_musicindex/Makefile
View file

@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}
SUB_FILES= pkg-message SUB_FILES= pkg-message
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
MAKE_ENV+= APXS=${APXS} CPPFLAGS="${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV+= APXS=${APXS} CPPFLAGS="${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"

2
www/mod_rpaf/Makefile
View file

@ -20,5 +20,5 @@ AP2_SRC_FILE= mod_rpaf-2.0.c
AP2_PKGNAMESUFFIX= -ap2 AP2_PKGNAMESUFFIX= -ap2
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

2
www/mod_tidy/Makefile
View file

@ -26,7 +26,7 @@ PLIST_FILES= ${DOCSDIR:S/${PREFIX}\///}/LICENSE
PLIST_DIRS= ${DOCSDIR:S/${PREFIX}\///} PLIST_DIRS= ${DOCSDIR:S/${PREFIX}\///}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

2
www/mod_traf_thief/Makefile
View file

@ -16,7 +16,7 @@ DIST_SUBDIR= apache2
MAINTAINER= apache@FreeBSD.org MAINTAINER= apache@FreeBSD.org
COMMENT= Allows you to redirect part of the traffic to your url COMMENT= Allows you to redirect part of the traffic to your url
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS= ${BUILD_DEPENDS}
RESTRICTED= No licence RESTRICTED= No licence

4
www/mod_transform/Makefile
View file

@ -13,8 +13,8 @@ MASTER_SITES= http://www.outoforder.cc/downloads/mod_transform/
MAINTAINER= stan@stormier.net MAINTAINER= stan@stormier.net
COMMENT= An XSLT and XIncludes Filter module for Apache 2.0 COMMENT= An XSLT and XIncludes Filter module for Apache 2.0
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache200
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache200
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
USE_GNOME= libxslt USE_GNOME= libxslt

4
www/mod_v2h/Makefile
View file

@ -14,9 +14,9 @@ DISTNAME= mod_v2h
MAINTAINER= apache@FreeBSD.org MAINTAINER= apache@FreeBSD.org
COMMENT= A mass virtual hosting module for Apache with support COMMENT= A mass virtual hosting module for Apache with support
BUILD_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \ BUILD_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache200 \
${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client ${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \ RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache200 \
${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client ${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
WRKSRC= ${WRKDIR}/${DISTNAME}-2 WRKSRC= ${WRKDIR}/${DISTNAME}-2

2
www/mod_vdbh/Makefile
View file

@ -26,7 +26,7 @@ AP_LIB+= ${LOCALBASE}/lib/mysql -lmysqlclient
PORTDOCS= AUTHORS README TODO PORTDOCS= AUTHORS README TODO
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined (NOPORTDOCS) .if !defined (NOPORTDOCS)

2
www/mod_vhost_ldap/Makefile
View file

@ -31,7 +31,7 @@ IGNORE= Requires support of LDAP in apache 2.0.x port
.endif .endif
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
post-install: post-install:
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}
@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}

2
www/mod_vhs/Makefile
View file

@ -38,7 +38,7 @@ PORTDOCS= ChangeLog AUTHORS README.logs README.wildcards WARNING \
WARNING.THREADS README.phpopt WARNING.THREADS README.phpopt
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd" .include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
post-install: post-install:
.if !defined (NOPORTDOCS) .if !defined (NOPORTDOCS)

2
www/resin2/Makefile
View file

@ -71,7 +71,7 @@ PLIST_SUB+= APACHE=""
# #
# Apache 2 # Apache 2
# #
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/www/apache20
CONFIGURE_ARGS+= --with-apxs=${APXS} CONFIGURE_ARGS+= --with-apxs=${APXS}
PLIST_SUB+= MOD_DIR=libexec/apache2 PLIST_SUB+= MOD_DIR=libexec/apache2
# Allow apxs invocations # Allow apxs invocations

2
www/resin3/Makefile
View file

@ -74,7 +74,7 @@ PLIST_SUB+= APACHE=""
# #
# Apache 2 # Apache 2
# #
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/www/apache20
CONFIGURE_ARGS+= --with-apxs=${APXS} CONFIGURE_ARGS+= --with-apxs=${APXS}
PLIST_SUB+= MOD_DIR=libexec/apache2 PLIST_SUB+= MOD_DIR=libexec/apache2
# Allow apxs invocations # Allow apxs invocations

2
www/suphp/Makefile
View file

@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-setid-mode=${WITH_SETID_MODE}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/include/apache2/apr.h) || defined(WITH_APACHE2) .if exists(${LOCALBASE}/include/apache2/apr.h) || defined(WITH_APACHE2)
APACHE_PORT= www/apache2 APACHE_PORT= www/apache20
PLIST_SUB+= MODULEDIR="libexec/apache2/" PLIST_SUB+= MODULEDIR="libexec/apache2/"
.else .else
PLIST_SUB+= MODULEDIR="libexec/apache/" PLIST_SUB+= MODULEDIR="libexec/apache/"