Many ports which depends on apache don't use AP_PORT, but use direct keyword - apache13. I am using apache13-modssl. But many ports depends on apache13. So package dependency is not correct. Fix: EXSAMPLE FROM *_DEPENDS= ${PREFIX}/sbin/apxs:${PORTSDIR}/www/apache13 *_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13 TO *_DEPENDS= ${PREFIX}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} *_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/${AP_PORT} AP_PORT?= apache13 But. I think that add AP_PORT?=apache13 to bsd.port.mk, and only *_DEPENDS=${PREFIX}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} to each ports. TARGET PORTS: databases/mysql-editor ftp/ftplocate lang/eperl mail/ezmlm-web mail/mailman misc/instant-server security/acid textproc/htdig www/apache-contrib www/apache-jserv www/bk2site www/mnogosearch www/mod_access_identd www/mod_access_referer www/mod_auth_any www/mod_auth_external www/mod_auth_mysql www/mod_auth_pam www/mod_auth_pgsql www/mod_backhand www/mod_bf www/mod_cgi_debug www/mod_color www/mod_csacek www/mod_cvs www/mod_dav www/mod_dtcl www/mod_extract_forwarded www/mod_fastcgi www/mod_frontpage www/mod_gzip www/mod_hosts_access www/mod_index_rss www/mod_jk www/mod_layout www/mod_mp3 www/mod_perl www/mod_php3 www/mod_php4 www/mod_proxy_add_forward www/mod_put www/mod_python www/mod_roaming www/mod_ruby www/mod_sed www/mod_sequester www/mod_snake www/mod_throttle www/mod_ticket www/mod_trigger www/mod_tsunami www/mod_watch www/mod_zap www/p5-libapreq www/smb2www www/webglimpse www/wwwstat www/auth_ldap www/neowebscript www/mod_mylo www/mod_mysqluserdir www/mod_sqlinclude www/mod_log_mysql www/horde-devel How-To-Repeat: find /usr/ports -name Makefile | xargs grep apache13
On Sat, Dec 08, 2001 at 23:51:16 +0900, Norikatsu Shigemura wrote: > But. I think that add AP_PORT?=apache13 to bsd.port.mk, and > only *_DEPENDS=${PREFIX}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} > to each ports. maybe it's portmgr's pr ? :) -- Allocate four digits for the year part of a date : a new millennium is coming. --- David Huber
On Sun, 9 Dec 2001 05:14:01 +0800 Ying-Chieh Liao <ijliao@FreeBSD.ORG> wrote: > > But. I think that add AP_PORT?=apache13 to bsd.port.mk, and > > only *_DEPENDS=${PREFIX}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} > > to each ports. > maybe it's portmgr's pr ? :) Yes. Please. And, after report, I think that it might be a good idea to extend AP_PORT?=apache13 to www/apache13. Because of support for russian/apache13 etc...
Responsible Changed From-To: freebsd-ports->portmgr Bounce this one (temporarily) over to portmgr@ - if the proposed addition to bsd.port.mk makes sense (AP_PORT=? www/apache13), I'll sling this back my way and do the grunt work.
I think the variable should be named APACHE_PORT so it is less cryptic. This is consistent with the PERL_PORT variable I just committed to bsd.port.mk. I also like the idea of having it include the category name. If someone can submit the patch (should be trivial) I'll test it on a future bento build. Kris
Here the Patch: kind regards Dirk - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org] Index: databases/mysql-editor/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysql-editor/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- databases/mysql-editor/Makefile 7 Mar 2003 05:58:26 -0000 1.2 +++ databases/mysql-editor/Makefile 20 Aug 2003 05:57:41 -0000 @@ -16,11 +16,12 @@ COMMENT= CGI scripts in Perl to edit your MySQL tables RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ - ${CGI_BIN}:${PORTSDIR}/www/apache13 + ${CGI_BIN}:${PORTSDIR}/${APACHE_PORT} NO_BUILD= True CGI_BIN= ${LOCALBASE}/www/cgi-bin +APACHE_PORT?= www/apache13 do-install: ${MKDIR} ${CGI_BIN}/mysql-editor Index: databases/mysqlman/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysqlman/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- databases/mysqlman/Makefile 30 Jul 2003 22:59:53 -0000 1.5 +++ databases/mysqlman/Makefile 20 Aug 2003 05:57:41 -0000 @@ -14,7 +14,7 @@ COMMENT= MySQLMan is a web based MySQL database manager written in perl RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ - ${WWW_DIR}:${PORTSDIR}/www/apache13 + ${WWW_DIR}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${DISTNAME}-${PORTVERSION} RESTRICTED= "not redistributable, license agreement required" @@ -34,6 +34,7 @@ #Web user WEBUSER?= www:www +APACHE_PORT?= www/apache13 .include <bsd.port.pre.mk> Index: devel/subversion/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile,v retrieving revision 1.39 diff -u -r1.39 Makefile --- devel/subversion/Makefile 25 Jul 2003 22:47:56 -0000 1.39 +++ devel/subversion/Makefile 20 Aug 2003 05:57:41 -0000 @@ -32,7 +32,7 @@ MAN1= svn.1 svnadmin.1 MANCOMPRESSED= no -APXS=${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes @@ -45,9 +45,9 @@ .endif .if defined(WITH_APACHE2_APR) -APACHE2_PORT?= ${PORTSDIR}/www/apache2 -BUILD_DEPENDS+= ${APXS}:${APACHE2_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE2_PORT} +APACHE2_PORT?= www/apache2 +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ --with-apr-util=${LOCALBASE}/lib/apache2/apu-config .else Index: ftp/ftplocate/Makefile =================================================================== RCS file: /home/pcvs/ports/ftp/ftplocate/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- ftp/ftplocate/Makefile 21 Feb 2003 12:00:36 -0000 1.13 +++ ftp/ftplocate/Makefile 20 Aug 2003 05:57:41 -0000 @@ -14,7 +14,7 @@ MAINTAINER= tung@turtle.ee.ncku.edu.tw COMMENT= A ftp search engine supporting filename and description search -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= glimpse:${PORTSDIR}/textproc/glimpse \ unzip:${PORTSDIR}/archivers/unzip @@ -22,6 +22,8 @@ USE_PERL5_RUN= yes USE_REINPLACE= yes NO_BUILD= yes +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 PL_FILES= install.pl bin/dcollect.pl bin/dindex.pl bin/dsearch.pl \ bin/flcollect.pl bin/flfilter.pl bin/flhistory.pl \ Index: lang/eperl/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/eperl/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- lang/eperl/Makefile 21 Feb 2003 12:35:00 -0000 1.36 +++ lang/eperl/Makefile 20 Aug 2003 05:57:41 -0000 @@ -22,12 +22,13 @@ #INSTALL_ALSO_AS_SSSL= yes .if defined(INSTALL_ALSO_AS_SSSL) -RUN_DEPENDS= ${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/www/apache +RUN_DEPENDS= ${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/${APACHE_PORT} .endif USE_PERL5= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-perl=${PERL5} +APACHE_PORT?= www/apache13 MAN1= eperl.1 Index: lang/php4/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php4/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- lang/php4/Makefile 19 Aug 2003 01:57:50 -0000 1.24 +++ lang/php4/Makefile 20 Aug 2003 05:57:42 -0000 @@ -151,17 +151,17 @@ APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp4.so .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp4.so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} PLIST_SUB+= APACHE="" .else Index: lang/php5/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php5/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- lang/php5/Makefile 15 Aug 2003 00:49:26 -0000 1.22 +++ lang/php5/Makefile 20 Aug 2003 05:57:43 -0000 @@ -155,17 +155,17 @@ APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp5.so .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp5.so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} PLIST_SUB+= APACHE="" .else Index: mail/websieve/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/websieve/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- mail/websieve/Makefile 29 Apr 2003 13:30:23 -0000 1.3 +++ mail/websieve/Makefile 20 Aug 2003 05:57:44 -0000 @@ -29,11 +29,7 @@ RUN_DEPENDS= ${SITE_PERL}/IMAP/Admin.pm:${PORTSDIR}/mail/p5-IMAP-Admin \ ${SITE_PERL}/IMAP/Sieve.pm:${PORTSDIR}/mail/p5-IMAP-Sieve .endif -.if defined(WITH_APACHE2) -RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache2 -.else -RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache13 -.endif +RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message @@ -44,6 +40,12 @@ NO_BUILD= yes CYRUS_IMAP_PM= ${SITE_PERL}/${PERL_ARCH}/Cyrus/IMAP/Admin.pm + +.if defined(WITH_APACHE2) +APACHE_PORT?= www/apache2 +.else +APACHE_PORT?= www/apache13 +.endif .if defined(WITH_CYRUS_IMAPD_VER) FUNCLIB_PL= funclib.cyrus Index: misc/instant-server/Makefile =================================================================== RCS file: /home/pcvs/ports/misc/instant-server/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- misc/instant-server/Makefile 7 Mar 2003 06:07:02 -0000 1.6 +++ misc/instant-server/Makefile 20 Aug 2003 05:57:44 -0000 @@ -20,13 +20,14 @@ ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba \ ${LOCALBASE}/sbin/traceroute:${PORTSDIR}/net/traceroute \ cnewsdo:${PORTSDIR}/news/cnews \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \ + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24 # Don't let stupid programs ask for configuration. BATCH= YES NO_WRKSUBDIR= YES +APACHE_PORT?= www/apache13 # comms/hylafax irc/ircd-hybrid Index: textproc/htdig/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/htdig/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- textproc/htdig/Makefile 7 Mar 2003 06:11:40 -0000 1.23 +++ textproc/htdig/Makefile 20 Aug 2003 05:57:44 -0000 @@ -14,9 +14,10 @@ MAINTAINER= DougB@FreeBSD.org COMMENT= A www indexing and searching system -RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/${APACHE_PORT} GNU_CONFIGURE= yes +APACHE_PORT?= www/apache13 CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \ --with-image-dir=${PREFIX}/share/apache/icons/htdig \ --with-search-dir=${PREFIX}/share/apache/htdocs \ Index: www/apache-contrib/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache-contrib/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/apache-contrib/Makefile 20 Feb 2003 19:15:22 -0000 1.12 +++ www/apache-contrib/Makefile 20 Aug 2003 05:57:44 -0000 @@ -14,12 +14,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Third-party modules contributed to the Apache HTTP server project -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs -AP_PORT?= apache13 +APACHE_PORT?= www/apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif Index: www/apache-jserv/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache-jserv/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- www/apache-jserv/Makefile 21 Feb 2003 14:01:12 -0000 1.15 +++ www/apache-jserv/Makefile 20 Aug 2003 05:57:44 -0000 @@ -18,10 +18,10 @@ USE_JAVA= 1.1+ NEED_JAVAC= yes -BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\ +BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\ ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper\ - ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\ + ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\ ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk USE_GMAKE= yes @@ -29,13 +29,15 @@ USE_LIBTOOL= yes USE_PERL5= yes JAVAVM?= ${LOCALBASE}/bin/javavm +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 CONFIGURE_ENV= PERL=${PERL} CONFIGURE_ARGS= --prefix=${PREFIX}\ --libexecdir=${LOCALBASE}/libexec/apache\ --libdir=${LOCALBASE}/libexec/apache\ --with-logdir=/var/log\ --sysconfdir=${PREFIX}/etc/apache\ - --with-apxs=${LOCALBASE}/sbin/apxs\ + --with-apxs=${APXS}\ --with-jdk-home=${JAVA_HOME}\ --with-JSDK=${LOCALBASE}/share/java/classes/jsdk.jar\ --with-java=${JAVA}\ Index: www/auth_ldap/Makefile =================================================================== RCS file: /home/pcvs/ports/www/auth_ldap/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/auth_ldap/Makefile 14 Aug 2003 18:00:01 -0000 1.12 +++ www/auth_ldap/Makefile 20 Aug 2003 05:57:45 -0000 @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to authenticate against an LDAP directory -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= lber.2:${PORTSDIR}/${LDAP_PORT} RUN_DEPENDS= ${APXS}:${APACHE_PORT} @@ -27,7 +27,7 @@ USE_GMAKE= yes APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 LDAP_PORT?= net/openldap20-client MAKE_ARGS+= APXS=${APXS} Index: www/bk2site/Makefile =================================================================== RCS file: /home/pcvs/ports/www/bk2site/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/bk2site/Makefile 7 Mar 2003 06:12:35 -0000 1.11 +++ www/bk2site/Makefile 20 Aug 2003 05:57:45 -0000 @@ -16,9 +16,10 @@ COMMENT= Transforms Netscape bookmarks into a Yahoo-like website .include <bsd.port.pre.mk> -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 .if exists(${APXS}) -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} # Specify these directories in relative paths to ${PREFIX}. .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache) Index: www/dansguardian/Makefile =================================================================== RCS file: /home/pcvs/ports/www/dansguardian/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/dansguardian/Makefile 21 Feb 2003 14:01:15 -0000 1.8 +++ www/dansguardian/Makefile 20 Aug 2003 05:57:46 -0000 @@ -16,8 +16,9 @@ COMMENT= A fast, simple web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install +APACHE_PORT?= www/apache13 WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ Index: www/dansguardian-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/www/dansguardian-devel/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/dansguardian-devel/Makefile 28 Mar 2003 01:25:19 -0000 1.7 +++ www/dansguardian-devel/Makefile 20 Aug 2003 05:57:46 -0000 @@ -15,8 +15,9 @@ COMMENT= A fast, simple web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install +APACHE_PORT?= www/apache13 WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} GNU_CONFIGURE= yes Index: www/mnogosearch/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mnogosearch/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- www/mnogosearch/Makefile 17 Jun 2003 11:33:19 -0000 1.38 +++ www/mnogosearch/Makefile 20 Aug 2003 05:57:50 -0000 @@ -20,13 +20,14 @@ USE_LIBTOOL= yes INSTALLS_SHLIB= yes USE_GMAKE= yes +APACHE_PORT?= www/apache13 CONFIGURE_ARGS= --enable-phrase \ --enable-shared \ --enable-freebsd-pthreads \ --sysconfdir=${PREFIX}/etc/mnogosearch \ --localstatedir=/var/mnogosearch -RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} .ifndef NO_OPENSSL USE_OPENSSL= yes Index: www/mod_access_identd/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_access_identd/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_access_identd/Makefile 20 Feb 2003 19:15:27 -0000 1.5 +++ www/mod_access_identd/Makefile 20 Aug 2003 05:57:50 -0000 @@ -13,12 +13,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to supply access control based on ident reply -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${LOCALBASE}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${LOCALBASE}/${APACHE_PORT} WRKSRC= ${WRKDIR}/mod_access_identd APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_access_referer/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_access_referer/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_access_referer/Makefile 20 Feb 2003 19:15:27 -0000 1.7 +++ www/mod_access_referer/Makefile 20 Aug 2003 05:57:50 -0000 @@ -14,11 +14,11 @@ MAINTAINER= ports@freebsd.org COMMENT= An Apache module that provides access control based on Referer HTTP header -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 DOCS= HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html Index: www/mod_accounting/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_accounting/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_accounting/Makefile 5 Aug 2003 05:30:14 -0000 1.5 +++ www/mod_accounting/Makefile 20 Aug 2003 05:57:50 -0000 @@ -15,10 +15,11 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= An Apache module that records traffic statistics into a database -BUILD_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} MAKE_ARGS+= APXS="${APXS}" APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 # MySQL deps hack MYSQL323_LIBVER=10 Index: www/mod_auth_any/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_any/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_auth_any/Makefile 25 Mar 2003 04:23:11 -0000 1.6 +++ www/mod_auth_any/Makefile 20 Aug 2003 05:57:50 -0000 @@ -15,11 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to use any command line program to authenticate a user -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 post-patch: @${CAT} ${FILESDIR}/bash_single_quote_escape_string.c >> \ Index: www/mod_auth_external/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_external/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_auth_external/Makefile 7 Mar 2003 06:12:41 -0000 1.8 +++ www/mod_auth_external/Makefile 20 Aug 2003 05:57:50 -0000 @@ -14,10 +14,11 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Enables the use of external mechanisms for user authentication -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 DOCDIR= ${PREFIX}/share/doc/${PORTNAME} DOCS= AUTHENTICATORS CHANGES INSTALL README TODO Index: www/mod_auth_kerb/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_kerb/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_auth_kerb/Makefile 7 Mar 2003 06:12:41 -0000 1.6 +++ www/mod_auth_kerb/Makefile 20 Aug 2003 05:57:50 -0000 @@ -23,13 +23,14 @@ # (i.e., HTTP over SSL/TLS). Thus, we require as a dependency # a version of Apache which can do this. # -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13-modssl -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13-modssl +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= krb5.3:${PORTSDIR}/security/krb5 WRKSRC= ${WRKDIR}/src/modules/kerberos APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13-modssl KRB5_HOME?= ${LOCALBASE} do-build: Index: www/mod_auth_mysql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_mysql/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_auth_mysql/Makefile 3 Mar 2003 04:00:46 -0000 1.12 +++ www/mod_auth_mysql/Makefile 20 Aug 2003 05:57:50 -0000 @@ -14,15 +14,15 @@ MAINTAINER= jeh@FreeBSD.org COMMENT= Allows users to use MySQL databases for user authentication -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} .include <bsd.port.pre.mk> -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 -AP_PORT?= apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif Index: www/mod_auth_mysql_another/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_mysql_another/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_auth_mysql_another/Makefile 30 Jun 2003 09:35:27 -0000 1.5 +++ www/mod_auth_mysql_another/Makefile 20 Aug 2003 05:57:50 -0000 @@ -31,22 +31,22 @@ WITH_APACHE2= yes .endif -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_APACHE2) -APACHE_PORT= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 APACHE_VER= APACHE2 PLIST_SUB= VER="2" DSO= mod_auth_mysql.la .else -APACHE_PORT= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 APACHE_VER= APACHE1 PLIST_SUB= VER="" DSO= mod_auth_mysql.so .endif -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} post-patch: @${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g;s|%%APXS%%|${APXS}|g;s|%%APACHE_VER%%|${APACHE_VER}|g;s|%%DSO%%|${DSO}|g' \ Index: www/mod_auth_pam/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pam/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_auth_pam/Makefile 7 Mar 2003 06:12:42 -0000 1.5 +++ www/mod_auth_pam/Makefile 20 Aug 2003 05:57:51 -0000 @@ -14,10 +14,11 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Allows users to use PAM modules for user authentication -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 do-build: @cd ${WRKSRC} && \ Index: www/mod_auth_pgsql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pgsql/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_auth_pgsql/Makefile 7 Mar 2003 06:12:42 -0000 1.12 +++ www/mod_auth_pgsql/Makefile 20 Aug 2003 05:57:51 -0000 @@ -13,8 +13,8 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= Allows users to use PostgreSQL databases for user authentication -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} @@ -22,8 +22,7 @@ .include <bsd.port.pre.mk> APXS?= ${LOCALBASE}/sbin/apxs -AP_PORT?= apache13 -APACHE_PORT?= ${PORTSDIR}/www/${AP_PORT} +APACHE_PORT?= www/apache13 POSTGRESQL_PORT?= databases/postgresql7 .if exists(${APXS}) Index: www/mod_auth_pwcheck/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pwcheck/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_auth_pwcheck/Makefile 21 Feb 2003 14:01:19 -0000 1.3 +++ www/mod_auth_pwcheck/Makefile 20 Aug 2003 05:57:51 -0000 @@ -13,8 +13,8 @@ MAINTAINER= anton@urc.ac.ru COMMENT= Apache module for user authentication via Cyrus pwcheck daemon -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl WRKSRC= ${WRKDIR}/${PORTNAME} @@ -22,6 +22,7 @@ .include <bsd.port.pre.mk> APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= ${AP_CATEGORY}/${AP_PORT} .if exists(${APXS}) AP_MOD_SSL_SUFFIX!= ${APXS} -q CFLAGS 2>/dev/null \ | ${GREP} DMOD_SSL >/dev/null \ Index: www/mod_backhand/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_backhand/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_backhand/Makefile 7 Mar 2003 06:12:42 -0000 1.6 +++ www/mod_backhand/Makefile 20 Aug 2003 05:57:51 -0000 @@ -13,10 +13,11 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= Apache module that allows seamless redirection and load balancing of HTTP requests -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs="${APXS}" Index: www/mod_bandwidth/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bandwidth/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- www/mod_bandwidth/Makefile 3 Jul 2003 15:13:09 -0000 1.1 +++ www/mod_bandwidth/Makefile 20 Aug 2003 05:57:51 -0000 @@ -14,12 +14,13 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Bandwidth management module for the Apache webserver -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} NO_WRKSUBDIR= YES APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 do-extract: @${MKDIR} ${WRKDIR} Index: www/mod_bf/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bf/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_bf/Makefile 20 Feb 2003 19:15:27 -0000 1.5 +++ www/mod_bf/Makefile 20 Aug 2003 05:57:51 -0000 @@ -14,11 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A brainf*ck module for Apache -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_blosxom/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_blosxom/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_blosxom/Makefile 9 May 2003 11:59:57 -0000 1.3 +++ www/mod_blosxom/Makefile 20 Aug 2003 05:57:51 -0000 @@ -15,9 +15,9 @@ COMMENT= Apache module to build the extremely lightweight Weblog environment APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} USE_REINPLACE= yes Index: www/mod_blowchunks/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_blowchunks/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_blowchunks/Makefile 20 Feb 2003 19:15:28 -0000 1.5 +++ www/mod_blowchunks/Makefile 20 Aug 2003 05:57:51 -0000 @@ -15,13 +15,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for rejecting and logging chunked requests -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} NO_WRKSUBDIR= YES APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 APXSFLAGS= -DTRUE=1 -DFALSE=0 .if !defined(WITHOUT_BLOWCHUNK_LOG) APXSFLAGS+= -DLOG_BLOWCHUNK Index: www/mod_bunzip2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bunzip2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_bunzip2/Makefile 21 Feb 2003 14:01:19 -0000 1.2 +++ www/mod_bunzip2/Makefile 20 Aug 2003 05:57:51 -0000 @@ -13,13 +13,13 @@ MAINTAINER= mod_bunzip2@oldach.net COMMENT= Apache module for server-side decompression of bzip2 files -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_BZIP2= yes WRKSRC= ${WRKDIR}/${PORTNAME}-2 APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 do-build: cd ${WRKSRC}; ${APXS} -c -lbz2 mod_bunzip2.c Index: www/mod_cgi_debug/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_cgi_debug/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_cgi_debug/Makefile 20 Feb 2003 19:15:28 -0000 1.6 +++ www/mod_cgi_debug/Makefile 20 Aug 2003 05:57:51 -0000 @@ -13,11 +13,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to make debugging server-side scripts easier -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_color/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_color/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_color/Makefile 20 Feb 2003 19:15:28 -0000 1.5 +++ www/mod_color/Makefile 20 Aug 2003 05:57:51 -0000 @@ -15,11 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that provides syntax coloring for various languages -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 NO_WRKSUBDIR= yes do-extract: Index: www/mod_csacek/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_csacek/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_csacek/Makefile 21 Feb 2003 14:01:19 -0000 1.5 +++ www/mod_csacek/Makefile 20 Aug 2003 05:57:51 -0000 @@ -14,10 +14,11 @@ MAINTAINER= ms@vol.cz COMMENT= Charset recoding module for Apache -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ Index: www/mod_cvs/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_cvs/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_cvs/Makefile 7 Mar 2003 06:12:42 -0000 1.4 +++ www/mod_cvs/Makefile 20 Aug 2003 05:57:51 -0000 @@ -16,13 +16,14 @@ MAINTAINER= petef@FreeBSD.org COMMENT= A module that makes Apache CVS aware -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_REINPLACE= yes MAKE_ARGS+= APXS="${APXS}" APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 post-patch: @${REINPLACE_CMD} -e 's,apxs,${APXS},g' ${WRKSRC}/Makefile Index: www/mod_dav/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_dav/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/mod_dav/Makefile 21 Feb 2003 14:01:20 -0000 1.10 +++ www/mod_dav/Makefile 20 Aug 2003 05:57:52 -0000 @@ -14,12 +14,14 @@ MAINTAINER= patrick@mindstep.com COMMENT= An Apache module that provides DAV capabilities -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} # This port will work with the following version of Apache and anything newer. APACHE_VERSION= 1.3.6 +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ @@ -29,7 +31,7 @@ --sysconfdir=${PREFIX}/etc/apache \ --datadir=${PREFIX}/share/apache \ --includedir=${PREFIX}/include/apache \ - --with-apxs=${PREFIX}/sbin/apxs + --with-apxs=${APXS} CONFIGURE_ENV= CFLAGS='${CFLAGS}' \ PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}" Index: www/mod_dtcl/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_dtcl/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- www/mod_dtcl/Makefile 7 Mar 2003 06:12:43 -0000 1.17 +++ www/mod_dtcl/Makefile 20 Aug 2003 05:57:52 -0000 @@ -13,11 +13,12 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 WRKSRC= ${WRKDIR}/mod_dtcl - MAKEFILE= ${FILESDIR}/Makefile.bsd do-install: Index: www/mod_extract_forwarded/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_extract_forwarded/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_extract_forwarded/Makefile 9 Apr 2003 22:07:25 -0000 1.7 +++ www/mod_extract_forwarded/Makefile 20 Aug 2003 05:57:52 -0000 @@ -14,12 +14,12 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module that can make proxied requests appear with client IP -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - -WRKSRC= ${WRKDIR}/${PORTNAME} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 +WRKSRC= ${WRKDIR}/${PORTNAME} DOCS= doc.html README do-build: Index: www/mod_fastcgi/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_fastcgi/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_fastcgi/Makefile 19 Jun 2003 15:41:36 -0000 1.12 +++ www/mod_fastcgi/Makefile 20 Aug 2003 05:57:52 -0000 @@ -14,19 +14,20 @@ MAINTAINER= hollywar@mail.holywar.net COMMENT= A fast-cgi module for Apache -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 MAKEFILE= Makefile.AP2 USE_REINPLACE= YES MAKE_ARGS= INCLUDES=-I${PREFIX}/include/apache2 INSTALL_TARGET= install-modules PLIST_SUB= APACHE=2 .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 PLIST_SUB= APACHE= .endif +APXS?= ${LOCALBASE}/sbin/apxs do-patch: .if defined(WITH_APACHE2) Index: www/mod_filter/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_filter/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_filter/Makefile 21 Feb 2003 14:01:20 -0000 1.2 +++ www/mod_filter/Makefile 20 Aug 2003 05:57:52 -0000 @@ -13,10 +13,11 @@ MAINTAINER= svenasse@polaris.ca COMMENT= Filter output from other modules inside of Apache -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 DOCS= README CONTRIB_DOCS= contrib/README contrib/echo.cgi contrib/eecummings.cgi contrib/head.cgi Index: www/mod_frontpage/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_frontpage/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_frontpage/Makefile 11 Aug 2003 15:25:51 -0000 1.14 +++ www/mod_frontpage/Makefile 20 Aug 2003 05:57:52 -0000 @@ -14,10 +14,9 @@ COMMENT= Improved mod_frontpage for Apache, as APXS installation WRKSRC= ${WRKDIR}/${PORTNAME}_mirfak-${PORTVERSION} -AP_PORT?= apache13 -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${FPSETPERM}:${PORTSDIR}/www/frontpage FP_VER= 5.0 @@ -31,7 +30,8 @@ INSTALL_FILE= ${INSTALL} -c -m 555 -o bin -g bin PKG_PREFIX= ${PREFIX} -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || ${ECHO} no Index: www/mod_geoip/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_geoip/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_geoip/Makefile 19 May 2003 22:11:33 -0000 1.6 +++ www/mod_geoip/Makefile 20 Aug 2003 05:57:52 -0000 @@ -15,14 +15,14 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= An Apache module that provides the country code of the client's IP -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= GeoIP.3:${PORTSDIR}/net/GeoIP .include <bsd.port.pre.mk> APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 DOCS= Changes INSTALL README README.php Index: www/mod_gzip/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_gzip/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/mod_gzip/Makefile 21 Feb 2003 14:01:20 -0000 1.11 +++ www/mod_gzip/Makefile 20 Aug 2003 05:57:52 -0000 @@ -15,11 +15,11 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= An Internet Content Acceleration module for Apache -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 MAKE_ENV+= "APXS=${APXS}" ALL_TARGET= build Index: www/mod_hosts_access/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_hosts_access/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_hosts_access/Makefile 20 Feb 2003 19:15:28 -0000 1.6 +++ www/mod_hosts_access/Makefile 20 Aug 2003 05:57:52 -0000 @@ -14,11 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 APXS_FLAGS?= -S LDFLAGS_SHLIB="-shared -lwrap" do-build: Index: www/mod_index_rss/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_index_rss/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_index_rss/Makefile 20 Feb 2003 19:15:28 -0000 1.8 +++ www/mod_index_rss/Makefile 20 Aug 2003 05:57:53 -0000 @@ -15,11 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to provides RSS output for directories -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c mod_index_rss.c Index: www/mod_jk/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_jk/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- www/mod_jk/Makefile 26 Jun 2003 22:58:31 -0000 1.17 +++ www/mod_jk/Makefile 20 Aug 2003 05:57:53 -0000 @@ -17,11 +17,11 @@ COMMENT= Apache JK module for Tomcat PATCH_DEPENDS= ${AUTOMAKE}:${PORTSDIR}/devel/automake -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2} WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native Index: www/mod_layout/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_layout/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/mod_layout/Makefile 21 Feb 2003 14:01:20 -0000 1.10 +++ www/mod_layout/Makefile 20 Aug 2003 05:57:53 -0000 @@ -13,10 +13,12 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache module to wrap served pages with a header and/or footer -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_REINPLACE= yes +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 post-patch: @${REINPLACE_CMD} -e 's!apxs!${LOCALBASE}/sbin/apxs!g' \ Index: www/mod_layout2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_layout2/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- www/mod_layout2/Makefile 23 Jul 2003 21:32:23 -0000 1.1 +++ www/mod_layout2/Makefile 20 Aug 2003 05:57:53 -0000 @@ -13,11 +13,13 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache2 module to wrap served pages with a header and/or footer -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE2_PORT} USE_REINPLACE= yes MAKE_ARGS+= builddir=${WRKSRC} +APXS?= ${LOCALBASE}/sbin/apxs +APACHE2_PORT?= www/apache2 post-install: .if !defined(NOPORTDOCS) Index: www/mod_limitipconn/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_limitipconn/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_limitipconn/Makefile 20 Apr 2003 08:12:03 -0000 1.2 +++ www/mod_limitipconn/Makefile 20 Aug 2003 05:57:53 -0000 @@ -14,10 +14,11 @@ MAINTAINER= gslin@ccca.nctu.edu.tw COMMENT= Limit the number of simultaneous connections from a single client IP address -BUILD_DEPENDS?= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS?= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS?= ${BUILD_DEPENDS} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 USE_REINPLACE= yes Index: www/mod_log_sql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_log_sql/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- www/mod_log_sql/Makefile 6 Aug 2003 15:02:27 -0000 1.9 +++ www/mod_log_sql/Makefile 20 Aug 2003 05:57:53 -0000 @@ -13,9 +13,9 @@ MAINTAINER= lev@FreeBSD.org COMMENT= Allows Apache to log to a MySQL database -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${AP_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} @@ -23,8 +23,8 @@ USE_REINPLACE= yes USE_GMAKE= yes -AP_PORT?= www/apache13 APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 ALL_TARGET= dso INSTALL_TARGET= dsoinstall Index: www/mod_mp3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mp3/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- www/mod_mp3/Makefile 6 Apr 2003 01:31:42 -0000 1.25 +++ www/mod_mp3/Makefile 20 Aug 2003 05:57:53 -0000 @@ -15,15 +15,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to allow MP3 streaming -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} HAS_CONFIGURE= yes MAKE_ARGS+= APXS="${APXS}" USE_PERL5= yes APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 DOCS= ChangeLog README TODO faq.html .if defined(WITH_MYSQL) Index: www/mod_mylo/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mylo/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_mylo/Makefile 20 Feb 2003 19:15:28 -0000 1.4 +++ www/mod_mylo/Makefile 20 Aug 2003 05:57:53 -0000 @@ -14,13 +14,14 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module to make Apache log to MySQL -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client WRKSRC= ${WRKDIR}/${PORTNAME} -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 DOCS= mod_mylo.sql README do-build: Index: www/mod_mysqluserdir/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mysqluserdir/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_mysqluserdir/Makefile 20 Feb 2003 19:15:29 -0000 1.3 +++ www/mod_mysqluserdir/Makefile 20 Aug 2003 05:57:53 -0000 @@ -14,11 +14,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module to make Apache get userdirs from MySQL -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 do-build: (cd ${WRKSRC} && ${APXS} -c -I${LOCALBASE}/include \ Index: www/mod_pcgi2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_pcgi2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_pcgi2/Makefile 25 Feb 2003 06:25:35 -0000 1.2 +++ www/mod_pcgi2/Makefile 20 Aug 2003 05:57:54 -0000 @@ -17,11 +17,11 @@ RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope .if defined(WITH_APACHE13) -BUILD_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT} .else -BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 +BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE2_PORT} +RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE2_PORT} .endif USE_PYTHON= yes @@ -29,6 +29,8 @@ # You can change this in the environment if you like. SZOPEBASEDIR?= www/Zope APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 +APACHE2_PORT?= www/apache2 # Don't change these ZOPEBASEDIR= ${LOCALBASE}/${SZOPEBASEDIR} Index: www/mod_perl/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/mod_perl/Makefile 10 Jul 2003 11:59:49 -0000 1.23 +++ www/mod_perl/Makefile 20 Aug 2003 05:57:54 -0000 @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Embeds a Perl interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww RUN_DEPENDS= ${BUILD_DEPENDS} @@ -37,17 +37,19 @@ mod_perl_tuning.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} PERLSITEDIR= ${PREFIX}/lib/perl5/site_perl/${PERL_VER} -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 .include <bsd.port.pre.mk> +APXS?= ${LOCALBASE}/sbin/apxs + do-configure: @ cd ${WRKSRC}; \ ${PERL5} Makefile.PL USE_APXS=1 EVERYTHING=1 \ PREFIX=${PREFIX} INSTALLSITELIB=${PERLSITEDIR} \ INSTALLSITEARCH=${PERLSITEDIR}/${PERL_ARCH} \ INSTALLMAN3DIR=${MANPREFIX}/man/man3 \ - WITH_APXS=${LOCALBASE}/sbin/apxs \ + WITH_APXS=${APXS} \ PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"' post-install: Index: www/mod_perl2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl2/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- www/mod_perl2/Makefile 20 May 2003 08:48:34 -0000 1.25 +++ www/mod_perl2/Makefile 20 Aug 2003 05:57:54 -0000 @@ -16,8 +16,8 @@ MAINTAINER= larse@isi.edu COMMENT= Embeds a Perl interpreter in the Apache2 server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE2_PORT} USE_PERL5= YES @@ -29,7 +29,7 @@ Bundle::ApacheTest.3 ModPerl::Code.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -APACHE2_PORT?= ${PORTSDIR}/www/apache2 +APACHE2_PORT?= www/apache2 .include <bsd.port.pre.mk> @@ -44,9 +44,11 @@ IGNORE= Port requires perl 5.6.x or later. Install lang/perl5 then try again .endif +APXS?= ${LOCALBASE}/sbin/apxs + do-configure: @ cd ${WRKSRC}; \ - ${PERL5} Makefile.PL MP_APXS=${LOCALBASE}/sbin/apxs \ + ${PERL5} Makefile.PL MP_APXS=${APXS} \ MP_INST_APACHE2=1 PREFIX=${PREFIX} post-install: Index: www/mod_php3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_php3/Makefile,v retrieving revision 1.135 diff -u -r1.135 Makefile --- www/mod_php3/Makefile 6 Mar 2003 19:23:19 -0000 1.135 +++ www/mod_php3/Makefile 20 Aug 2003 05:57:54 -0000 @@ -28,8 +28,8 @@ COMMENT?= PHP3 module for Apache .if !defined(STANDALONE) -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif PATCH_DIST_ARGS= -d ${WRKSRC}/functions @@ -37,7 +37,7 @@ PHP_DISTDIR= distributions SLAVEDIRS= lang/php3 -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 APXS?= ${LOCALBASE}/sbin/apxs USE_SUBMAKE= yes @@ -51,7 +51,7 @@ CONFIGURE_ARGS= --with-config-file-path=${PREFIX}/etc/php.standalone \ --enable-discard-path .else -CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs \ +CONFIGURE_ARGS= --with-apxs=${APXS} \ --with-config-file-path=${PREFIX}/etc .endif Index: www/mod_proxy_add_forward/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_proxy_add_forward/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_proxy_add_forward/Makefile 1 Apr 2003 22:45:49 -0000 1.6 +++ www/mod_proxy_add_forward/Makefile 20 Aug 2003 05:57:54 -0000 @@ -16,12 +16,13 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Apache module that adds a client IP header to outgoing proxy requests -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} NO_WRKSUBDIR= YES APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 do-extract: @${MKDIR} ${WRKDIR} Index: www/mod_put/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_put/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_put/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_put/Makefile 20 Aug 2003 05:57:54 -0000 @@ -14,11 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module that provides PUT and DELETE methods -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} do-build: Index: www/mod_python/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_python/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- www/mod_python/Makefile 13 Apr 2003 21:41:19 -0000 1.20 +++ www/mod_python/Makefile 20 Aug 2003 05:57:54 -0000 @@ -16,8 +16,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for integrating Python -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} NO_PACKAGE= "Requires Python without threads support" USE_PYTHON= yes @@ -25,7 +25,7 @@ .include <bsd.port.pre.mk> APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${APXS} Index: www/mod_roaming/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_roaming/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_roaming/Makefile 20 Feb 2003 19:15:29 -0000 1.8 +++ www/mod_roaming/Makefile 20 Aug 2003 05:57:55 -0000 @@ -14,11 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module that works as a Netscape Roaming Access server -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 DOCS= CHANGES INSTALL LICENSE README Index: www/mod_roaming2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_roaming2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_roaming2/Makefile 21 Feb 2003 14:01:21 -0000 1.2 +++ www/mod_roaming2/Makefile 20 Aug 2003 05:57:55 -0000 @@ -16,10 +16,11 @@ MAINTAINER= vivek@kciLink.com COMMENT= An Apache module that works as a Netscape Roaming Access server -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache2 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE2_PORT} -APXS= ${LOCALBASE}/sbin/apxs +APXS?= ${LOCALBASE}/sbin/apxs +APACHE2_PORT?= www/apache2 DOCS= CHANGES INSTALL LICENSE README Index: www/mod_ruby/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_ruby/Makefile,v retrieving revision 1.42 diff -u -r1.42 Makefile --- www/mod_ruby/Makefile 19 Feb 2003 09:31:10 -0000 1.42 +++ www/mod_ruby/Makefile 20 Aug 2003 05:57:55 -0000 @@ -14,15 +14,15 @@ MAINTAINER= knu@FreeBSD.org COMMENT= An Apache module that embeds Ruby interpreter within -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= eruby.10:${PORTSDIR}/textproc/eruby -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_RUBY= yes USE_REINPLACE= yes APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 CONFIGURE_ARGS= --with-apxs="${APXS}" \ --enable-eruby=yes \ Index: www/mod_scgi/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_scgi/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_scgi/Makefile 7 Mar 2003 06:12:45 -0000 1.2 +++ www/mod_scgi/Makefile 20 Aug 2003 05:57:55 -0000 @@ -14,9 +14,10 @@ MAINTAINER= nbm@FreeBSD.org COMMENT= Apache module that implements the client side of the SCGI protocol -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${PREFIX}/sbin/apxs +APACHE_PORT?= www/apache13 do-build: cd ${WRKSRC} && ${APXS} -c -o mod_scgi.so mod_scgi.c Index: www/mod_security/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_security/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_security/Makefile 19 Jul 2003 06:49:46 -0000 1.4 +++ www/mod_security/Makefile 20 Aug 2003 05:57:55 -0000 @@ -21,19 +21,19 @@ APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 APWRKSRC?= ${WRKSRC}/apache2 PLIST_SUB= APACHE=apache2 SO= la .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 APWRKSRC?= ${WRKSRC}/apache1 PLIST_SUB= APACHE=apache SO= so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} DOCS= CHANGES INSTALL LICENSE README modsecurity-manual-v1.5.1.pdf Index: www/mod_sed/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sed/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_sed/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_sed/Makefile 20 Aug 2003 05:57:55 -0000 @@ -14,11 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An apache module that embeds a copy of the sed(1) command -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 MAKE_ARGS= APXS=${APXS} Index: www/mod_sequester/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sequester/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_sequester/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_sequester/Makefile 20 Aug 2003 05:57:55 -0000 @@ -13,12 +13,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that controls access to the website using secure info -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/mod_sequester APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_snake/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_snake/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_snake/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_snake/Makefile 20 Aug 2003 05:57:55 -0000 @@ -14,13 +14,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library to easily create flexible Apache modules -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${PYTHON_CMD}:${PYTHON_PORTSDIR} RUN_DEPENDS= ${BUILD_DEPENDS} USE_BZIP2= yes APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs="${APXS}" Index: www/mod_sqlinclude/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sqlinclude/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_sqlinclude/Makefile 7 Mar 2003 06:12:45 -0000 1.4 +++ www/mod_sqlinclude/Makefile 20 Aug 2003 05:57:55 -0000 @@ -15,11 +15,12 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module implementing config inclusion from MySQL databases -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 DOCS= CHANGES.txt README.txt TODO.txt do-build: Index: www/mod_throttle/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_throttle/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_throttle/Makefile 7 Mar 2003 06:12:45 -0000 1.5 +++ www/mod_throttle/Makefile 20 Aug 2003 05:57:55 -0000 @@ -16,12 +16,13 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module that provides bandwidth & request throttling -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 DOCS= CHANGES.txt LICENSE.txt index.shtml Index: www/mod_ticket/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_ticket/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_ticket/Makefile 20 Feb 2003 19:15:30 -0000 1.5 +++ www/mod_ticket/Makefile 20 Aug 2003 05:57:55 -0000 @@ -15,11 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for a digitally signed ticket in URL -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 do-extract: ${MKDIR} ${WRKSRC} Index: www/mod_trigger/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_trigger/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_trigger/Makefile 21 Feb 2003 14:01:21 -0000 1.4 +++ www/mod_trigger/Makefile 20 Aug 2003 05:57:55 -0000 @@ -14,10 +14,11 @@ MAINTAINER= svenasse@polaris.ca COMMENT= Apache module to launch triggers if certain actions occur -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_tsunami/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_tsunami/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_tsunami/Makefile 21 Feb 2003 14:01:21 -0000 1.3 +++ www/mod_tsunami/Makefile 20 Aug 2003 05:57:55 -0000 @@ -14,10 +14,11 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= Apache module which dynamically limits a site's slot usage -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 DOCS= AUTHORS Changelog INSTALL LICENSE README Index: www/mod_watch/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_watch/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_watch/Makefile 7 Mar 2003 06:12:45 -0000 1.7 +++ www/mod_watch/Makefile 20 Aug 2003 05:57:56 -0000 @@ -16,14 +16,15 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module to monitor bandwidth usage, for use with MRTG etc -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_PERL5= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 MAKE_ARGS+= APXS="${APXS}" ALL_TARGET= build-dynamic Index: www/mod_webapp/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_webapp/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_webapp/Makefile 26 Jun 2003 22:58:32 -0000 1.3 +++ www/mod_webapp/Makefile 20 Aug 2003 05:57:56 -0000 @@ -16,10 +16,10 @@ MAINTAINER= asachs@uunet.co.za COMMENT= Apache module mounts Tomcat web applications -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \ ${AUTOCONF}:${PORTSDIR}/devel/autoconf -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_LIBTOOL= yes LIBTOOLFILES= # none @@ -34,6 +34,7 @@ # Apache locations. APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 APACHECTL?= ${LOCALBASE}/sbin/apachectl APR_LIB?= ${LOCALBASE}/lib/ APR_INCLUDE?= ${LOCALBASE}/include/apr-0/ Index: www/mod_zap/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_zap/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_zap/Makefile 28 Feb 2003 11:34:56 -0000 1.14 +++ www/mod_zap/Makefile 20 Aug 2003 05:57:56 -0000 @@ -14,15 +14,17 @@ MAINTAINER= demon@FreeBSD.org COMMENT= An Apache module that provides Z39.50 access through WWW -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83 LIB_DEPENDS= yaz.2:${PORTSDIR}/net/yaz -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83 +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-yazconfig=${LOCALBASE}/bin \ - --with-apxs=${LOCALBASE}/sbin/apxs \ + --with-apxs=${APXS} \ --with-tclconfig=${LOCALBASE}/lib/tcl8.3 post-patch: Index: www/neowebscript/Makefile =================================================================== RCS file: /home/pcvs/ports/www/neowebscript/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/neowebscript/Makefile 3 Jun 2003 16:48:42 -0000 1.6 +++ www/neowebscript/Makefile 20 Aug 2003 05:57:57 -0000 @@ -15,12 +15,14 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= neo82:${PORTSDIR}/devel/tcl-neo MAKEFILE= ${FILESDIR}/Makefile.bsd WRKSRC= ${WRKDIR}/${DISTNAME}/modules MAKE_ENV+= FILESDIR="${FILESDIR}" INSTALL_DATA="${INSTALL_DATA}" +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 SUBDIRS= modules neowebscript htdocs # tools Index: www/p5-Apache-AuthCookie/Makefile =================================================================== RCS file: /home/pcvs/ports/www/p5-Apache-AuthCookie/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/p5-Apache-AuthCookie/Makefile 6 Jun 2003 12:18:45 -0000 1.10 +++ www/p5-Apache-AuthCookie/Makefile 20 Aug 2003 05:57:58 -0000 @@ -16,10 +16,11 @@ COMMENT= A perl module to provide custom forms for reauthentication BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ - ${LOCALBASE}/sbin/apxs:${APACHE_PORT} + ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 CURUSER?= `whoami` CURGRP?= `groups | ${AWK} '{print $$1}'` TESTPORT?= 8228 Index: www/rt3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/rt3/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/rt3/Makefile 7 Aug 2003 13:05:32 -0000 1.23 +++ www/rt3/Makefile 20 Aug 2003 05:58:01 -0000 @@ -17,7 +17,7 @@ MAINTAINER= autrijus@autrijus.org COMMENT?= RT is an industrial-grade ticketing system written in Perl -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} \ +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \ ${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \ @@ -69,19 +69,19 @@ --with-db-dba=${DB_DBA_USER} .if defined(WITH_FASTCGI) -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \ ${ARCH_PERL}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI DEPENDS_ARGS+= WITHOUT_MODPERL=yes .else BUILD_DEPENDS+= ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 DEPENDS_ARGS+= WITHOUT_MODPERL=yes DEPENDS_ARGS+= WITH_MODPERL2=yes .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl .endif .endif Index: www/smb2www/Makefile =================================================================== RCS file: /home/pcvs/ports/www/smb2www/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/smb2www/Makefile 21 Feb 2003 14:01:32 -0000 1.3 +++ www/smb2www/Makefile 20 Aug 2003 05:58:03 -0000 @@ -20,7 +20,7 @@ MAINTAINER= roman@xpert.com COMMENT= Windows Network client that is accessible through a web browser -RUN_DEPENDS= httpd:${PORTSDIR}/www/apache13 \ +RUN_DEPENDS= httpd:${PORTSDIR}/${APACHE_PORT} \ smbclient:${PORTSDIR}/net/samba \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 @@ -28,6 +28,7 @@ NO_BUILD= yes USE_PERL5= yes WRKSRC= ${WRKDIR} +APACHE_PORT?= www/apache13 do-install: @cd ${WRKSRC}; ${PERL} ${WRKSRC}/Install.pl Index: www/suphp/Makefile =================================================================== RCS file: /home/pcvs/ports/www/suphp/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/suphp/Makefile 17 Jul 2003 04:35:53 -0000 1.3 +++ www/suphp/Makefile 20 Aug 2003 05:58:03 -0000 @@ -14,13 +14,14 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= suPHP is a combination which provides a wrapper for PHP -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${LOCALBASE}/bin/php:${PORTSDIR}/www/php4-cgi USE_REINPLACE= yes MAKE_ARGS+= APXS="${APXS}" APXS?= ${LOCALBASE}/sbin/apxs +APACHE_PORT?= www/apache13 WWW_USER?= www WWW_GROUP?= www LOG_PATH?= /var/log Index: www/webglimpse/Makefile =================================================================== RCS file: /home/pcvs/ports/www/webglimpse/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- www/webglimpse/Makefile 20 Feb 2003 19:15:37 -0000 1.18 +++ www/webglimpse/Makefile 20 Aug 2003 05:58:05 -0000 @@ -15,7 +15,7 @@ MAINTAINER= ports@freebsd.org COMMENT= WWW interface to Glimpse search engine -RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= glimpse:${PORTSDIR}/textproc/glimpse WRKSRC= ${WRKDIR}/webglimpse-1.6.edu @@ -23,6 +23,7 @@ NO_CDROM= depends on glimpse USE_PERL5= yes NO_BUILD= yes +APACHE_PORT?= www/apache13 pre-configure: .for i in wginstall wginstall.pl Index: www/wwwstat/Makefile =================================================================== RCS file: /home/pcvs/ports/www/wwwstat/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/wwwstat/Makefile 17 Jul 2003 20:39:07 -0000 1.23 +++ www/wwwstat/Makefile 20 Aug 2003 05:58:05 -0000 @@ -19,13 +19,14 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Webserver logfile analysis package -RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} USE_PERL5= yes MAKE_ENV+= PERL5=${PERL5} DIST_SUBDIR= wwwstat MAN1= wwwstat.1 splitlog.1 SITEPERL= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} +APACHE_PORT?= www/apache13 do-install: @if [ ! -d ${SITEPERL} ]; then \
On Wed, Aug 20, 2003 at 02:44:53AM -0700, Dirk Meyer wrote: > Here the Patch: Thanks..but the APACHE_PORT default setting should be in bsd.port.mk. It looks like there is room for further simplification by moving APXS into bsd.port.mk as well. Kris
> > Here the Patch: Kris Kennaway schrieb:, > Thanks..but the APACHE_PORT default setting should be in bsd.port.mk. > It looks like there is room for further simplification by moving APXS > into bsd.port.mk as well. sure ... But I suggest that we first move the users to the new variable and/or content .... After bsd.port.mk has the default setting, The defintions in the makefiles are autmatically overwitten and only for bakwards-compatibility. If you think otherwise please mail, I will then redo the patch. Gruß Dirk kind regards Dirk - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org]
Here the new patch with defaults in bsd.port.mk kind regards Dirk - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org] log: - make APXS configureable 13 ports changed, 53 ports uses already APXS?= - APACHE_PORT now without PORTSDIR defaults for APXS and APACHE_PORT now in bsd.port.mk APACHE_PORT honors WITH_APACHE2=yes Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.466 diff -u -r1.466 bsd.port.mk --- Mk/bsd.port.mk 29 Aug 2003 02:26:02 -0000 1.466 +++ Mk/bsd.port.mk 31 Aug 2003 05:43:26 -0000 @@ -422,7 +422,12 @@ # depend on the sysutils/rc_subr port. # # RC_SUBR - Set to path of rc.subr, defaults to ${LOCALBASE}/etc/rc.subr. -# +# +# APACHE_PORT - CATEGORY and portname of the prefered port for apache. +# Default: www/apache13 +# If WITH_APACHE2 is defined defaults to www/apache2 +# APXS - Full path to the prefered apxs binary to configure +# apache modules. Default: ${LOCALBASE}/sbin/apxs # # # Dependency checking. Use these if your port requires another port @@ -1008,6 +1013,13 @@ .else PREFIX?= ${LOCALBASE} .endif + +.if defined(WITH_APACHE2) +APACHE_PORT?= www/apache2 +.else +APACHE_PORT?= www/apache13 +.endif +APXS?= ${LOCALBASE}/sbin/apxs .if !defined(PERL_LEVEL) && defined(PERL_VERSION) perl_major= ${PERL_VERSION:C|^([1-9]+).*|\1|} Index: databases/mysql-editor/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysql-editor/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- databases/mysql-editor/Makefile 7 Mar 2003 05:58:26 -0000 1.2 +++ databases/mysql-editor/Makefile 31 Aug 2003 05:43:26 -0000 @@ -16,7 +16,7 @@ COMMENT= CGI scripts in Perl to edit your MySQL tables RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ - ${CGI_BIN}:${PORTSDIR}/www/apache13 + ${CGI_BIN}:${PORTSDIR}/${APACHE_PORT} NO_BUILD= True Index: databases/mysqlman/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysqlman/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- databases/mysqlman/Makefile 30 Jul 2003 22:59:53 -0000 1.5 +++ databases/mysqlman/Makefile 31 Aug 2003 05:43:26 -0000 @@ -14,7 +14,7 @@ COMMENT= MySQLMan is a web based MySQL database manager written in perl RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ - ${WWW_DIR}:${PORTSDIR}/www/apache13 + ${WWW_DIR}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${DISTNAME}-${PORTVERSION} RESTRICTED= "not redistributable, license agreement required" Index: devel/subversion/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- devel/subversion/Makefile 22 Aug 2003 12:49:14 -0000 1.40 +++ devel/subversion/Makefile 31 Aug 2003 05:43:26 -0000 @@ -32,8 +32,6 @@ MAN1= svn.1 svnadmin.1 MANCOMPRESSED= no -APXS=${LOCALBASE}/sbin/apxs - .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes CONFIGURE_ARGS+= \ @@ -45,9 +43,9 @@ .endif .if defined(WITH_APACHE2_APR) -APACHE2_PORT?= ${PORTSDIR}/www/apache2 -BUILD_DEPENDS+= ${APXS}:${APACHE2_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE2_PORT} +APACHE2_PORT?= www/apache2 +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ --with-apr-util=${LOCALBASE}/lib/apache2/apu-config .else Index: lang/eperl/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/eperl/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- lang/eperl/Makefile 21 Feb 2003 12:35:00 -0000 1.36 +++ lang/eperl/Makefile 31 Aug 2003 05:43:26 -0000 @@ -22,7 +22,7 @@ #INSTALL_ALSO_AS_SSSL= yes .if defined(INSTALL_ALSO_AS_SSSL) -RUN_DEPENDS= ${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/www/apache +RUN_DEPENDS= ${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/${APACHE_PORT} .endif USE_PERL5= yes Index: lang/php4/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php4/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- lang/php4/Makefile 26 Aug 2003 15:58:48 -0000 1.26 +++ lang/php4/Makefile 31 Aug 2003 05:43:27 -0000 @@ -148,20 +148,16 @@ WITH_APACHE2= yes .endif -APXS?= ${LOCALBASE}/sbin/apxs - .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp4.so .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp4.so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} PLIST_SUB+= APACHE="" .else Index: lang/php5/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php5/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- lang/php5/Makefile 26 Aug 2003 20:25:47 -0000 1.24 +++ lang/php5/Makefile 31 Aug 2003 05:43:28 -0000 @@ -152,20 +152,16 @@ WITH_APACHE2= yes .endif -APXS?= ${LOCALBASE}/sbin/apxs - .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp5.so .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp5.so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} PLIST_SUB+= APACHE="" .else Index: mail/websieve/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/websieve/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- mail/websieve/Makefile 29 Apr 2003 13:30:23 -0000 1.3 +++ mail/websieve/Makefile 31 Aug 2003 05:43:29 -0000 @@ -29,11 +29,7 @@ RUN_DEPENDS= ${SITE_PERL}/IMAP/Admin.pm:${PORTSDIR}/mail/p5-IMAP-Admin \ ${SITE_PERL}/IMAP/Sieve.pm:${PORTSDIR}/mail/p5-IMAP-Sieve .endif -.if defined(WITH_APACHE2) -RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache2 -.else -RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache13 -.endif +RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message Index: misc/instant-server/Makefile =================================================================== RCS file: /home/pcvs/ports/misc/instant-server/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- misc/instant-server/Makefile 7 Mar 2003 06:07:02 -0000 1.6 +++ misc/instant-server/Makefile 31 Aug 2003 05:43:29 -0000 @@ -20,7 +20,7 @@ ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba \ ${LOCALBASE}/sbin/traceroute:${PORTSDIR}/net/traceroute \ cnewsdo:${PORTSDIR}/news/cnews \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \ + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24 # Don't let stupid programs ask for configuration. Index: textproc/htdig/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/htdig/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- textproc/htdig/Makefile 7 Mar 2003 06:11:40 -0000 1.23 +++ textproc/htdig/Makefile 31 Aug 2003 05:43:29 -0000 @@ -14,7 +14,7 @@ MAINTAINER= DougB@FreeBSD.org COMMENT= A www indexing and searching system -RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/${APACHE_PORT} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \ Index: www/apache-contrib/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache-contrib/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/apache-contrib/Makefile 20 Feb 2003 19:15:22 -0000 1.12 +++ www/apache-contrib/Makefile 31 Aug 2003 05:43:29 -0000 @@ -14,12 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Third-party modules contributed to the Apache HTTP server project -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS= ${LOCALBASE}/sbin/apxs - -AP_PORT?= apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif Index: www/apache-jserv/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache-jserv/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- www/apache-jserv/Makefile 21 Feb 2003 14:01:12 -0000 1.15 +++ www/apache-jserv/Makefile 31 Aug 2003 05:43:29 -0000 @@ -18,10 +18,10 @@ USE_JAVA= 1.1+ NEED_JAVAC= yes -BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\ +BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\ ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper\ - ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\ + ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\ ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk USE_GMAKE= yes @@ -35,7 +35,7 @@ --libdir=${LOCALBASE}/libexec/apache\ --with-logdir=/var/log\ --sysconfdir=${PREFIX}/etc/apache\ - --with-apxs=${LOCALBASE}/sbin/apxs\ + --with-apxs=${APXS}\ --with-jdk-home=${JAVA_HOME}\ --with-JSDK=${LOCALBASE}/share/java/classes/jsdk.jar\ --with-java=${JAVA}\ Index: www/auth_ldap/Makefile =================================================================== RCS file: /home/pcvs/ports/www/auth_ldap/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/auth_ldap/Makefile 14 Aug 2003 18:00:01 -0000 1.12 +++ www/auth_ldap/Makefile 31 Aug 2003 05:43:30 -0000 @@ -14,9 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to authenticate against an LDAP directory -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= lber.2:${PORTSDIR}/${LDAP_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-llber" @@ -26,8 +26,6 @@ --with-apxs=${APXS} USE_GMAKE= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 LDAP_PORT?= net/openldap20-client MAKE_ARGS+= APXS=${APXS} Index: www/bk2site/Makefile =================================================================== RCS file: /home/pcvs/ports/www/bk2site/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/bk2site/Makefile 7 Mar 2003 06:12:35 -0000 1.11 +++ www/bk2site/Makefile 31 Aug 2003 05:43:30 -0000 @@ -16,9 +16,8 @@ COMMENT= Transforms Netscape bookmarks into a Yahoo-like website .include <bsd.port.pre.mk> -APXS= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} # Specify these directories in relative paths to ${PREFIX}. .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache) Index: www/dansguardian/Makefile =================================================================== RCS file: /home/pcvs/ports/www/dansguardian/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/dansguardian/Makefile 21 Feb 2003 14:01:15 -0000 1.8 +++ www/dansguardian/Makefile 31 Aug 2003 05:43:30 -0000 @@ -16,7 +16,7 @@ COMMENT= A fast, simple web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} GNU_CONFIGURE= yes Index: www/dansguardian-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/www/dansguardian-devel/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/dansguardian-devel/Makefile 28 Mar 2003 01:25:19 -0000 1.7 +++ www/dansguardian-devel/Makefile 31 Aug 2003 05:43:30 -0000 @@ -15,7 +15,7 @@ COMMENT= A fast, simple web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} Index: www/mnogosearch/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mnogosearch/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- www/mnogosearch/Makefile 17 Jun 2003 11:33:19 -0000 1.38 +++ www/mnogosearch/Makefile 31 Aug 2003 05:43:30 -0000 @@ -26,7 +26,7 @@ --sysconfdir=${PREFIX}/etc/mnogosearch \ --localstatedir=/var/mnogosearch -RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} .ifndef NO_OPENSSL USE_OPENSSL= yes Index: www/mod_access_identd/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_access_identd/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_access_identd/Makefile 20 Feb 2003 19:15:27 -0000 1.5 +++ www/mod_access_identd/Makefile 31 Aug 2003 05:43:30 -0000 @@ -13,12 +13,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to supply access control based on ident reply -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/mod_access_identd -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_access_referer/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_access_referer/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_access_referer/Makefile 20 Feb 2003 19:15:27 -0000 1.7 +++ www/mod_access_referer/Makefile 31 Aug 2003 05:43:30 -0000 @@ -14,11 +14,8 @@ MAINTAINER= ports@freebsd.org COMMENT= An Apache module that provides access control based on Referer HTTP header -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} DOCS= HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html Index: www/mod_accounting/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_accounting/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_accounting/Makefile 5 Aug 2003 05:30:14 -0000 1.5 +++ www/mod_accounting/Makefile 31 Aug 2003 05:43:30 -0000 @@ -15,10 +15,9 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= An Apache module that records traffic statistics into a database -BUILD_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} MAKE_ARGS+= APXS="${APXS}" -APXS?= ${LOCALBASE}/sbin/apxs # MySQL deps hack MYSQL323_LIBVER=10 Index: www/mod_auth_any/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_any/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_auth_any/Makefile 25 Mar 2003 04:23:11 -0000 1.6 +++ www/mod_auth_any/Makefile 31 Aug 2003 05:43:31 -0000 @@ -15,11 +15,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to use any command line program to authenticate a user -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} post-patch: @${CAT} ${FILESDIR}/bash_single_quote_escape_string.c >> \ Index: www/mod_auth_external/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_external/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_auth_external/Makefile 7 Mar 2003 06:12:41 -0000 1.8 +++ www/mod_auth_external/Makefile 31 Aug 2003 05:43:31 -0000 @@ -14,10 +14,8 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Enables the use of external mechanisms for user authentication -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} DOCDIR= ${PREFIX}/share/doc/${PORTNAME} DOCS= AUTHENTICATORS CHANGES INSTALL README TODO Index: www/mod_auth_kerb/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_kerb/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_auth_kerb/Makefile 7 Mar 2003 06:12:41 -0000 1.6 +++ www/mod_auth_kerb/Makefile 31 Aug 2003 05:43:31 -0000 @@ -23,13 +23,12 @@ # (i.e., HTTP over SSL/TLS). Thus, we require as a dependency # a version of Apache which can do this. # -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13-modssl -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13-modssl +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= krb5.3:${PORTSDIR}/security/krb5 WRKSRC= ${WRKDIR}/src/modules/kerberos -APXS?= ${LOCALBASE}/sbin/apxs KRB5_HOME?= ${LOCALBASE} do-build: Index: www/mod_auth_mysql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_mysql/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_auth_mysql/Makefile 3 Mar 2003 04:00:46 -0000 1.12 +++ www/mod_auth_mysql/Makefile 31 Aug 2003 05:43:31 -0000 @@ -14,15 +14,12 @@ MAINTAINER= jeh@FreeBSD.org COMMENT= Allows users to use MySQL databases for user authentication -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} .include <bsd.port.pre.mk> -APXS= ${LOCALBASE}/sbin/apxs - -AP_PORT?= apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif Index: www/mod_auth_mysql_another/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_mysql_another/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_auth_mysql_another/Makefile 30 Jun 2003 09:35:27 -0000 1.5 +++ www/mod_auth_mysql_another/Makefile 31 Aug 2003 05:43:31 -0000 @@ -31,22 +31,18 @@ WITH_APACHE2= yes .endif -APXS= ${LOCALBASE}/sbin/apxs - .if defined(WITH_APACHE2) -APACHE_PORT= ${PORTSDIR}/www/apache2 APACHE_VER= APACHE2 PLIST_SUB= VER="2" DSO= mod_auth_mysql.la .else -APACHE_PORT= ${PORTSDIR}/www/apache13 APACHE_VER= APACHE1 PLIST_SUB= VER="" DSO= mod_auth_mysql.so .endif -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} post-patch: @${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g;s|%%APXS%%|${APXS}|g;s|%%APACHE_VER%%|${APACHE_VER}|g;s|%%DSO%%|${DSO}|g' \ Index: www/mod_auth_pam/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pam/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_auth_pam/Makefile 7 Mar 2003 06:12:42 -0000 1.5 +++ www/mod_auth_pam/Makefile 31 Aug 2003 05:43:31 -0000 @@ -14,10 +14,8 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Allows users to use PAM modules for user authentication -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} do-build: @cd ${WRKSRC} && \ Index: www/mod_auth_pgsql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pgsql/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_auth_pgsql/Makefile 7 Mar 2003 06:12:42 -0000 1.12 +++ www/mod_auth_pgsql/Makefile 31 Aug 2003 05:43:31 -0000 @@ -13,17 +13,14 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= Allows users to use PostgreSQL databases for user authentication -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} .include <bsd.port.pre.mk> -APXS?= ${LOCALBASE}/sbin/apxs -AP_PORT?= apache13 -APACHE_PORT?= ${PORTSDIR}/www/${AP_PORT} POSTGRESQL_PORT?= databases/postgresql7 .if exists(${APXS}) Index: www/mod_auth_pwcheck/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pwcheck/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_auth_pwcheck/Makefile 21 Feb 2003 14:01:19 -0000 1.3 +++ www/mod_auth_pwcheck/Makefile 31 Aug 2003 05:43:31 -0000 @@ -13,15 +13,15 @@ MAINTAINER= anton@urc.ac.ru COMMENT= Apache module for user authentication via Cyrus pwcheck daemon -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl WRKSRC= ${WRKDIR}/${PORTNAME} +APACHE_PORT?= ${AP_CATEGORY}/${AP_PORT} .include <bsd.port.pre.mk> -APXS?= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) AP_MOD_SSL_SUFFIX!= ${APXS} -q CFLAGS 2>/dev/null \ | ${GREP} DMOD_SSL >/dev/null \ Index: www/mod_backhand/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_backhand/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_backhand/Makefile 7 Mar 2003 06:12:42 -0000 1.6 +++ www/mod_backhand/Makefile 31 Aug 2003 05:43:31 -0000 @@ -13,10 +13,9 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= Apache module that allows seamless redirection and load balancing of HTTP requests -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs="${APXS}" Index: www/mod_bandwidth/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bandwidth/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- www/mod_bandwidth/Makefile 3 Jul 2003 15:13:09 -0000 1.1 +++ www/mod_bandwidth/Makefile 31 Aug 2003 05:43:31 -0000 @@ -14,12 +14,10 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Bandwidth management module for the Apache webserver -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} NO_WRKSUBDIR= YES - -APXS?= ${LOCALBASE}/sbin/apxs do-extract: @${MKDIR} ${WRKDIR} Index: www/mod_bf/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bf/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_bf/Makefile 20 Feb 2003 19:15:27 -0000 1.5 +++ www/mod_bf/Makefile 31 Aug 2003 05:43:31 -0000 @@ -14,11 +14,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A brainf*ck module for Apache -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_blosxom/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_blosxom/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_blosxom/Makefile 9 May 2003 11:59:57 -0000 1.3 +++ www/mod_blosxom/Makefile 31 Aug 2003 05:43:32 -0000 @@ -14,10 +14,7 @@ MAINTAINER= gslin@ccca.nctu.edu.tw COMMENT= Apache module to build the extremely lightweight Weblog environment -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} USE_REINPLACE= yes Index: www/mod_blowchunks/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_blowchunks/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_blowchunks/Makefile 20 Feb 2003 19:15:28 -0000 1.5 +++ www/mod_blowchunks/Makefile 31 Aug 2003 05:43:32 -0000 @@ -15,13 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for rejecting and logging chunked requests -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} NO_WRKSUBDIR= YES -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 APXSFLAGS= -DTRUE=1 -DFALSE=0 .if !defined(WITHOUT_BLOWCHUNK_LOG) APXSFLAGS+= -DLOG_BLOWCHUNK Index: www/mod_bunzip2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bunzip2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_bunzip2/Makefile 21 Feb 2003 14:01:19 -0000 1.2 +++ www/mod_bunzip2/Makefile 31 Aug 2003 05:43:32 -0000 @@ -13,13 +13,11 @@ MAINTAINER= mod_bunzip2@oldach.net COMMENT= Apache module for server-side decompression of bzip2 files -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_BZIP2= yes WRKSRC= ${WRKDIR}/${PORTNAME}-2 -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: cd ${WRKSRC}; ${APXS} -c -lbz2 mod_bunzip2.c Index: www/mod_cgi_debug/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_cgi_debug/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_cgi_debug/Makefile 20 Feb 2003 19:15:28 -0000 1.6 +++ www/mod_cgi_debug/Makefile 31 Aug 2003 05:43:32 -0000 @@ -13,11 +13,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to make debugging server-side scripts easier -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_color/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_color/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_color/Makefile 20 Feb 2003 19:15:28 -0000 1.5 +++ www/mod_color/Makefile 31 Aug 2003 05:43:32 -0000 @@ -15,11 +15,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that provides syntax coloring for various languages -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 NO_WRKSUBDIR= yes do-extract: Index: www/mod_csacek/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_csacek/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_csacek/Makefile 21 Feb 2003 14:01:19 -0000 1.5 +++ www/mod_csacek/Makefile 31 Aug 2003 05:43:32 -0000 @@ -14,10 +14,8 @@ MAINTAINER= ms@vol.cz COMMENT= Charset recoding module for Apache -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ Index: www/mod_cvs/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_cvs/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_cvs/Makefile 7 Mar 2003 06:12:42 -0000 1.4 +++ www/mod_cvs/Makefile 31 Aug 2003 05:43:32 -0000 @@ -16,13 +16,11 @@ MAINTAINER= petef@FreeBSD.org COMMENT= A module that makes Apache CVS aware -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_REINPLACE= yes MAKE_ARGS+= APXS="${APXS}" - -APXS?= ${LOCALBASE}/sbin/apxs post-patch: @${REINPLACE_CMD} -e 's,apxs,${APXS},g' ${WRKSRC}/Makefile Index: www/mod_dav/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_dav/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/mod_dav/Makefile 21 Feb 2003 14:01:20 -0000 1.10 +++ www/mod_dav/Makefile 31 Aug 2003 05:43:32 -0000 @@ -14,8 +14,8 @@ MAINTAINER= patrick@mindstep.com COMMENT= An Apache module that provides DAV capabilities -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} # This port will work with the following version of Apache and anything newer. APACHE_VERSION= 1.3.6 @@ -29,7 +29,7 @@ --sysconfdir=${PREFIX}/etc/apache \ --datadir=${PREFIX}/share/apache \ --includedir=${PREFIX}/include/apache \ - --with-apxs=${PREFIX}/sbin/apxs + --with-apxs=${APXS} CONFIGURE_ENV= CFLAGS='${CFLAGS}' \ PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}" Index: www/mod_dtcl/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_dtcl/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- www/mod_dtcl/Makefile 7 Mar 2003 06:12:43 -0000 1.17 +++ www/mod_dtcl/Makefile 31 Aug 2003 05:43:32 -0000 @@ -13,11 +13,10 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 WRKSRC= ${WRKDIR}/mod_dtcl - MAKEFILE= ${FILESDIR}/Makefile.bsd do-install: Index: www/mod_extract_forwarded/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_extract_forwarded/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_extract_forwarded/Makefile 9 Apr 2003 22:07:25 -0000 1.7 +++ www/mod_extract_forwarded/Makefile 31 Aug 2003 05:43:32 -0000 @@ -14,12 +14,10 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module that can make proxied requests appear with client IP -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} - -APXS?= ${LOCALBASE}/sbin/apxs DOCS= doc.html README do-build: Index: www/mod_fastcgi/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_fastcgi/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_fastcgi/Makefile 19 Jun 2003 15:41:36 -0000 1.12 +++ www/mod_fastcgi/Makefile 31 Aug 2003 05:43:32 -0000 @@ -14,17 +14,15 @@ MAINTAINER= hollywar@mail.holywar.net COMMENT= A fast-cgi module for Apache -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 MAKEFILE= Makefile.AP2 USE_REINPLACE= YES MAKE_ARGS= INCLUDES=-I${PREFIX}/include/apache2 INSTALL_TARGET= install-modules PLIST_SUB= APACHE=2 .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 PLIST_SUB= APACHE= .endif Index: www/mod_filter/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_filter/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_filter/Makefile 21 Feb 2003 14:01:20 -0000 1.2 +++ www/mod_filter/Makefile 31 Aug 2003 05:43:33 -0000 @@ -13,10 +13,9 @@ MAINTAINER= svenasse@polaris.ca COMMENT= Filter output from other modules inside of Apache -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} -APXS= ${LOCALBASE}/sbin/apxs DOCS= README CONTRIB_DOCS= contrib/README contrib/echo.cgi contrib/eecummings.cgi contrib/head.cgi Index: www/mod_frontpage/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_frontpage/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_frontpage/Makefile 11 Aug 2003 15:25:51 -0000 1.14 +++ www/mod_frontpage/Makefile 31 Aug 2003 05:43:33 -0000 @@ -14,10 +14,9 @@ COMMENT= Improved mod_frontpage for Apache, as APXS installation WRKSRC= ${WRKDIR}/${PORTNAME}_mirfak-${PORTVERSION} -AP_PORT?= apache13 -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${FPSETPERM}:${PORTSDIR}/www/frontpage FP_VER= 5.0 @@ -30,8 +29,6 @@ INSTALL_FILE= ${INSTALL} -c -m 555 -o bin -g bin PKG_PREFIX= ${PREFIX} - -APXS= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || ${ECHO} no Index: www/mod_geoip/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_geoip/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_geoip/Makefile 19 May 2003 22:11:33 -0000 1.6 +++ www/mod_geoip/Makefile 31 Aug 2003 05:43:33 -0000 @@ -15,14 +15,11 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= An Apache module that provides the country code of the client's IP -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= GeoIP.3:${PORTSDIR}/net/GeoIP .include <bsd.port.pre.mk> - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 DOCS= Changes INSTALL README README.php Index: www/mod_gzip/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_gzip/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/mod_gzip/Makefile 21 Feb 2003 14:01:20 -0000 1.11 +++ www/mod_gzip/Makefile 31 Aug 2003 05:43:33 -0000 @@ -15,11 +15,9 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= An Internet Content Acceleration module for Apache -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 MAKE_ENV+= "APXS=${APXS}" ALL_TARGET= build Index: www/mod_hosts_access/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_hosts_access/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_hosts_access/Makefile 20 Feb 2003 19:15:28 -0000 1.6 +++ www/mod_hosts_access/Makefile 31 Aug 2003 05:43:33 -0000 @@ -14,11 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 APXS_FLAGS?= -S LDFLAGS_SHLIB="-shared -lwrap" do-build: Index: www/mod_index_rss/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_index_rss/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_index_rss/Makefile 20 Feb 2003 19:15:28 -0000 1.8 +++ www/mod_index_rss/Makefile 31 Aug 2003 05:43:33 -0000 @@ -15,11 +15,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to provides RSS output for directories -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} do-build: @cd ${WRKSRC} && ${APXS} -c mod_index_rss.c Index: www/mod_jk/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_jk/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- www/mod_jk/Makefile 26 Jun 2003 22:58:31 -0000 1.17 +++ www/mod_jk/Makefile 31 Aug 2003 05:43:33 -0000 @@ -17,11 +17,9 @@ COMMENT= Apache JK module for Tomcat PATCH_DEPENDS= ${AUTOMAKE}:${PORTSDIR}/devel/automake -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2} WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native Index: www/mod_jk2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_jk2/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- www/mod_jk2/Makefile 6 Jun 2003 12:59:19 -0000 1.1 +++ www/mod_jk2/Makefile 31 Aug 2003 05:43:33 -0000 @@ -16,11 +16,10 @@ MAINTAINER= lansil@fuzzynerd.com COMMENT= Apache 2.0 module for Tomcat -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS?= ${PREFIX}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache2 +WITH_APACHE2= yes APACHE_CONF= ${PREFIX}/etc/apache2 WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native Index: www/mod_layout/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_layout/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/mod_layout/Makefile 21 Feb 2003 14:01:20 -0000 1.10 +++ www/mod_layout/Makefile 31 Aug 2003 05:43:33 -0000 @@ -13,8 +13,8 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache module to wrap served pages with a header and/or footer -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_REINPLACE= yes Index: www/mod_layout2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_layout2/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- www/mod_layout2/Makefile 23 Jul 2003 21:32:23 -0000 1.1 +++ www/mod_layout2/Makefile 31 Aug 2003 05:43:33 -0000 @@ -13,9 +13,10 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache2 module to wrap served pages with a header and/or footer -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +WITH_APACHE2= yes USE_REINPLACE= yes MAKE_ARGS+= builddir=${WRKSRC} Index: www/mod_limitipconn/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_limitipconn/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_limitipconn/Makefile 20 Apr 2003 08:12:03 -0000 1.2 +++ www/mod_limitipconn/Makefile 31 Aug 2003 05:43:33 -0000 @@ -14,10 +14,8 @@ MAINTAINER= gslin@ccca.nctu.edu.tw COMMENT= Limit the number of simultaneous connections from a single client IP address -BUILD_DEPENDS?= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS?= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS?= ${BUILD_DEPENDS} - -APXS?= ${LOCALBASE}/sbin/apxs USE_REINPLACE= yes Index: www/mod_log_sql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_log_sql/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- www/mod_log_sql/Makefile 6 Aug 2003 15:02:27 -0000 1.9 +++ www/mod_log_sql/Makefile 31 Aug 2003 05:43:34 -0000 @@ -13,18 +13,15 @@ MAINTAINER= lev@FreeBSD.org COMMENT= Allows Apache to log to a MySQL database -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${AP_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes - -AP_PORT?= www/apache13 -APXS?= ${LOCALBASE}/sbin/apxs ALL_TARGET= dso INSTALL_TARGET= dsoinstall Index: www/mod_mp3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mp3/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- www/mod_mp3/Makefile 6 Apr 2003 01:31:42 -0000 1.25 +++ www/mod_mp3/Makefile 31 Aug 2003 05:43:34 -0000 @@ -15,15 +15,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to allow MP3 streaming -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} HAS_CONFIGURE= yes MAKE_ARGS+= APXS="${APXS}" USE_PERL5= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 DOCS= ChangeLog README TODO faq.html .if defined(WITH_MYSQL) Index: www/mod_mylo/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mylo/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_mylo/Makefile 20 Feb 2003 19:15:28 -0000 1.4 +++ www/mod_mylo/Makefile 31 Aug 2003 05:43:34 -0000 @@ -14,13 +14,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module to make Apache log to MySQL -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client WRKSRC= ${WRKDIR}/${PORTNAME} -APXS= ${LOCALBASE}/sbin/apxs DOCS= mod_mylo.sql README do-build: Index: www/mod_mysqluserdir/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mysqluserdir/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_mysqluserdir/Makefile 20 Feb 2003 19:15:29 -0000 1.3 +++ www/mod_mysqluserdir/Makefile 31 Aug 2003 05:43:34 -0000 @@ -14,11 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module to make Apache get userdirs from MySQL -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client - -APXS= ${LOCALBASE}/sbin/apxs do-build: (cd ${WRKSRC} && ${APXS} -c -I${LOCALBASE}/include \ Index: www/mod_pcgi2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_pcgi2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_pcgi2/Makefile 25 Feb 2003 06:25:35 -0000 1.2 +++ www/mod_pcgi2/Makefile 31 Aug 2003 05:43:34 -0000 @@ -17,18 +17,17 @@ RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope .if defined(WITH_APACHE13) -BUILD_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT} .else -BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 +BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE_PORT} .endif USE_PYTHON= yes # You can change this in the environment if you like. SZOPEBASEDIR?= www/Zope -APXS?= ${LOCALBASE}/sbin/apxs # Don't change these ZOPEBASEDIR= ${LOCALBASE}/${SZOPEBASEDIR} @@ -43,6 +42,7 @@ .if defined(WITH_APACHE13) APACHEVER= apache .else +WITH_APACHE2= yes APACHEVER= apache2 BUILDOPT+= -DAPACHE2 -Wc,-shared .endif Index: www/mod_perl/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/mod_perl/Makefile 10 Jul 2003 11:59:49 -0000 1.23 +++ www/mod_perl/Makefile 31 Aug 2003 05:43:34 -0000 @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Embeds a Perl interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww RUN_DEPENDS= ${BUILD_DEPENDS} @@ -37,7 +37,6 @@ mod_perl_tuning.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} PERLSITEDIR= ${PREFIX}/lib/perl5/site_perl/${PERL_VER} -APACHE_PORT?= ${PORTSDIR}/www/apache13 .include <bsd.port.pre.mk> @@ -47,7 +46,7 @@ PREFIX=${PREFIX} INSTALLSITELIB=${PERLSITEDIR} \ INSTALLSITEARCH=${PERLSITEDIR}/${PERL_ARCH} \ INSTALLMAN3DIR=${MANPREFIX}/man/man3 \ - WITH_APXS=${LOCALBASE}/sbin/apxs \ + WITH_APXS=${APXS} \ PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"' post-install: Index: www/mod_perl2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl2/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- www/mod_perl2/Makefile 20 May 2003 08:48:34 -0000 1.25 +++ www/mod_perl2/Makefile 31 Aug 2003 05:43:34 -0000 @@ -16,9 +16,10 @@ MAINTAINER= larse@isi.edu COMMENT= Embeds a Perl interpreter in the Apache2 server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +WITH_APACHE2= YES USE_PERL5= YES INSTALLS_SHLIB= YES @@ -29,7 +30,6 @@ Bundle::ApacheTest.3 ModPerl::Code.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -APACHE2_PORT?= ${PORTSDIR}/www/apache2 .include <bsd.port.pre.mk> @@ -46,7 +46,7 @@ do-configure: @ cd ${WRKSRC}; \ - ${PERL5} Makefile.PL MP_APXS=${LOCALBASE}/sbin/apxs \ + ${PERL5} Makefile.PL MP_APXS=${APXS} \ MP_INST_APACHE2=1 PREFIX=${PREFIX} post-install: Index: www/mod_php3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_php3/Makefile,v retrieving revision 1.135 diff -u -r1.135 Makefile --- www/mod_php3/Makefile 6 Mar 2003 19:23:19 -0000 1.135 +++ www/mod_php3/Makefile 31 Aug 2003 05:43:35 -0000 @@ -28,8 +28,8 @@ COMMENT?= PHP3 module for Apache .if !defined(STANDALONE) -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif PATCH_DIST_ARGS= -d ${WRKSRC}/functions @@ -37,8 +37,6 @@ PHP_DISTDIR= distributions SLAVEDIRS= lang/php3 -APACHE_PORT?= ${PORTSDIR}/www/apache13 -APXS?= ${LOCALBASE}/sbin/apxs USE_SUBMAKE= yes GNU_CONFIGURE= yes @@ -51,7 +49,7 @@ CONFIGURE_ARGS= --with-config-file-path=${PREFIX}/etc/php.standalone \ --enable-discard-path .else -CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs \ +CONFIGURE_ARGS= --with-apxs=${APXS} \ --with-config-file-path=${PREFIX}/etc .endif Index: www/mod_proxy_add_forward/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_proxy_add_forward/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_proxy_add_forward/Makefile 1 Apr 2003 22:45:49 -0000 1.6 +++ www/mod_proxy_add_forward/Makefile 31 Aug 2003 05:43:35 -0000 @@ -16,12 +16,10 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Apache module that adds a client IP header to outgoing proxy requests -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} NO_WRKSUBDIR= YES - -APXS?= ${LOCALBASE}/sbin/apxs do-extract: @${MKDIR} ${WRKDIR} Index: www/mod_put/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_put/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_put/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_put/Makefile 31 Aug 2003 05:43:35 -0000 @@ -14,11 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module that provides PUT and DELETE methods -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} do-build: Index: www/mod_python/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_python/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- www/mod_python/Makefile 13 Apr 2003 21:41:19 -0000 1.20 +++ www/mod_python/Makefile 31 Aug 2003 05:43:35 -0000 @@ -16,16 +16,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for integrating Python -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} NO_PACKAGE= "Requires Python without threads support" USE_PYTHON= yes .include <bsd.port.pre.mk> - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${APXS} Index: www/mod_python3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_python3/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/mod_python3/Makefile 5 Aug 2003 03:14:38 -0000 1.23 +++ www/mod_python3/Makefile 31 Aug 2003 05:43:35 -0000 @@ -20,8 +20,6 @@ USE_PYTHON= yes -APXS?= ${LOCALBASE}/sbin/apxs - GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" Index: www/mod_roaming/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_roaming/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_roaming/Makefile 20 Feb 2003 19:15:29 -0000 1.8 +++ www/mod_roaming/Makefile 31 Aug 2003 05:43:35 -0000 @@ -14,11 +14,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module that works as a Netscape Roaming Access server -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} DOCS= CHANGES INSTALL LICENSE README Index: www/mod_roaming2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_roaming2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_roaming2/Makefile 21 Feb 2003 14:01:21 -0000 1.2 +++ www/mod_roaming2/Makefile 31 Aug 2003 05:43:35 -0000 @@ -16,10 +16,10 @@ MAINTAINER= vivek@kciLink.com COMMENT= An Apache module that works as a Netscape Roaming Access server -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache2 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS= ${LOCALBASE}/sbin/apxs +WITH_APACHE2= yes DOCS= CHANGES INSTALL LICENSE README Index: www/mod_ruby/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_ruby/Makefile,v retrieving revision 1.43 diff -u -r1.43 Makefile --- www/mod_ruby/Makefile 27 Aug 2003 03:33:50 -0000 1.43 +++ www/mod_ruby/Makefile 31 Aug 2003 05:43:35 -0000 @@ -14,15 +14,12 @@ MAINTAINER= knu@FreeBSD.org COMMENT= An Apache module that embeds Ruby interpreter within -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= eruby.10:${PORTSDIR}/textproc/eruby -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_RUBY= yes USE_REINPLACE= yes - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 CONFIGURE_ARGS= --with-apxs="${APXS}" \ --enable-eruby=yes \ Index: www/mod_scgi/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_scgi/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_scgi/Makefile 7 Mar 2003 06:12:45 -0000 1.2 +++ www/mod_scgi/Makefile 31 Aug 2003 05:43:35 -0000 @@ -14,9 +14,7 @@ MAINTAINER= nbm@FreeBSD.org COMMENT= Apache module that implements the client side of the SCGI protocol -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${PREFIX}/sbin/apxs +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} do-build: cd ${WRKSRC} && ${APXS} -c -o mod_scgi.so mod_scgi.c Index: www/mod_security/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_security/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_security/Makefile 19 Jul 2003 06:49:46 -0000 1.4 +++ www/mod_security/Makefile 31 Aug 2003 05:43:35 -0000 @@ -19,21 +19,18 @@ WITH_APACHE2= yes .endif -APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 APWRKSRC?= ${WRKSRC}/apache2 PLIST_SUB= APACHE=apache2 SO= la .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 APWRKSRC?= ${WRKSRC}/apache1 PLIST_SUB= APACHE=apache SO= so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} DOCS= CHANGES INSTALL LICENSE README modsecurity-manual-v1.5.1.pdf Index: www/mod_sed/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sed/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_sed/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_sed/Makefile 31 Aug 2003 05:43:35 -0000 @@ -14,11 +14,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An apache module that embeds a copy of the sed(1) command -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} MAKE_ARGS= APXS=${APXS} Index: www/mod_sequester/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sequester/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_sequester/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_sequester/Makefile 31 Aug 2003 05:43:36 -0000 @@ -13,12 +13,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that controls access to the website using secure info -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/mod_sequester -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_snake/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_snake/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_snake/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_snake/Makefile 31 Aug 2003 05:43:36 -0000 @@ -14,13 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library to easily create flexible Apache modules -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${PYTHON_CMD}:${PYTHON_PORTSDIR} RUN_DEPENDS= ${BUILD_DEPENDS} USE_BZIP2= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs="${APXS}" Index: www/mod_sqlinclude/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sqlinclude/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_sqlinclude/Makefile 7 Mar 2003 06:12:45 -0000 1.4 +++ www/mod_sqlinclude/Makefile 31 Aug 2003 05:43:36 -0000 @@ -15,11 +15,10 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module implementing config inclusion from MySQL databases -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs DOCS= CHANGES.txt README.txt TODO.txt do-build: Index: www/mod_throttle/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_throttle/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_throttle/Makefile 7 Mar 2003 06:12:45 -0000 1.5 +++ www/mod_throttle/Makefile 31 Aug 2003 05:43:36 -0000 @@ -16,12 +16,10 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module that provides bandwidth & request throttling -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -APXS?= ${LOCALBASE}/sbin/apxs DOCS= CHANGES.txt LICENSE.txt index.shtml Index: www/mod_ticket/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_ticket/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_ticket/Makefile 20 Feb 2003 19:15:30 -0000 1.5 +++ www/mod_ticket/Makefile 31 Aug 2003 05:43:36 -0000 @@ -15,11 +15,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for a digitally signed ticket in URL -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} do-extract: ${MKDIR} ${WRKSRC} Index: www/mod_trigger/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_trigger/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_trigger/Makefile 21 Feb 2003 14:01:21 -0000 1.4 +++ www/mod_trigger/Makefile 31 Aug 2003 05:43:36 -0000 @@ -14,10 +14,8 @@ MAINTAINER= svenasse@polaris.ca COMMENT= Apache module to launch triggers if certain actions occur -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} - -APXS?= ${LOCALBASE}/sbin/apxs do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_tsunami/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_tsunami/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_tsunami/Makefile 21 Feb 2003 14:01:21 -0000 1.3 +++ www/mod_tsunami/Makefile 31 Aug 2003 05:43:36 -0000 @@ -14,10 +14,8 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= Apache module which dynamically limits a site's slot usage -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} DOCS= AUTHORS Changelog INSTALL LICENSE README Index: www/mod_watch/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_watch/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_watch/Makefile 7 Mar 2003 06:12:45 -0000 1.7 +++ www/mod_watch/Makefile 31 Aug 2003 05:43:36 -0000 @@ -16,14 +16,13 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module to monitor bandwidth usage, for use with MRTG etc -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_PERL5= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -APXS?= ${LOCALBASE}/sbin/apxs MAKE_ARGS+= APXS="${APXS}" ALL_TARGET= build-dynamic Index: www/mod_webapp/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_webapp/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_webapp/Makefile 26 Jun 2003 22:58:32 -0000 1.3 +++ www/mod_webapp/Makefile 31 Aug 2003 05:43:36 -0000 @@ -16,10 +16,10 @@ MAINTAINER= asachs@uunet.co.za COMMENT= Apache module mounts Tomcat web applications -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \ ${AUTOCONF}:${PORTSDIR}/devel/autoconf -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} USE_LIBTOOL= yes LIBTOOLFILES= # none @@ -33,7 +33,6 @@ .include <bsd.port.pre.mk> # Apache locations. -APXS?= ${LOCALBASE}/sbin/apxs APACHECTL?= ${LOCALBASE}/sbin/apachectl APR_LIB?= ${LOCALBASE}/lib/ APR_INCLUDE?= ${LOCALBASE}/include/apr-0/ Index: www/mod_zap/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_zap/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_zap/Makefile 28 Feb 2003 11:34:56 -0000 1.14 +++ www/mod_zap/Makefile 31 Aug 2003 05:43:36 -0000 @@ -14,15 +14,15 @@ MAINTAINER= demon@FreeBSD.org COMMENT= An Apache module that provides Z39.50 access through WWW -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83 LIB_DEPENDS= yaz.2:${PORTSDIR}/net/yaz -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-yazconfig=${LOCALBASE}/bin \ - --with-apxs=${LOCALBASE}/sbin/apxs \ + --with-apxs=${APXS} \ --with-tclconfig=${LOCALBASE}/lib/tcl8.3 post-patch: Index: www/neowebscript/Makefile =================================================================== RCS file: /home/pcvs/ports/www/neowebscript/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/neowebscript/Makefile 3 Jun 2003 16:48:42 -0000 1.6 +++ www/neowebscript/Makefile 31 Aug 2003 05:43:36 -0000 @@ -15,7 +15,7 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= neo82:${PORTSDIR}/devel/tcl-neo MAKEFILE= ${FILESDIR}/Makefile.bsd Index: www/p5-Apache-AuthCookie/Makefile =================================================================== RCS file: /home/pcvs/ports/www/p5-Apache-AuthCookie/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/p5-Apache-AuthCookie/Makefile 6 Jun 2003 12:18:45 -0000 1.10 +++ www/p5-Apache-AuthCookie/Makefile 31 Aug 2003 05:43:37 -0000 @@ -16,10 +16,9 @@ COMMENT= A perl module to provide custom forms for reauthentication BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ - ${LOCALBASE}/sbin/apxs:${APACHE_PORT} + ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} -APACHE_PORT?= ${PORTSDIR}/www/apache13 CURUSER?= `whoami` CURGRP?= `groups | ${AWK} '{print $$1}'` TESTPORT?= 8228 Index: www/rt3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/rt3/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- www/rt3/Makefile 25 Aug 2003 06:51:56 -0000 1.24 +++ www/rt3/Makefile 31 Aug 2003 05:43:37 -0000 @@ -17,7 +17,7 @@ MAINTAINER= autrijus@autrijus.org COMMENT?= RT is an industrial-grade ticketing system written in Perl -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} \ +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \ ${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \ @@ -70,28 +70,22 @@ .if defined(WITH_FASTCGI) .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi .endif -BUILD_DEPENDS+= ${ARCH_PERL}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI +BUILD_DEPENDS+= ${ARCH_PERL}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI DEPENDS_ARGS+= WITHOUT_MODPERL=yes .else BUILD_DEPENDS+= ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 DEPENDS_ARGS+= WITHOUT_MODPERL=yes DEPENDS_ARGS+= WITH_MODPERL2=yes .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl .endif .endif - -APXS?= ${LOCALBASE}/sbin/apxs DB_TYPE?= mysql Index: www/smb2www/Makefile =================================================================== RCS file: /home/pcvs/ports/www/smb2www/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/smb2www/Makefile 21 Feb 2003 14:01:32 -0000 1.3 +++ www/smb2www/Makefile 31 Aug 2003 05:43:37 -0000 @@ -20,7 +20,7 @@ MAINTAINER= roman@xpert.com COMMENT= Windows Network client that is accessible through a web browser -RUN_DEPENDS= httpd:${PORTSDIR}/www/apache13 \ +RUN_DEPENDS= httpd:${PORTSDIR}/${APACHE_PORT} \ smbclient:${PORTSDIR}/net/samba \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 Index: www/suphp/Makefile =================================================================== RCS file: /home/pcvs/ports/www/suphp/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/suphp/Makefile 25 Aug 2003 12:13:36 -0000 1.4 +++ www/suphp/Makefile 31 Aug 2003 05:43:37 -0000 @@ -13,14 +13,13 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= A combination which provides a wrapper for PHP -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${LOCALBASE}/bin/php:${PORTSDIR}/www/php4-cgi HAS_CONFIGURE= yes USE_GMAKE= yes CONFLICTS= mod_php4-4* -APXS?= ${LOCALBASE}/sbin/apxs LOG_PATH?= /var/log PHP_PATH?= ${LOCALBASE}/bin/php APACHE_USER?= www Index: www/webglimpse/Makefile =================================================================== RCS file: /home/pcvs/ports/www/webglimpse/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- www/webglimpse/Makefile 20 Feb 2003 19:15:37 -0000 1.18 +++ www/webglimpse/Makefile 31 Aug 2003 05:43:37 -0000 @@ -15,7 +15,7 @@ MAINTAINER= ports@freebsd.org COMMENT= WWW interface to Glimpse search engine -RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= glimpse:${PORTSDIR}/textproc/glimpse WRKSRC= ${WRKDIR}/webglimpse-1.6.edu Index: www/wwwstat/Makefile =================================================================== RCS file: /home/pcvs/ports/www/wwwstat/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/wwwstat/Makefile 17 Jul 2003 20:39:07 -0000 1.23 +++ www/wwwstat/Makefile 31 Aug 2003 05:43:37 -0000 @@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Webserver logfile analysis package -RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} USE_PERL5= yes MAKE_ENV+= PERL5=${PERL5}
Updated PATCH: - make APXS configureable - APACHE_PORT now without PORTSDIR defaults for APXS and APACHE_PORT now in bsd.port.mk APACHE_PORT honors WITH_APACHE2=yes - include dependencies with USE_APACHE=yes kind regards Dirk - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org] Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.468 diff -u -r1.468 bsd.port.mk --- Mk/bsd.port.mk 3 Sep 2003 19:50:24 -0000 1.468 +++ Mk/bsd.port.mk 7 Oct 2003 20:03:37 -0000 @@ -422,7 +422,13 @@ # depend on the sysutils/rc_subr port. # # RC_SUBR - Set to path of rc.subr, defaults to ${LOCALBASE}/etc/rc.subr. -# +# +# USE_APACHE - Says that the port relies on an apache webserver. +# APACHE_PORT - CATEGORY and portname of the prefered port for apache. +# Default: www/apache13 +# If WITH_APACHE2 is defined defaults to www/apache2 +# APXS - Full path to the prefered apxs binary to configure +# apache modules. Default: ${LOCALBASE}/sbin/apxs # # # Dependency checking. Use these if your port requires another port @@ -1007,6 +1013,17 @@ NO_MTREE= yes .else PREFIX?= ${LOCALBASE} +.endif + +.if defined(WITH_APACHE2) +APACHE_PORT?= www/apache2 +.else +APACHE_PORT?= www/apache13 +.endif +APXS?= ${LOCALBASE}/sbin/apxs +.if defined(USE_APACHE) +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif .if !defined(PERL_LEVEL) && defined(PERL_VERSION) Index: databases/mysql-editor/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysql-editor/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- databases/mysql-editor/Makefile 16 Sep 2003 05:43:46 -0000 1.3 +++ databases/mysql-editor/Makefile 7 Oct 2003 20:03:37 -0000 @@ -15,7 +15,7 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= CGI scripts in Perl to edit your MySQL tables -RUN_DEPENDS= ${CGI_BIN}:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${CGI_BIN}:${PORTSDIR}/${APACHE_PORT} NO_BUILD= True Index: databases/mysqlman/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysqlman/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- databases/mysqlman/Makefile 16 Sep 2003 05:43:47 -0000 1.6 +++ databases/mysqlman/Makefile 7 Oct 2003 20:03:37 -0000 @@ -13,7 +13,7 @@ MAINTAINER= janos.mohacsi@bsd.hu COMMENT= MySQLMan is a web based MySQL database manager written in perl -RUN_DEPENDS= ${WWW_DIR}:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${WWW_DIR}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${DISTNAME}-${PORTVERSION} RESTRICTED= "not redistributable, license agreement required" Index: devel/subversion/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- devel/subversion/Makefile 1 Oct 2003 10:53:56 -0000 1.44 +++ devel/subversion/Makefile 7 Oct 2003 20:03:37 -0000 @@ -33,8 +33,6 @@ MAN1= svn.1 svnadmin.1 MANCOMPRESSED= no -APXS=${LOCALBASE}/sbin/apxs - .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes CONFIGURE_ARGS+= \ @@ -46,9 +44,9 @@ .endif .if defined(WITH_APACHE2_APR) -APACHE2_PORT?= ${PORTSDIR}/www/apache2 -BUILD_DEPENDS+= ${APXS}:${APACHE2_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE2_PORT} +APACHE2_PORT?= www/apache2 +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ --with-apr-util=${LOCALBASE}/lib/apache2/apu-config .else Index: korean/mod_url/Makefile =================================================================== RCS file: /home/pcvs/ports/korean/mod_url/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- korean/mod_url/Makefile 13 Apr 2003 12:38:13 -0000 1.1 +++ korean/mod_url/Makefile 7 Oct 2003 20:03:37 -0000 @@ -14,11 +14,8 @@ COMMENT= Apache module for manipulating euc-kr encoded URL LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-extract: ${MKDIR} ${WRKSRC} Index: lang/eperl/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/eperl/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- lang/eperl/Makefile 21 Feb 2003 12:35:00 -0000 1.36 +++ lang/eperl/Makefile 7 Oct 2003 20:03:37 -0000 @@ -22,7 +22,7 @@ #INSTALL_ALSO_AS_SSSL= yes .if defined(INSTALL_ALSO_AS_SSSL) -RUN_DEPENDS= ${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/www/apache +RUN_DEPENDS= ${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/${APACHE_PORT} .endif USE_PERL5= yes Index: lang/php4/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php4/Makefile,v retrieving revision 1.31 diff -u -r1.31 Makefile --- lang/php4/Makefile 7 Oct 2003 19:38:47 -0000 1.31 +++ lang/php4/Makefile 7 Oct 2003 20:03:39 -0000 @@ -144,7 +144,6 @@ .endif .if !defined(WITHOUT_APACHE) -APXS?= ${LOCALBASE}/sbin/apxs PLIST_SUB+= APACHE="" .else PLIST_SUB+= APACHE="@comment " @@ -533,16 +532,16 @@ WITH_APACHE2= yes .endif .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp4.so .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp4.so .endif -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \ Index: lang/php5/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php5/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- lang/php5/Makefile 1 Oct 2003 11:34:23 -0000 1.27 +++ lang/php5/Makefile 7 Oct 2003 20:03:40 -0000 @@ -151,20 +151,16 @@ WITH_APACHE2= yes .endif -APXS?= ${LOCALBASE}/sbin/apxs - .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp5.so .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp5.so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} PLIST_SUB+= APACHE="" .else Index: mail/websieve/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/websieve/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- mail/websieve/Makefile 29 Apr 2003 13:30:23 -0000 1.3 +++ mail/websieve/Makefile 7 Oct 2003 20:03:40 -0000 @@ -29,11 +29,7 @@ RUN_DEPENDS= ${SITE_PERL}/IMAP/Admin.pm:${PORTSDIR}/mail/p5-IMAP-Admin \ ${SITE_PERL}/IMAP/Sieve.pm:${PORTSDIR}/mail/p5-IMAP-Sieve .endif -.if defined(WITH_APACHE2) -RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache2 -.else -RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache13 -.endif +RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message Index: misc/instant-server/Makefile =================================================================== RCS file: /home/pcvs/ports/misc/instant-server/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- misc/instant-server/Makefile 7 Mar 2003 06:07:02 -0000 1.6 +++ misc/instant-server/Makefile 7 Oct 2003 20:03:40 -0000 @@ -20,7 +20,7 @@ ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba \ ${LOCALBASE}/sbin/traceroute:${PORTSDIR}/net/traceroute \ cnewsdo:${PORTSDIR}/news/cnews \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \ + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24 # Don't let stupid programs ask for configuration. Index: textproc/htdig/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/htdig/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- textproc/htdig/Makefile 7 Mar 2003 06:11:40 -0000 1.23 +++ textproc/htdig/Makefile 7 Oct 2003 20:03:40 -0000 @@ -14,7 +14,7 @@ MAINTAINER= DougB@FreeBSD.org COMMENT= A www indexing and searching system -RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/${APACHE_PORT} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \ Index: www/apache-contrib/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache-contrib/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/apache-contrib/Makefile 20 Feb 2003 19:15:22 -0000 1.12 +++ www/apache-contrib/Makefile 7 Oct 2003 20:03:40 -0000 @@ -14,12 +14,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Third-party modules contributed to the Apache HTTP server project -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +USE_APACHE= yes -APXS= ${LOCALBASE}/sbin/apxs - -AP_PORT?= apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif Index: www/apache-jserv/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache-jserv/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- www/apache-jserv/Makefile 21 Feb 2003 14:01:12 -0000 1.15 +++ www/apache-jserv/Makefile 7 Oct 2003 20:03:40 -0000 @@ -18,10 +18,10 @@ USE_JAVA= 1.1+ NEED_JAVAC= yes -BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\ +BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\ ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper\ - ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\ + ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\ ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk USE_GMAKE= yes @@ -35,7 +35,7 @@ --libdir=${LOCALBASE}/libexec/apache\ --with-logdir=/var/log\ --sysconfdir=${PREFIX}/etc/apache\ - --with-apxs=${LOCALBASE}/sbin/apxs\ + --with-apxs=${APXS}\ --with-jdk-home=${JAVA_HOME}\ --with-JSDK=${LOCALBASE}/share/java/classes/jsdk.jar\ --with-java=${JAVA}\ Index: www/auth_ldap/Makefile =================================================================== RCS file: /home/pcvs/ports/www/auth_ldap/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/auth_ldap/Makefile 14 Aug 2003 18:00:01 -0000 1.12 +++ www/auth_ldap/Makefile 7 Oct 2003 20:03:41 -0000 @@ -14,10 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to authenticate against an LDAP directory -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} LIB_DEPENDS= lber.2:${PORTSDIR}/${LDAP_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +USE_APACHE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-llber" CONFIGURE_ARGS= --with-sdk-headers=${LOCALBASE}/include \ @@ -26,8 +25,6 @@ --with-apxs=${APXS} USE_GMAKE= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 LDAP_PORT?= net/openldap20-client MAKE_ARGS+= APXS=${APXS} Index: www/bk2site/Makefile =================================================================== RCS file: /home/pcvs/ports/www/bk2site/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/bk2site/Makefile 7 Oct 2003 17:19:09 -0000 1.12 +++ www/bk2site/Makefile 7 Oct 2003 20:03:41 -0000 @@ -16,9 +16,8 @@ COMMENT= Transforms Netscape bookmarks into a Yahoo-like website .include <bsd.port.pre.mk> -APXS= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} # Specify these directories in relative paths to ${PREFIX}. .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache) Index: www/dansguardian/Makefile =================================================================== RCS file: /home/pcvs/ports/www/dansguardian/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- www/dansguardian/Makefile 4 Sep 2003 01:09:23 -0000 1.9 +++ www/dansguardian/Makefile 7 Oct 2003 20:03:41 -0000 @@ -15,7 +15,7 @@ COMMENT= A fast, featureful web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} GNU_CONFIGURE= yes Index: www/dansguardian-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/www/dansguardian-devel/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/dansguardian-devel/Makefile 28 Mar 2003 01:25:19 -0000 1.7 +++ www/dansguardian-devel/Makefile 7 Oct 2003 20:03:41 -0000 @@ -15,7 +15,7 @@ COMMENT= A fast, simple web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} Index: www/mnogosearch/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mnogosearch/Makefile,v retrieving revision 1.42 diff -u -r1.42 Makefile --- www/mnogosearch/Makefile 6 Oct 2003 01:21:59 -0000 1.42 +++ www/mnogosearch/Makefile 7 Oct 2003 20:03:41 -0000 @@ -14,7 +14,7 @@ MAINTAINER= ache@FreeBSD.org COMMENT= Full featured SQL-based hypertext search engine -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs APACHE_PORT?= ${PORTSDIR}/www/apache13 Index: www/mod_access_identd/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_access_identd/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_access_identd/Makefile 20 Feb 2003 19:15:27 -0000 1.5 +++ www/mod_access_identd/Makefile 7 Oct 2003 20:03:41 -0000 @@ -13,12 +13,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to supply access control based on ident reply -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes WRKSRC= ${WRKDIR}/mod_access_identd -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_access_referer/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_access_referer/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_access_referer/Makefile 20 Feb 2003 19:15:27 -0000 1.7 +++ www/mod_access_referer/Makefile 7 Oct 2003 20:03:41 -0000 @@ -14,12 +14,7 @@ MAINTAINER= ports@freebsd.org COMMENT= An Apache module that provides access control based on Referer HTTP header -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - +USE_APACHE= yes DOCS= HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html do-build: Index: www/mod_accounting/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_accounting/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_accounting/Makefile 28 Aug 2003 12:14:21 -0000 1.6 +++ www/mod_accounting/Makefile 7 Oct 2003 20:03:42 -0000 @@ -15,10 +15,9 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= An Apache module that records traffic statistics into a database -BUILD_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} MAKE_ARGS+= APXS="${APXS}" -APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITHOUT_PGSQL) MAKE_ARGS+= WITHOUT_PGSQL=YES Index: www/mod_auth_any/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_any/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_auth_any/Makefile 6 Oct 2003 13:00:07 -0000 1.7 +++ www/mod_auth_any/Makefile 7 Oct 2003 20:03:42 -0000 @@ -13,13 +13,8 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache module to use any command line program to authenticate a user -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes WRKSRC= ${WRKDIR}/${PORTNAME} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: @cd ${WRKSRC}/src && ${APXS} -c ${PORTNAME}.c Index: www/mod_auth_external/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_external/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_auth_external/Makefile 7 Mar 2003 06:12:41 -0000 1.8 +++ www/mod_auth_external/Makefile 7 Oct 2003 20:03:42 -0000 @@ -14,11 +14,7 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Enables the use of external mechanisms for user authentication -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs - +USE_APACHE= yes DOCDIR= ${PREFIX}/share/doc/${PORTNAME} DOCS= AUTHENTICATORS CHANGES INSTALL README TODO Index: www/mod_auth_kerb/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_kerb/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_auth_kerb/Makefile 7 Mar 2003 06:12:41 -0000 1.6 +++ www/mod_auth_kerb/Makefile 7 Oct 2003 20:03:42 -0000 @@ -23,13 +23,11 @@ # (i.e., HTTP over SSL/TLS). Thus, we require as a dependency # a version of Apache which can do this. # -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13-modssl -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13-modssl LIB_DEPENDS= krb5.3:${PORTSDIR}/security/krb5 +USE_APACHE= yes WRKSRC= ${WRKDIR}/src/modules/kerberos -APXS?= ${LOCALBASE}/sbin/apxs KRB5_HOME?= ${LOCALBASE} do-build: Index: www/mod_auth_mysql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_mysql/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_auth_mysql/Makefile 29 Sep 2003 10:12:15 -0000 1.14 +++ www/mod_auth_mysql/Makefile 7 Oct 2003 20:03:42 -0000 @@ -14,16 +14,13 @@ MAINTAINER= jeh@FreeBSD.org COMMENT= Allows users to use MySQL databases for user authentication -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} USE_MYSQL= yes .include <bsd.port.pre.mk> -APXS= ${LOCALBASE}/sbin/apxs - -AP_PORT?= apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif Index: www/mod_auth_mysql_another/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_mysql_another/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_auth_mysql_another/Makefile 30 Jun 2003 09:35:27 -0000 1.5 +++ www/mod_auth_mysql_another/Makefile 7 Oct 2003 20:03:42 -0000 @@ -31,22 +31,18 @@ WITH_APACHE2= yes .endif -APXS= ${LOCALBASE}/sbin/apxs - .if defined(WITH_APACHE2) -APACHE_PORT= ${PORTSDIR}/www/apache2 APACHE_VER= APACHE2 PLIST_SUB= VER="2" DSO= mod_auth_mysql.la .else -APACHE_PORT= ${PORTSDIR}/www/apache13 APACHE_VER= APACHE1 PLIST_SUB= VER="" DSO= mod_auth_mysql.so .endif -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} post-patch: @${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g;s|%%APXS%%|${APXS}|g;s|%%APACHE_VER%%|${APACHE_VER}|g;s|%%DSO%%|${DSO}|g' \ Index: www/mod_auth_pam/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pam/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_auth_pam/Makefile 7 Mar 2003 06:12:42 -0000 1.5 +++ www/mod_auth_pam/Makefile 7 Oct 2003 20:03:42 -0000 @@ -14,10 +14,7 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Allows users to use PAM modules for user authentication -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes do-build: @cd ${WRKSRC} && \ Index: www/mod_auth_pgsql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pgsql/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_auth_pgsql/Makefile 7 Mar 2003 06:12:42 -0000 1.12 +++ www/mod_auth_pgsql/Makefile 7 Oct 2003 20:03:42 -0000 @@ -13,17 +13,14 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= Allows users to use PostgreSQL databases for user authentication -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} .include <bsd.port.pre.mk> -APXS?= ${LOCALBASE}/sbin/apxs -AP_PORT?= apache13 -APACHE_PORT?= ${PORTSDIR}/www/${AP_PORT} POSTGRESQL_PORT?= databases/postgresql7 .if exists(${APXS}) Index: www/mod_auth_pwcheck/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pwcheck/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_auth_pwcheck/Makefile 3 Sep 2003 04:39:08 -0000 1.4 +++ www/mod_auth_pwcheck/Makefile 7 Oct 2003 20:03:42 -0000 @@ -13,15 +13,15 @@ MAINTAINER= anton@urc.ac.ru COMMENT= Apache module for user authentication via Cyrus pwcheck daemon -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl WRKSRC= ${WRKDIR}/${PORTNAME} +APACHE_PORT?= ${AP_CATEGORY}/${AP_PORT} .include <bsd.port.pre.mk> -APXS?= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) AP_MOD_SSL_SUFFIX!= ${APXS} -q CFLAGS 2>/dev/null \ | ${GREP} DMOD_SSL >/dev/null \ Index: www/mod_backhand/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_backhand/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_backhand/Makefile 7 Mar 2003 06:12:42 -0000 1.6 +++ www/mod_backhand/Makefile 7 Oct 2003 20:03:42 -0000 @@ -13,10 +13,7 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= Apache module that allows seamless redirection and load balancing of HTTP requests -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs="${APXS}" Index: www/mod_bandwidth/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bandwidth/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_bandwidth/Makefile 9 Sep 2003 12:41:33 -0000 1.2 +++ www/mod_bandwidth/Makefile 7 Oct 2003 20:03:42 -0000 @@ -15,12 +15,8 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Bandwidth management module for the Apache webserver -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${BUILD_DEPENDS} - +USE_APACHE= yes NO_WRKSUBDIR= YES - -APXS?= ${LOCALBASE}/sbin/apxs do-extract: @${MKDIR} ${WRKDIR} Index: www/mod_bf/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bf/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_bf/Makefile 3 Oct 2003 21:34:47 -0000 1.6 +++ www/mod_bf/Makefile 7 Oct 2003 20:03:43 -0000 @@ -14,11 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A brainf*ck module for Apache -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_blosxom/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_blosxom/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_blosxom/Makefile 9 May 2003 11:59:57 -0000 1.3 +++ www/mod_blosxom/Makefile 7 Oct 2003 20:03:43 -0000 @@ -14,12 +14,7 @@ MAINTAINER= gslin@ccca.nctu.edu.tw COMMENT= Apache module to build the extremely lightweight Weblog environment -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${BUILD_DEPENDS} - +USE_APACHE= yes USE_REINPLACE= yes post-patch: Index: www/mod_blowchunks/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_blowchunks/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_blowchunks/Makefile 27 Sep 2003 01:01:07 -0000 1.6 +++ www/mod_blowchunks/Makefile 7 Oct 2003 20:03:43 -0000 @@ -15,13 +15,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for rejecting and logging chunked requests -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes NO_WRKSUBDIR= YES -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 APXSFLAGS= -DTRUE=1 -DFALSE=0 .if !defined(WITHOUT_BLOWCHUNK_LOG) APXSFLAGS+= -DLOG_BLOWCHUNK Index: www/mod_bunzip2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bunzip2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_bunzip2/Makefile 21 Feb 2003 14:01:19 -0000 1.2 +++ www/mod_bunzip2/Makefile 7 Oct 2003 20:03:43 -0000 @@ -13,13 +13,9 @@ MAINTAINER= mod_bunzip2@oldach.net COMMENT= Apache module for server-side decompression of bzip2 files -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/${PORTNAME}-2 -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: cd ${WRKSRC}; ${APXS} -c -lbz2 mod_bunzip2.c Index: www/mod_cgi_debug/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_cgi_debug/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_cgi_debug/Makefile 20 Feb 2003 19:15:28 -0000 1.6 +++ www/mod_cgi_debug/Makefile 7 Oct 2003 20:03:43 -0000 @@ -13,11 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to make debugging server-side scripts easier -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_color/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_color/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_color/Makefile 20 Feb 2003 19:15:28 -0000 1.5 +++ www/mod_color/Makefile 7 Oct 2003 20:03:43 -0000 @@ -15,11 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that provides syntax coloring for various languages -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes NO_WRKSUBDIR= yes do-extract: Index: www/mod_csacek/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_csacek/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_csacek/Makefile 21 Feb 2003 14:01:19 -0000 1.5 +++ www/mod_csacek/Makefile 7 Oct 2003 20:03:43 -0000 @@ -14,11 +14,7 @@ MAINTAINER= ms@vol.cz COMMENT= Charset recoding module for Apache -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs - +USE_APACHE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-target=Apache \ Index: www/mod_cvs/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_cvs/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_cvs/Makefile 7 Mar 2003 06:12:42 -0000 1.4 +++ www/mod_cvs/Makefile 7 Oct 2003 20:03:43 -0000 @@ -16,13 +16,9 @@ MAINTAINER= petef@FreeBSD.org COMMENT= A module that makes Apache CVS aware -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - +USE_APACHE= yes USE_REINPLACE= yes MAKE_ARGS+= APXS="${APXS}" - -APXS?= ${LOCALBASE}/sbin/apxs post-patch: @${REINPLACE_CMD} -e 's,apxs,${APXS},g' ${WRKSRC}/Makefile Index: www/mod_dav/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_dav/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/mod_dav/Makefile 21 Feb 2003 14:01:20 -0000 1.10 +++ www/mod_dav/Makefile 7 Oct 2003 20:03:43 -0000 @@ -14,12 +14,10 @@ MAINTAINER= patrick@mindstep.com COMMENT= An Apache module that provides DAV capabilities -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - # This port will work with the following version of Apache and anything newer. APACHE_VERSION= 1.3.6 +USE_APACHE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ @@ -29,7 +27,7 @@ --sysconfdir=${PREFIX}/etc/apache \ --datadir=${PREFIX}/share/apache \ --includedir=${PREFIX}/include/apache \ - --with-apxs=${PREFIX}/sbin/apxs + --with-apxs=${APXS} CONFIGURE_ENV= CFLAGS='${CFLAGS}' \ PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}" Index: www/mod_dtcl/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_dtcl/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- www/mod_dtcl/Makefile 7 Mar 2003 06:12:43 -0000 1.17 +++ www/mod_dtcl/Makefile 7 Oct 2003 20:03:43 -0000 @@ -13,11 +13,10 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 WRKSRC= ${WRKDIR}/mod_dtcl - MAKEFILE= ${FILESDIR}/Makefile.bsd do-install: Index: www/mod_extract_forwarded/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_extract_forwarded/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_extract_forwarded/Makefile 9 Apr 2003 22:07:25 -0000 1.7 +++ www/mod_extract_forwarded/Makefile 7 Oct 2003 20:03:43 -0000 @@ -14,12 +14,8 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module that can make proxied requests appear with client IP -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - +USE_APACHE= yes WRKSRC= ${WRKDIR}/${PORTNAME} - -APXS?= ${LOCALBASE}/sbin/apxs DOCS= doc.html README do-build: Index: www/mod_fastcgi/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_fastcgi/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_fastcgi/Makefile 19 Jun 2003 15:41:36 -0000 1.12 +++ www/mod_fastcgi/Makefile 7 Oct 2003 20:03:43 -0000 @@ -14,17 +14,15 @@ MAINTAINER= hollywar@mail.holywar.net COMMENT= A fast-cgi module for Apache -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 MAKEFILE= Makefile.AP2 USE_REINPLACE= YES MAKE_ARGS= INCLUDES=-I${PREFIX}/include/apache2 INSTALL_TARGET= install-modules PLIST_SUB= APACHE=2 .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 PLIST_SUB= APACHE= .endif Index: www/mod_filter/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_filter/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_filter/Makefile 21 Feb 2003 14:01:20 -0000 1.2 +++ www/mod_filter/Makefile 7 Oct 2003 20:03:44 -0000 @@ -13,10 +13,7 @@ MAINTAINER= svenasse@polaris.ca COMMENT= Filter output from other modules inside of Apache -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${BUILD_DEPENDS} - -APXS= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes DOCS= README CONTRIB_DOCS= contrib/README contrib/echo.cgi contrib/eecummings.cgi contrib/head.cgi Index: www/mod_frontpage/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_frontpage/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_frontpage/Makefile 11 Aug 2003 15:25:51 -0000 1.14 +++ www/mod_frontpage/Makefile 7 Oct 2003 20:03:44 -0000 @@ -14,12 +14,10 @@ COMMENT= Improved mod_frontpage for Apache, as APXS installation WRKSRC= ${WRKDIR}/${PORTNAME}_mirfak-${PORTVERSION} -AP_PORT?= apache13 -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} RUN_DEPENDS= ${FPSETPERM}:${PORTSDIR}/www/frontpage +USE_APACHE= yes FP_VER= 5.0 FP_DIR= ${PREFIX}/frontpage/version${FP_VER} FPSETPERM= ${FP_DIR}/set_default_perms.sh @@ -30,8 +28,6 @@ INSTALL_FILE= ${INSTALL} -c -m 555 -o bin -g bin PKG_PREFIX= ${PREFIX} - -APXS= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || ${ECHO} no Index: www/mod_geoip/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_geoip/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_geoip/Makefile 4 Sep 2003 21:10:47 -0000 1.7 +++ www/mod_geoip/Makefile 7 Oct 2003 20:03:44 -0000 @@ -14,14 +14,11 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= An Apache module that provides the country code of the client's IP -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} LIB_DEPENDS= GeoIP.3:${PORTSDIR}/net/GeoIP -.include <bsd.port.pre.mk> +USE_APACHE= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +.include <bsd.port.pre.mk> DOCS= Changes INSTALL README README.php Index: www/mod_gzip/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_gzip/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/mod_gzip/Makefile 21 Feb 2003 14:01:20 -0000 1.11 +++ www/mod_gzip/Makefile 7 Oct 2003 20:03:44 -0000 @@ -15,11 +15,7 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= An Internet Content Acceleration module for Apache -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes MAKE_ENV+= "APXS=${APXS}" ALL_TARGET= build Index: www/mod_hosts_access/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_hosts_access/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_hosts_access/Makefile 20 Feb 2003 19:15:28 -0000 1.6 +++ www/mod_hosts_access/Makefile 7 Oct 2003 20:03:44 -0000 @@ -14,11 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes APXS_FLAGS?= -S LDFLAGS_SHLIB="-shared -lwrap" do-build: Index: www/mod_index_rss/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_index_rss/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_index_rss/Makefile 20 Feb 2003 19:15:28 -0000 1.8 +++ www/mod_index_rss/Makefile 7 Oct 2003 20:03:44 -0000 @@ -15,11 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to provides RSS output for directories -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-build: @cd ${WRKSRC} && ${APXS} -c mod_index_rss.c Index: www/mod_jk/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_jk/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- www/mod_jk/Makefile 24 Sep 2003 08:55:01 -0000 1.18 +++ www/mod_jk/Makefile 7 Oct 2003 20:03:44 -0000 @@ -35,10 +35,9 @@ PLIST_SUB= APACHE2= .endif -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS= ${LOCALBASE}/sbin/apxs APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2} WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native Index: www/mod_jk2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_jk2/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- www/mod_jk2/Makefile 6 Jun 2003 12:59:19 -0000 1.1 +++ www/mod_jk2/Makefile 7 Oct 2003 20:03:44 -0000 @@ -16,11 +16,8 @@ MAINTAINER= lansil@fuzzynerd.com COMMENT= Apache 2.0 module for Tomcat -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${PREFIX}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache2 +USE_APACHE= yes +WITH_APACHE2= yes APACHE_CONF= ${PREFIX}/etc/apache2 WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native Index: www/mod_layout/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_layout/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/mod_layout/Makefile 27 Sep 2003 14:20:32 -0000 1.11 +++ www/mod_layout/Makefile 7 Oct 2003 20:03:44 -0000 @@ -13,9 +13,7 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache module to wrap served pages with a header and/or footer -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - +USE_APACHE= yes USE_REINPLACE= yes post-patch: Index: www/mod_layout2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_layout2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_layout2/Makefile 26 Sep 2003 17:25:14 -0000 1.2 +++ www/mod_layout2/Makefile 7 Oct 2003 20:03:44 -0000 @@ -13,9 +13,8 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache2 module to wrap served pages with a header and/or footer -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 - +USE_APACHE= yes +WITH_APACHE2= yes LATEST_LINK= mod_layout2 USE_REINPLACE= yes Index: www/mod_limitipconn/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_limitipconn/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_limitipconn/Makefile 20 Apr 2003 08:12:03 -0000 1.2 +++ www/mod_limitipconn/Makefile 7 Oct 2003 20:03:44 -0000 @@ -14,11 +14,7 @@ MAINTAINER= gslin@ccca.nctu.edu.tw COMMENT= Limit the number of simultaneous connections from a single client IP address -BUILD_DEPENDS?= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS?= ${BUILD_DEPENDS} - -APXS?= ${LOCALBASE}/sbin/apxs - +USE_APACHE= yes USE_REINPLACE= yes post-patch: Index: www/mod_log_sql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_log_sql/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- www/mod_log_sql/Makefile 6 Aug 2003 15:02:27 -0000 1.9 +++ www/mod_log_sql/Makefile 7 Oct 2003 20:03:45 -0000 @@ -13,18 +13,15 @@ MAINTAINER= lev@FreeBSD.org COMMENT= Allows Apache to log to a MySQL database -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${AP_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes - -AP_PORT?= www/apache13 -APXS?= ${LOCALBASE}/sbin/apxs ALL_TARGET= dso INSTALL_TARGET= dsoinstall Index: www/mod_mp3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mp3/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- www/mod_mp3/Makefile 3 Oct 2003 14:04:33 -0000 1.27 +++ www/mod_mp3/Makefile 7 Oct 2003 20:03:45 -0000 @@ -15,15 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to allow MP3 streaming -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes HAS_CONFIGURE= yes MAKE_ARGS+= APXS="${APXS}" USE_PERL5= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 DOCS= ChangeLog README TODO faq.html CONTRIBUTORS .if defined(WITH_MYSQL) Index: www/mod_mylo/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mylo/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_mylo/Makefile 7 Sep 2003 12:22:15 -0000 1.6 +++ www/mod_mylo/Makefile 7 Oct 2003 20:03:45 -0000 @@ -13,12 +13,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module to make Apache log to MySQL -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - +USE_APACHE= yes USE_MYSQL= YES -APXS= ${LOCALBASE}/sbin/apxs DOCS= mod_mylo.sql README do-build: Index: www/mod_mysqluserdir/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mysqluserdir/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_mysqluserdir/Makefile 20 Feb 2003 19:15:29 -0000 1.3 +++ www/mod_mysqluserdir/Makefile 7 Oct 2003 20:03:45 -0000 @@ -14,11 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module to make Apache get userdirs from MySQL -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -APXS= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes do-build: (cd ${WRKSRC} && ${APXS} -c -I${LOCALBASE}/include \ Index: www/mod_pcgi2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_pcgi2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_pcgi2/Makefile 25 Feb 2003 06:25:35 -0000 1.2 +++ www/mod_pcgi2/Makefile 7 Oct 2003 20:03:45 -0000 @@ -17,18 +17,17 @@ RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope .if defined(WITH_APACHE13) -BUILD_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT} .else -BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 +BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE_PORT} .endif USE_PYTHON= yes # You can change this in the environment if you like. SZOPEBASEDIR?= www/Zope -APXS?= ${LOCALBASE}/sbin/apxs # Don't change these ZOPEBASEDIR= ${LOCALBASE}/${SZOPEBASEDIR} @@ -43,6 +42,7 @@ .if defined(WITH_APACHE13) APACHEVER= apache .else +WITH_APACHE2= yes APACHEVER= apache2 BUILDOPT+= -DAPACHE2 -Wc,-shared .endif Index: www/mod_perl/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/mod_perl/Makefile 10 Jul 2003 11:59:49 -0000 1.23 +++ www/mod_perl/Makefile 7 Oct 2003 20:03:45 -0000 @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Embeds a Perl interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww RUN_DEPENDS= ${BUILD_DEPENDS} @@ -37,7 +37,6 @@ mod_perl_tuning.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} PERLSITEDIR= ${PREFIX}/lib/perl5/site_perl/${PERL_VER} -APACHE_PORT?= ${PORTSDIR}/www/apache13 .include <bsd.port.pre.mk> @@ -47,7 +46,7 @@ PREFIX=${PREFIX} INSTALLSITELIB=${PERLSITEDIR} \ INSTALLSITEARCH=${PERLSITEDIR}/${PERL_ARCH} \ INSTALLMAN3DIR=${MANPREFIX}/man/man3 \ - WITH_APXS=${LOCALBASE}/sbin/apxs \ + WITH_APXS=${APXS} \ PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"' post-install: Index: www/mod_perl2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl2/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- www/mod_perl2/Makefile 20 May 2003 08:48:34 -0000 1.25 +++ www/mod_perl2/Makefile 7 Oct 2003 20:03:45 -0000 @@ -16,9 +16,8 @@ MAINTAINER= larse@isi.edu COMMENT= Embeds a Perl interpreter in the Apache2 server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} - +USE_APACHE= yes +WITH_APACHE2= YES USE_PERL5= YES INSTALLS_SHLIB= YES @@ -29,7 +28,6 @@ Bundle::ApacheTest.3 ModPerl::Code.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -APACHE2_PORT?= ${PORTSDIR}/www/apache2 .include <bsd.port.pre.mk> @@ -46,7 +44,7 @@ do-configure: @ cd ${WRKSRC}; \ - ${PERL5} Makefile.PL MP_APXS=${LOCALBASE}/sbin/apxs \ + ${PERL5} Makefile.PL MP_APXS=${APXS} \ MP_INST_APACHE2=1 PREFIX=${PREFIX} post-install: Index: www/mod_php3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_php3/Makefile,v retrieving revision 1.135 diff -u -r1.135 Makefile --- www/mod_php3/Makefile 6 Mar 2003 19:23:19 -0000 1.135 +++ www/mod_php3/Makefile 7 Oct 2003 20:03:45 -0000 @@ -28,8 +28,7 @@ COMMENT?= PHP3 module for Apache .if !defined(STANDALONE) -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +USE_APACHE= yes .endif PATCH_DIST_ARGS= -d ${WRKSRC}/functions @@ -37,8 +36,6 @@ PHP_DISTDIR= distributions SLAVEDIRS= lang/php3 -APACHE_PORT?= ${PORTSDIR}/www/apache13 -APXS?= ${LOCALBASE}/sbin/apxs USE_SUBMAKE= yes GNU_CONFIGURE= yes @@ -51,7 +48,7 @@ CONFIGURE_ARGS= --with-config-file-path=${PREFIX}/etc/php.standalone \ --enable-discard-path .else -CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs \ +CONFIGURE_ARGS= --with-apxs=${APXS} \ --with-config-file-path=${PREFIX}/etc .endif Index: www/mod_proxy_add_forward/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_proxy_add_forward/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_proxy_add_forward/Makefile 1 Apr 2003 22:45:49 -0000 1.6 +++ www/mod_proxy_add_forward/Makefile 7 Oct 2003 20:03:46 -0000 @@ -16,12 +16,8 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Apache module that adds a client IP header to outgoing proxy requests -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - +USE_APACHE= yes NO_WRKSUBDIR= YES - -APXS?= ${LOCALBASE}/sbin/apxs do-extract: @${MKDIR} ${WRKDIR} Index: www/mod_put/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_put/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_put/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_put/Makefile 7 Oct 2003 20:03:46 -0000 @@ -14,11 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module that provides PUT and DELETE methods -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} do-build: Index: www/mod_python/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_python/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- www/mod_python/Makefile 27 Sep 2003 01:01:07 -0000 1.21 +++ www/mod_python/Makefile 7 Oct 2003 20:03:46 -0000 @@ -16,16 +16,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for integrating Python -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes NO_PACKAGE= "Requires Python without threads support" USE_PYTHON= yes .include <bsd.port.pre.mk> - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${APXS} Index: www/mod_python3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_python3/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/mod_python3/Makefile 5 Aug 2003 03:14:38 -0000 1.23 +++ www/mod_python3/Makefile 7 Oct 2003 20:03:46 -0000 @@ -15,12 +15,8 @@ MAINTAINER= perky@FreeBSD.org COMMENT= Apache module that embeds the Python interpreter within the server -BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 - +USE_APACHE= yes USE_PYTHON= yes - -APXS?= ${LOCALBASE}/sbin/apxs GNU_CONFIGURE= yes USE_REINPLACE= yes Index: www/mod_roaming/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_roaming/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_roaming/Makefile 20 Feb 2003 19:15:29 -0000 1.8 +++ www/mod_roaming/Makefile 7 Oct 2003 20:03:46 -0000 @@ -14,12 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module that works as a Netscape Roaming Access server -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - +USE_APACHE= yes DOCS= CHANGES INSTALL LICENSE README do-build: Index: www/mod_roaming2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_roaming2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_roaming2/Makefile 21 Feb 2003 14:01:21 -0000 1.2 +++ www/mod_roaming2/Makefile 7 Oct 2003 20:03:46 -0000 @@ -16,10 +16,8 @@ MAINTAINER= vivek@kciLink.com COMMENT= An Apache module that works as a Netscape Roaming Access server -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache2 - -APXS= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes +WITH_APACHE2= yes DOCS= CHANGES INSTALL LICENSE README Index: www/mod_ruby/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_ruby/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- www/mod_ruby/Makefile 10 Sep 2003 07:38:37 -0000 1.44 +++ www/mod_ruby/Makefile 7 Oct 2003 20:03:46 -0000 @@ -14,15 +14,11 @@ MAINTAINER= knu@FreeBSD.org COMMENT= An Apache module that embeds Ruby interpreter within -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} LIB_DEPENDS= eruby.10:${PORTSDIR}/textproc/eruby -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +USE_APACHE= yes USE_RUBY= yes USE_REINPLACE= yes - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 CONFIGURE_ARGS= --with-apxs="${APXS}" \ --enable-eruby=yes \ Index: www/mod_scgi/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_scgi/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_scgi/Makefile 7 Mar 2003 06:12:45 -0000 1.2 +++ www/mod_scgi/Makefile 7 Oct 2003 20:03:46 -0000 @@ -14,9 +14,7 @@ MAINTAINER= nbm@FreeBSD.org COMMENT= Apache module that implements the client side of the SCGI protocol -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${PREFIX}/sbin/apxs +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} do-build: cd ${WRKSRC} && ${APXS} -c -o mod_scgi.so mod_scgi.c Index: www/mod_security/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_security/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_security/Makefile 19 Jul 2003 06:49:46 -0000 1.4 +++ www/mod_security/Makefile 7 Oct 2003 20:03:46 -0000 @@ -19,22 +19,17 @@ WITH_APACHE2= yes .endif -APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 APWRKSRC?= ${WRKSRC}/apache2 PLIST_SUB= APACHE=apache2 SO= la .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 APWRKSRC?= ${WRKSRC}/apache1 PLIST_SUB= APACHE=apache SO= so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes DOCS= CHANGES INSTALL LICENSE README modsecurity-manual-v1.5.1.pdf do-build: Index: www/mod_sed/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sed/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_sed/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_sed/Makefile 7 Oct 2003 20:03:46 -0000 @@ -14,12 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An apache module that embeds a copy of the sed(1) command -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - +USE_APACHE= yes MAKE_ARGS= APXS=${APXS} .include <bsd.port.mk> Index: www/mod_sequester/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sequester/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_sequester/Makefile 4 Oct 2003 07:17:16 -0000 1.6 +++ www/mod_sequester/Makefile 7 Oct 2003 20:03:46 -0000 @@ -14,12 +14,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that controls access to the website using secure info -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes WRKSRC= ${WRKDIR}/mod_sequester -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_snake/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_snake/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_snake/Makefile 4 Oct 2003 07:14:44 -0000 1.6 +++ www/mod_snake/Makefile 7 Oct 2003 20:03:46 -0000 @@ -14,13 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library to easily create flexible Apache modules -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${PYTHON_CMD}:${PYTHON_PORTSDIR} RUN_DEPENDS= ${BUILD_DEPENDS} USE_BZIP2= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs="${APXS}" Index: www/mod_sqlinclude/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sqlinclude/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_sqlinclude/Makefile 7 Mar 2003 06:12:45 -0000 1.4 +++ www/mod_sqlinclude/Makefile 7 Oct 2003 20:03:47 -0000 @@ -15,11 +15,9 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module implementing config inclusion from MySQL databases -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -APXS?= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes DOCS= CHANGES.txt README.txt TODO.txt do-build: Index: www/mod_throttle/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_throttle/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_throttle/Makefile 7 Mar 2003 06:12:45 -0000 1.5 +++ www/mod_throttle/Makefile 7 Oct 2003 20:03:47 -0000 @@ -16,12 +16,8 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module that provides bandwidth & request throttling -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - +USE_APACHE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -APXS?= ${LOCALBASE}/sbin/apxs DOCS= CHANGES.txt LICENSE.txt index.shtml Index: www/mod_ticket/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_ticket/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_ticket/Makefile 20 Feb 2003 19:15:30 -0000 1.5 +++ www/mod_ticket/Makefile 7 Oct 2003 20:03:47 -0000 @@ -15,11 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for a digitally signed ticket in URL -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-extract: ${MKDIR} ${WRKSRC} Index: www/mod_trigger/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_trigger/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_trigger/Makefile 21 Feb 2003 14:01:21 -0000 1.4 +++ www/mod_trigger/Makefile 7 Oct 2003 20:03:47 -0000 @@ -14,10 +14,7 @@ MAINTAINER= svenasse@polaris.ca COMMENT= Apache module to launch triggers if certain actions occur -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${BUILD_DEPENDS} - -APXS?= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_tsunami/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_tsunami/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_tsunami/Makefile 30 Sep 2003 07:14:43 -0000 1.4 +++ www/mod_tsunami/Makefile 7 Oct 2003 20:03:47 -0000 @@ -14,11 +14,7 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= Apache module which dynamically limits a site's slot usage -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs - +USE_APACHE= yes DOCS= AUTHORS Changelog INSTALL LICENSE README do-build: Index: www/mod_watch/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_watch/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_watch/Makefile 7 Mar 2003 06:12:45 -0000 1.7 +++ www/mod_watch/Makefile 7 Oct 2003 20:03:47 -0000 @@ -16,14 +16,11 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module to monitor bandwidth usage, for use with MRTG etc -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - +USE_APACHE= yes USE_PERL5= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -APXS?= ${LOCALBASE}/sbin/apxs MAKE_ARGS+= APXS="${APXS}" ALL_TARGET= build-dynamic Index: www/mod_webapp/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_webapp/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_webapp/Makefile 26 Jun 2003 22:58:32 -0000 1.3 +++ www/mod_webapp/Makefile 7 Oct 2003 20:03:47 -0000 @@ -16,11 +16,10 @@ MAINTAINER= asachs@uunet.co.za COMMENT= Apache module mounts Tomcat web applications -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ - ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \ +BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \ ${AUTOCONF}:${PORTSDIR}/devel/autoconf -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +USE_APACHE= yes USE_LIBTOOL= yes LIBTOOLFILES= # none USE_GMAKE= yes @@ -33,7 +32,6 @@ .include <bsd.port.pre.mk> # Apache locations. -APXS?= ${LOCALBASE}/sbin/apxs APACHECTL?= ${LOCALBASE}/sbin/apachectl APR_LIB?= ${LOCALBASE}/lib/ APR_INCLUDE?= ${LOCALBASE}/include/apr-0/ Index: www/mod_zap/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_zap/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_zap/Makefile 28 Feb 2003 11:34:56 -0000 1.14 +++ www/mod_zap/Makefile 7 Oct 2003 20:03:47 -0000 @@ -14,15 +14,14 @@ MAINTAINER= demon@FreeBSD.org COMMENT= An Apache module that provides Z39.50 access through WWW -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ - ${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83 +BUILD_DEPENDS= ${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83 LIB_DEPENDS= yaz.2:${PORTSDIR}/net/yaz -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ - ${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83 +RUN_DEPENDS= ${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83 +USE_APACHE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-yazconfig=${LOCALBASE}/bin \ - --with-apxs=${LOCALBASE}/sbin/apxs \ + --with-apxs=${APXS} \ --with-tclconfig=${LOCALBASE}/lib/tcl8.3 post-patch: Index: www/neowebscript/Makefile =================================================================== RCS file: /home/pcvs/ports/www/neowebscript/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/neowebscript/Makefile 3 Jun 2003 16:48:42 -0000 1.6 +++ www/neowebscript/Makefile 7 Oct 2003 20:03:47 -0000 @@ -15,7 +15,7 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= neo82:${PORTSDIR}/devel/tcl-neo MAKEFILE= ${FILESDIR}/Makefile.bsd Index: www/p5-Apache-AuthCookie/Makefile =================================================================== RCS file: /home/pcvs/ports/www/p5-Apache-AuthCookie/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/p5-Apache-AuthCookie/Makefile 6 Jun 2003 12:18:45 -0000 1.10 +++ www/p5-Apache-AuthCookie/Makefile 7 Oct 2003 20:03:47 -0000 @@ -16,10 +16,9 @@ COMMENT= A perl module to provide custom forms for reauthentication BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ - ${LOCALBASE}/sbin/apxs:${APACHE_PORT} + ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} -APACHE_PORT?= ${PORTSDIR}/www/apache13 CURUSER?= `whoami` CURGRP?= `groups | ${AWK} '{print $$1}'` TESTPORT?= 8228 Index: www/rt3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/rt3/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- www/rt3/Makefile 29 Sep 2003 10:40:39 -0000 1.28 +++ www/rt3/Makefile 7 Oct 2003 20:03:48 -0000 @@ -17,7 +17,7 @@ MAINTAINER= autrijus@autrijus.org COMMENT?= RT is an industrial-grade ticketing system written in Perl -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} \ +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \ ${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \ @@ -70,28 +70,22 @@ .if defined(WITH_FASTCGI) .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi .endif -BUILD_DEPENDS+= ${ARCH_PERL}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI +BUILD_DEPENDS+= ${ARCH_PERL}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI DEPENDS_ARGS+= WITHOUT_MODPERL=yes .else BUILD_DEPENDS+= ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 DEPENDS_ARGS+= WITHOUT_MODPERL=yes DEPENDS_ARGS+= WITH_MODPERL2=yes .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl .endif .endif - -APXS?= ${LOCALBASE}/sbin/apxs DB_TYPE?= mysql Index: www/smb2www/Makefile =================================================================== RCS file: /home/pcvs/ports/www/smb2www/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/smb2www/Makefile 21 Feb 2003 14:01:32 -0000 1.3 +++ www/smb2www/Makefile 7 Oct 2003 20:03:48 -0000 @@ -20,7 +20,7 @@ MAINTAINER= roman@xpert.com COMMENT= Windows Network client that is accessible through a web browser -RUN_DEPENDS= httpd:${PORTSDIR}/www/apache13 \ +RUN_DEPENDS= httpd:${PORTSDIR}/${APACHE_PORT} \ smbclient:${PORTSDIR}/net/samba \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 Index: www/suphp/Makefile =================================================================== RCS file: /home/pcvs/ports/www/suphp/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/suphp/Makefile 7 Oct 2003 00:49:16 -0000 1.5 +++ www/suphp/Makefile 7 Oct 2003 20:03:48 -0000 @@ -13,14 +13,13 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= A combination which provides a wrapper for PHP -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${LOCALBASE}/bin/php:${PORTSDIR}/www/php4-cgi HAS_CONFIGURE= yes USE_GMAKE= yes CONFLICTS= mod_php4-4* -APXS?= ${LOCALBASE}/sbin/apxs LOG_PATH?= /var/log PHP_PATH?= ${LOCALBASE}/bin/php APACHE_USER?= www Index: www/webglimpse/Makefile =================================================================== RCS file: /home/pcvs/ports/www/webglimpse/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- www/webglimpse/Makefile 20 Feb 2003 19:15:37 -0000 1.18 +++ www/webglimpse/Makefile 7 Oct 2003 20:03:48 -0000 @@ -15,7 +15,7 @@ MAINTAINER= ports@freebsd.org COMMENT= WWW interface to Glimpse search engine -RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= glimpse:${PORTSDIR}/textproc/glimpse WRKSRC= ${WRKDIR}/webglimpse-1.6.edu Index: www/wwwstat/Makefile =================================================================== RCS file: /home/pcvs/ports/www/wwwstat/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/wwwstat/Makefile 17 Jul 2003 20:39:07 -0000 1.23 +++ www/wwwstat/Makefile 7 Oct 2003 20:03:48 -0000 @@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Webserver logfile analysis package -RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} USE_PERL5= yes MAKE_ENV+= PERL5=${PERL5}
State Changed From-To: open->analyzed This is currently being tested on bento.
Updated PATCH: - make APXS configureable - APACHE_PORT now without PORTSDIR defaults for APXS and APACHE_PORT now in bsd.port.mk APACHE_PORT honors WITH_APACHE2=yes - include dependencies with USE_APACHE=yes Please approve ... kind regards Dirk - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org] Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.468 diff -u -r1.468 bsd.port.mk --- Mk/bsd.port.mk 3 Sep 2003 19:50:24 -0000 1.468 +++ Mk/bsd.port.mk 3 Nov 2003 20:53:45 -0000 @@ -422,7 +422,13 @@ # depend on the sysutils/rc_subr port. # # RC_SUBR - Set to path of rc.subr, defaults to ${LOCALBASE}/etc/rc.subr. -# +# +# USE_APACHE - Says that the port relies on an apache webserver. +# APACHE_PORT - CATEGORY and portname of the prefered port for apache. +# Default: www/apache13 +# If WITH_APACHE2 is defined defaults to www/apache2 +# APXS - Full path to the prefered apxs binary to configure +# apache modules. Default: ${LOCALBASE}/sbin/apxs # # # Dependency checking. Use these if your port requires another port @@ -1007,6 +1013,17 @@ NO_MTREE= yes .else PREFIX?= ${LOCALBASE} +.endif + +.if defined(WITH_APACHE2) +APACHE_PORT?= www/apache2 +.else +APACHE_PORT?= www/apache13 +.endif +APXS?= ${LOCALBASE}/sbin/apxs +.if defined(USE_APACHE) +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif .if !defined(PERL_LEVEL) && defined(PERL_VERSION) Index: databases/mysql-editor/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysql-editor/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- databases/mysql-editor/Makefile 16 Sep 2003 05:43:46 -0000 1.3 +++ databases/mysql-editor/Makefile 3 Nov 2003 20:53:45 -0000 @@ -15,7 +15,7 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= CGI scripts in Perl to edit your MySQL tables -RUN_DEPENDS= ${CGI_BIN}:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${CGI_BIN}:${PORTSDIR}/${APACHE_PORT} NO_BUILD= True Index: databases/mysqlman/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysqlman/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- databases/mysqlman/Makefile 16 Sep 2003 05:43:47 -0000 1.6 +++ databases/mysqlman/Makefile 3 Nov 2003 20:53:45 -0000 @@ -13,7 +13,7 @@ MAINTAINER= janos.mohacsi@bsd.hu COMMENT= MySQLMan is a web based MySQL database manager written in perl -RUN_DEPENDS= ${WWW_DIR}:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${WWW_DIR}:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${DISTNAME}-${PORTVERSION} RESTRICTED= "not redistributable, license agreement required" Index: devel/subversion/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- devel/subversion/Makefile 26 Oct 2003 19:12:49 -0000 1.49 +++ devel/subversion/Makefile 3 Nov 2003 20:53:45 -0000 @@ -33,7 +33,6 @@ .include <bsd.port.pre.mk> SVNREPOS?= /home/svn/repos -APXS= ${LOCALBASE}/sbin/apxs .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes @@ -48,9 +47,9 @@ .endif .if defined(WITH_APACHE2_APR) -APACHE2_PORT?= ${PORTSDIR}/www/apache2 -BUILD_DEPENDS+= ${APXS}:${APACHE2_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE2_PORT} +APACHE2_PORT?= www/apache2 +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ --with-apr-util=${LOCALBASE}/lib/apache2/apu-config .else Index: korean/mod_url/Makefile =================================================================== RCS file: /home/pcvs/ports/korean/mod_url/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- korean/mod_url/Makefile 13 Apr 2003 12:38:13 -0000 1.1 +++ korean/mod_url/Makefile 3 Nov 2003 20:53:46 -0000 @@ -14,11 +14,8 @@ COMMENT= Apache module for manipulating euc-kr encoded URL LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-extract: ${MKDIR} ${WRKSRC} Index: lang/eperl/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/eperl/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- lang/eperl/Makefile 21 Feb 2003 12:35:00 -0000 1.36 +++ lang/eperl/Makefile 3 Nov 2003 20:53:46 -0000 @@ -22,7 +22,7 @@ #INSTALL_ALSO_AS_SSSL= yes .if defined(INSTALL_ALSO_AS_SSSL) -RUN_DEPENDS= ${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/www/apache +RUN_DEPENDS= ${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/${APACHE_PORT} .endif USE_PERL5= yes Index: lang/php4/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php4/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- lang/php4/Makefile 13 Oct 2003 05:59:45 -0000 1.32 +++ lang/php4/Makefile 3 Nov 2003 20:53:46 -0000 @@ -144,7 +144,6 @@ .endif .if !defined(WITHOUT_APACHE) -APXS?= ${LOCALBASE}/sbin/apxs PLIST_SUB+= APACHE="" .else PLIST_SUB+= APACHE="@comment " @@ -533,16 +532,16 @@ WITH_APACHE2= yes .endif .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp4.so .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp4.so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \ Index: lang/php5/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php5/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- lang/php5/Makefile 30 Oct 2003 01:52:15 -0000 1.29 +++ lang/php5/Makefile 3 Nov 2003 20:53:48 -0000 @@ -513,16 +513,16 @@ WITH_APACHE2= yes .endif .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 +APACHE_PORT?= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp5.so .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 +APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp5.so .endif -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \ Index: mail/websieve/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/websieve/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- mail/websieve/Makefile 29 Apr 2003 13:30:23 -0000 1.3 +++ mail/websieve/Makefile 3 Nov 2003 20:53:48 -0000 @@ -29,11 +29,7 @@ RUN_DEPENDS= ${SITE_PERL}/IMAP/Admin.pm:${PORTSDIR}/mail/p5-IMAP-Admin \ ${SITE_PERL}/IMAP/Sieve.pm:${PORTSDIR}/mail/p5-IMAP-Sieve .endif -.if defined(WITH_APACHE2) -RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache2 -.else -RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache13 -.endif +RUN_DEPENDS+= ${LOCALBASE}/www/cgi-bin:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message Index: misc/instant-server/Makefile =================================================================== RCS file: /home/pcvs/ports/misc/instant-server/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- misc/instant-server/Makefile 7 Mar 2003 06:07:02 -0000 1.6 +++ misc/instant-server/Makefile 3 Nov 2003 20:53:48 -0000 @@ -20,7 +20,7 @@ ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba \ ${LOCALBASE}/sbin/traceroute:${PORTSDIR}/net/traceroute \ cnewsdo:${PORTSDIR}/news/cnews \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \ + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24 # Don't let stupid programs ask for configuration. Index: textproc/htdig/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/htdig/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- textproc/htdig/Makefile 7 Mar 2003 06:11:40 -0000 1.23 +++ textproc/htdig/Makefile 3 Nov 2003 20:53:48 -0000 @@ -14,7 +14,7 @@ MAINTAINER= DougB@FreeBSD.org COMMENT= A www indexing and searching system -RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/${APACHE_PORT} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \ Index: www/apache-contrib/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache-contrib/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/apache-contrib/Makefile 20 Feb 2003 19:15:22 -0000 1.12 +++ www/apache-contrib/Makefile 3 Nov 2003 20:53:48 -0000 @@ -14,12 +14,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Third-party modules contributed to the Apache HTTP server project -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +USE_APACHE= yes -APXS= ${LOCALBASE}/sbin/apxs - -AP_PORT?= apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif Index: www/apache-jserv/Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache-jserv/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- www/apache-jserv/Makefile 21 Feb 2003 14:01:12 -0000 1.15 +++ www/apache-jserv/Makefile 3 Nov 2003 20:53:49 -0000 @@ -18,10 +18,10 @@ USE_JAVA= 1.1+ NEED_JAVAC= yes -BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\ +BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\ ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper\ - ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\ + ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\ ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk USE_GMAKE= yes @@ -35,7 +35,7 @@ --libdir=${LOCALBASE}/libexec/apache\ --with-logdir=/var/log\ --sysconfdir=${PREFIX}/etc/apache\ - --with-apxs=${LOCALBASE}/sbin/apxs\ + --with-apxs=${APXS}\ --with-jdk-home=${JAVA_HOME}\ --with-JSDK=${LOCALBASE}/share/java/classes/jsdk.jar\ --with-java=${JAVA}\ Index: www/auth_ldap/Makefile =================================================================== RCS file: /home/pcvs/ports/www/auth_ldap/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/auth_ldap/Makefile 14 Aug 2003 18:00:01 -0000 1.12 +++ www/auth_ldap/Makefile 3 Nov 2003 20:53:49 -0000 @@ -14,10 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to authenticate against an LDAP directory -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} LIB_DEPENDS= lber.2:${PORTSDIR}/${LDAP_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +USE_APACHE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-llber" CONFIGURE_ARGS= --with-sdk-headers=${LOCALBASE}/include \ @@ -26,8 +25,6 @@ --with-apxs=${APXS} USE_GMAKE= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 LDAP_PORT?= net/openldap20-client MAKE_ARGS+= APXS=${APXS} Index: www/bk2site/Makefile =================================================================== RCS file: /home/pcvs/ports/www/bk2site/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/bk2site/Makefile 7 Oct 2003 17:19:09 -0000 1.12 +++ www/bk2site/Makefile 3 Nov 2003 20:53:49 -0000 @@ -16,9 +16,8 @@ COMMENT= Transforms Netscape bookmarks into a Yahoo-like website .include <bsd.port.pre.mk> -APXS= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} # Specify these directories in relative paths to ${PREFIX}. .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache) Index: www/dansguardian/Makefile =================================================================== RCS file: /home/pcvs/ports/www/dansguardian/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- www/dansguardian/Makefile 4 Sep 2003 01:09:23 -0000 1.9 +++ www/dansguardian/Makefile 3 Nov 2003 20:53:49 -0000 @@ -15,7 +15,7 @@ COMMENT= A fast, featureful web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} GNU_CONFIGURE= yes Index: www/dansguardian-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/www/dansguardian-devel/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/dansguardian-devel/Makefile 28 Mar 2003 01:25:19 -0000 1.7 +++ www/dansguardian-devel/Makefile 3 Nov 2003 20:53:49 -0000 @@ -15,7 +15,7 @@ COMMENT= A fast, simple web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} Index: www/mnogosearch/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mnogosearch/Makefile,v retrieving revision 1.42 diff -u -r1.42 Makefile --- www/mnogosearch/Makefile 6 Oct 2003 01:21:59 -0000 1.42 +++ www/mnogosearch/Makefile 3 Nov 2003 20:53:49 -0000 @@ -14,7 +14,7 @@ MAINTAINER= ache@FreeBSD.org COMMENT= Full featured SQL-based hypertext search engine -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} +RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} APXS?= ${LOCALBASE}/sbin/apxs APACHE_PORT?= ${PORTSDIR}/www/apache13 Index: www/mod_access_identd/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_access_identd/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_access_identd/Makefile 20 Feb 2003 19:15:27 -0000 1.5 +++ www/mod_access_identd/Makefile 3 Nov 2003 20:53:50 -0000 @@ -13,12 +13,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to supply access control based on ident reply -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes WRKSRC= ${WRKDIR}/mod_access_identd -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_access_referer/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_access_referer/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_access_referer/Makefile 20 Feb 2003 19:15:27 -0000 1.7 +++ www/mod_access_referer/Makefile 3 Nov 2003 20:53:50 -0000 @@ -14,12 +14,7 @@ MAINTAINER= ports@freebsd.org COMMENT= An Apache module that provides access control based on Referer HTTP header -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - +USE_APACHE= yes DOCS= HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html do-build: Index: www/mod_accounting/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_accounting/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_accounting/Makefile 28 Aug 2003 12:14:21 -0000 1.6 +++ www/mod_accounting/Makefile 3 Nov 2003 20:53:50 -0000 @@ -15,10 +15,9 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= An Apache module that records traffic statistics into a database -BUILD_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} MAKE_ARGS+= APXS="${APXS}" -APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITHOUT_PGSQL) MAKE_ARGS+= WITHOUT_PGSQL=YES Index: www/mod_auth_any/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_any/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_auth_any/Makefile 6 Oct 2003 13:00:07 -0000 1.7 +++ www/mod_auth_any/Makefile 3 Nov 2003 20:53:50 -0000 @@ -13,13 +13,8 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache module to use any command line program to authenticate a user -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes WRKSRC= ${WRKDIR}/${PORTNAME} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: @cd ${WRKSRC}/src && ${APXS} -c ${PORTNAME}.c Index: www/mod_auth_external/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_external/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_auth_external/Makefile 7 Mar 2003 06:12:41 -0000 1.8 +++ www/mod_auth_external/Makefile 3 Nov 2003 20:53:50 -0000 @@ -14,11 +14,7 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Enables the use of external mechanisms for user authentication -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs - +USE_APACHE= yes DOCDIR= ${PREFIX}/share/doc/${PORTNAME} DOCS= AUTHENTICATORS CHANGES INSTALL README TODO Index: www/mod_auth_kerb/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_kerb/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_auth_kerb/Makefile 7 Mar 2003 06:12:41 -0000 1.6 +++ www/mod_auth_kerb/Makefile 3 Nov 2003 20:53:50 -0000 @@ -23,13 +23,11 @@ # (i.e., HTTP over SSL/TLS). Thus, we require as a dependency # a version of Apache which can do this. # -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13-modssl -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13-modssl LIB_DEPENDS= krb5.3:${PORTSDIR}/security/krb5 +USE_APACHE= yes WRKSRC= ${WRKDIR}/src/modules/kerberos -APXS?= ${LOCALBASE}/sbin/apxs KRB5_HOME?= ${LOCALBASE} do-build: Index: www/mod_auth_mysql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_mysql/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_auth_mysql/Makefile 29 Sep 2003 10:12:15 -0000 1.14 +++ www/mod_auth_mysql/Makefile 3 Nov 2003 20:53:50 -0000 @@ -14,16 +14,13 @@ MAINTAINER= jeh@FreeBSD.org COMMENT= Allows users to use MySQL databases for user authentication -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} USE_MYSQL= yes .include <bsd.port.pre.mk> -APXS= ${LOCALBASE}/sbin/apxs - -AP_PORT?= apache13 .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif Index: www/mod_auth_mysql_another/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_mysql_another/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_auth_mysql_another/Makefile 30 Jun 2003 09:35:27 -0000 1.5 +++ www/mod_auth_mysql_another/Makefile 3 Nov 2003 20:53:50 -0000 @@ -31,22 +31,18 @@ WITH_APACHE2= yes .endif -APXS= ${LOCALBASE}/sbin/apxs - .if defined(WITH_APACHE2) -APACHE_PORT= ${PORTSDIR}/www/apache2 APACHE_VER= APACHE2 PLIST_SUB= VER="2" DSO= mod_auth_mysql.la .else -APACHE_PORT= ${PORTSDIR}/www/apache13 APACHE_VER= APACHE1 PLIST_SUB= VER="" DSO= mod_auth_mysql.so .endif -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} post-patch: @${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g;s|%%APXS%%|${APXS}|g;s|%%APACHE_VER%%|${APACHE_VER}|g;s|%%DSO%%|${DSO}|g' \ Index: www/mod_auth_pam/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pam/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_auth_pam/Makefile 15 Oct 2003 22:17:32 -0000 1.6 +++ www/mod_auth_pam/Makefile 3 Nov 2003 20:53:50 -0000 @@ -14,10 +14,7 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Allows users to use PAM modules for user authentication -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes .include <bsd.port.pre.mk> Index: www/mod_auth_pgsql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pgsql/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_auth_pgsql/Makefile 7 Mar 2003 06:12:42 -0000 1.12 +++ www/mod_auth_pgsql/Makefile 3 Nov 2003 20:53:50 -0000 @@ -13,17 +13,14 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= Allows users to use PostgreSQL databases for user authentication -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} .include <bsd.port.pre.mk> -APXS?= ${LOCALBASE}/sbin/apxs -AP_PORT?= apache13 -APACHE_PORT?= ${PORTSDIR}/www/${AP_PORT} POSTGRESQL_PORT?= databases/postgresql7 .if exists(${APXS}) Index: www/mod_auth_pwcheck/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_auth_pwcheck/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_auth_pwcheck/Makefile 2 Nov 2003 03:36:45 -0000 1.5 +++ www/mod_auth_pwcheck/Makefile 3 Nov 2003 20:53:51 -0000 @@ -13,15 +13,15 @@ MAINTAINER= anton@chelcom.ru COMMENT= Apache module for user authentication via Cyrus pwcheck daemon -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl WRKSRC= ${WRKDIR}/${PORTNAME} +APACHE_PORT?= ${AP_CATEGORY}/${AP_PORT} .include <bsd.port.pre.mk> -APXS?= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) AP_MOD_SSL_SUFFIX!= ${APXS} -q CFLAGS 2>/dev/null \ | ${GREP} DMOD_SSL >/dev/null \ Index: www/mod_backhand/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_backhand/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_backhand/Makefile 15 Oct 2003 01:22:11 -0000 1.8 +++ www/mod_backhand/Makefile 3 Nov 2003 20:53:51 -0000 @@ -14,10 +14,7 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= Apache module that allows seamless redirection and load balancing of HTTP requests -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs="${APXS}" Index: www/mod_bandwidth/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bandwidth/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_bandwidth/Makefile 14 Oct 2003 07:21:23 -0000 1.3 +++ www/mod_bandwidth/Makefile 3 Nov 2003 20:53:51 -0000 @@ -17,11 +17,8 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Bandwidth management module for the Apache webserver -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${BUILD_DEPENDS} - +USE_APACHE= YES USE_PERL5= YES -APXS?= ${LOCALBASE}/sbin/apxs do-build: @(cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c) Index: www/mod_bf/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bf/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_bf/Makefile 3 Oct 2003 21:34:47 -0000 1.6 +++ www/mod_bf/Makefile 3 Nov 2003 20:53:51 -0000 @@ -14,11 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A brainf*ck module for Apache -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_blosxom/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_blosxom/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_blosxom/Makefile 9 May 2003 11:59:57 -0000 1.3 +++ www/mod_blosxom/Makefile 3 Nov 2003 20:53:51 -0000 @@ -14,12 +14,7 @@ MAINTAINER= gslin@ccca.nctu.edu.tw COMMENT= Apache module to build the extremely lightweight Weblog environment -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${BUILD_DEPENDS} - +USE_APACHE= yes USE_REINPLACE= yes post-patch: Index: www/mod_blowchunks/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_blowchunks/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_blowchunks/Makefile 27 Sep 2003 01:01:07 -0000 1.6 +++ www/mod_blowchunks/Makefile 3 Nov 2003 20:53:51 -0000 @@ -15,13 +15,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for rejecting and logging chunked requests -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes NO_WRKSUBDIR= YES -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 APXSFLAGS= -DTRUE=1 -DFALSE=0 .if !defined(WITHOUT_BLOWCHUNK_LOG) APXSFLAGS+= -DLOG_BLOWCHUNK Index: www/mod_bunzip2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bunzip2/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_bunzip2/Makefile 2 Nov 2003 03:36:45 -0000 1.3 +++ www/mod_bunzip2/Makefile 3 Nov 2003 20:53:51 -0000 @@ -13,13 +13,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for server-side decompression of bzip2 files -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/${PORTNAME}-2 -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: cd ${WRKSRC}; ${APXS} -c -lbz2 mod_bunzip2.c Index: www/mod_cgi_debug/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_cgi_debug/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_cgi_debug/Makefile 20 Feb 2003 19:15:28 -0000 1.6 +++ www/mod_cgi_debug/Makefile 3 Nov 2003 20:53:51 -0000 @@ -13,11 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to make debugging server-side scripts easier -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_color/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_color/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_color/Makefile 27 Oct 2003 01:31:51 -0000 1.6 +++ www/mod_color/Makefile 3 Nov 2003 20:53:51 -0000 @@ -16,11 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that provides syntax coloring for various languages -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes NO_WRKSUBDIR= yes do-extract: Index: www/mod_csacek/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_csacek/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_csacek/Makefile 21 Feb 2003 14:01:19 -0000 1.5 +++ www/mod_csacek/Makefile 3 Nov 2003 20:53:51 -0000 @@ -14,11 +14,7 @@ MAINTAINER= ms@vol.cz COMMENT= Charset recoding module for Apache -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs - +USE_APACHE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-target=Apache \ Index: www/mod_cvs/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_cvs/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_cvs/Makefile 7 Mar 2003 06:12:42 -0000 1.4 +++ www/mod_cvs/Makefile 3 Nov 2003 20:53:51 -0000 @@ -16,13 +16,9 @@ MAINTAINER= petef@FreeBSD.org COMMENT= A module that makes Apache CVS aware -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - +USE_APACHE= yes USE_REINPLACE= yes MAKE_ARGS+= APXS="${APXS}" - -APXS?= ${LOCALBASE}/sbin/apxs post-patch: @${REINPLACE_CMD} -e 's,apxs,${APXS},g' ${WRKSRC}/Makefile Index: www/mod_dav/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_dav/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- www/mod_dav/Makefile 21 Feb 2003 14:01:20 -0000 1.10 +++ www/mod_dav/Makefile 3 Nov 2003 20:53:51 -0000 @@ -14,12 +14,10 @@ MAINTAINER= patrick@mindstep.com COMMENT= An Apache module that provides DAV capabilities -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - # This port will work with the following version of Apache and anything newer. APACHE_VERSION= 1.3.6 +USE_APACHE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ @@ -29,7 +27,7 @@ --sysconfdir=${PREFIX}/etc/apache \ --datadir=${PREFIX}/share/apache \ --includedir=${PREFIX}/include/apache \ - --with-apxs=${PREFIX}/sbin/apxs + --with-apxs=${APXS} CONFIGURE_ENV= CFLAGS='${CFLAGS}' \ PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}" Index: www/mod_dtcl/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_dtcl/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- www/mod_dtcl/Makefile 7 Mar 2003 06:12:43 -0000 1.17 +++ www/mod_dtcl/Makefile 3 Nov 2003 20:53:51 -0000 @@ -13,11 +13,10 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 WRKSRC= ${WRKDIR}/mod_dtcl - MAKEFILE= ${FILESDIR}/Makefile.bsd do-install: Index: www/mod_extract_forwarded/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_extract_forwarded/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_extract_forwarded/Makefile 9 Apr 2003 22:07:25 -0000 1.7 +++ www/mod_extract_forwarded/Makefile 3 Nov 2003 20:53:52 -0000 @@ -14,12 +14,8 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module that can make proxied requests appear with client IP -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - +USE_APACHE= yes WRKSRC= ${WRKDIR}/${PORTNAME} - -APXS?= ${LOCALBASE}/sbin/apxs DOCS= doc.html README do-build: Index: www/mod_fastcgi/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_fastcgi/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- www/mod_fastcgi/Makefile 19 Jun 2003 15:41:36 -0000 1.12 +++ www/mod_fastcgi/Makefile 3 Nov 2003 20:53:52 -0000 @@ -14,17 +14,15 @@ MAINTAINER= hollywar@mail.holywar.net COMMENT= A fast-cgi module for Apache -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 MAKEFILE= Makefile.AP2 USE_REINPLACE= YES MAKE_ARGS= INCLUDES=-I${PREFIX}/include/apache2 INSTALL_TARGET= install-modules PLIST_SUB= APACHE=2 .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 PLIST_SUB= APACHE= .endif Index: www/mod_filter/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_filter/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_filter/Makefile 21 Feb 2003 14:01:20 -0000 1.2 +++ www/mod_filter/Makefile 3 Nov 2003 20:53:52 -0000 @@ -13,10 +13,7 @@ MAINTAINER= svenasse@polaris.ca COMMENT= Filter output from other modules inside of Apache -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${BUILD_DEPENDS} - -APXS= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes DOCS= README CONTRIB_DOCS= contrib/README contrib/echo.cgi contrib/eecummings.cgi contrib/head.cgi Index: www/mod_frontpage/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_frontpage/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- www/mod_frontpage/Makefile 11 Aug 2003 15:25:51 -0000 1.14 +++ www/mod_frontpage/Makefile 3 Nov 2003 20:53:52 -0000 @@ -14,12 +14,10 @@ COMMENT= Improved mod_frontpage for Apache, as APXS installation WRKSRC= ${WRKDIR}/${PORTNAME}_mirfak-${PORTVERSION} -AP_PORT?= apache13 -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} RUN_DEPENDS= ${FPSETPERM}:${PORTSDIR}/www/frontpage +USE_APACHE= yes FP_VER= 5.0 FP_DIR= ${PREFIX}/frontpage/version${FP_VER} FPSETPERM= ${FP_DIR}/set_default_perms.sh @@ -30,8 +28,6 @@ INSTALL_FILE= ${INSTALL} -c -m 555 -o bin -g bin PKG_PREFIX= ${PREFIX} - -APXS= ${LOCALBASE}/sbin/apxs .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || ${ECHO} no Index: www/mod_geoip/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_geoip/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- www/mod_geoip/Makefile 4 Sep 2003 21:10:47 -0000 1.7 +++ www/mod_geoip/Makefile 3 Nov 2003 20:53:52 -0000 @@ -14,14 +14,11 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= An Apache module that provides the country code of the client's IP -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} LIB_DEPENDS= GeoIP.3:${PORTSDIR}/net/GeoIP -.include <bsd.port.pre.mk> +USE_APACHE= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +.include <bsd.port.pre.mk> DOCS= Changes INSTALL README README.php Index: www/mod_gzip/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_gzip/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/mod_gzip/Makefile 21 Feb 2003 14:01:20 -0000 1.11 +++ www/mod_gzip/Makefile 3 Nov 2003 20:53:52 -0000 @@ -15,11 +15,7 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= An Internet Content Acceleration module for Apache -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes MAKE_ENV+= "APXS=${APXS}" ALL_TARGET= build Index: www/mod_hosts_access/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_hosts_access/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_hosts_access/Makefile 20 Feb 2003 19:15:28 -0000 1.6 +++ www/mod_hosts_access/Makefile 3 Nov 2003 20:53:52 -0000 @@ -14,11 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes APXS_FLAGS?= -S LDFLAGS_SHLIB="-shared -lwrap" do-build: Index: www/mod_index_rss/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_index_rss/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_index_rss/Makefile 20 Feb 2003 19:15:28 -0000 1.8 +++ www/mod_index_rss/Makefile 3 Nov 2003 20:53:52 -0000 @@ -15,11 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to provides RSS output for directories -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-build: @cd ${WRKSRC} && ${APXS} -c mod_index_rss.c Index: www/mod_jk/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_jk/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- www/mod_jk/Makefile 3 Nov 2003 03:56:41 -0000 1.19 +++ www/mod_jk/Makefile 3 Nov 2003 20:53:52 -0000 @@ -37,10 +37,9 @@ PLIST_SUB= APACHE2= .endif -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} -APXS= ${LOCALBASE}/sbin/apxs APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2} WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native Index: www/mod_jk2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_jk2/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- www/mod_jk2/Makefile 6 Jun 2003 12:59:19 -0000 1.1 +++ www/mod_jk2/Makefile 3 Nov 2003 20:53:52 -0000 @@ -16,11 +16,8 @@ MAINTAINER= lansil@fuzzynerd.com COMMENT= Apache 2.0 module for Tomcat -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${PREFIX}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache2 +USE_APACHE= yes +WITH_APACHE2= yes APACHE_CONF= ${PREFIX}/etc/apache2 WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native Index: www/mod_layout/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_layout/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/mod_layout/Makefile 27 Sep 2003 14:20:32 -0000 1.11 +++ www/mod_layout/Makefile 3 Nov 2003 20:53:53 -0000 @@ -13,9 +13,7 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache module to wrap served pages with a header and/or footer -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - +USE_APACHE= yes USE_REINPLACE= yes post-patch: Index: www/mod_layout2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_layout2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_layout2/Makefile 26 Sep 2003 17:25:14 -0000 1.2 +++ www/mod_layout2/Makefile 3 Nov 2003 20:53:53 -0000 @@ -13,9 +13,8 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache2 module to wrap served pages with a header and/or footer -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 - +USE_APACHE= yes +WITH_APACHE2= yes LATEST_LINK= mod_layout2 USE_REINPLACE= yes Index: www/mod_limitipconn/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_limitipconn/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_limitipconn/Makefile 20 Apr 2003 08:12:03 -0000 1.2 +++ www/mod_limitipconn/Makefile 3 Nov 2003 20:53:53 -0000 @@ -14,11 +14,7 @@ MAINTAINER= gslin@ccca.nctu.edu.tw COMMENT= Limit the number of simultaneous connections from a single client IP address -BUILD_DEPENDS?= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS?= ${BUILD_DEPENDS} - -APXS?= ${LOCALBASE}/sbin/apxs - +USE_APACHE= yes USE_REINPLACE= yes post-patch: Index: www/mod_log_sql/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_log_sql/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- www/mod_log_sql/Makefile 6 Aug 2003 15:02:27 -0000 1.9 +++ www/mod_log_sql/Makefile 3 Nov 2003 20:53:53 -0000 @@ -13,18 +13,15 @@ MAINTAINER= lev@FreeBSD.org COMMENT= Allows Apache to log to a MySQL database -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT} +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${AP_PORT} +RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes - -AP_PORT?= www/apache13 -APXS?= ${LOCALBASE}/sbin/apxs ALL_TARGET= dso INSTALL_TARGET= dsoinstall Index: www/mod_mp3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mp3/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- www/mod_mp3/Makefile 3 Oct 2003 14:04:33 -0000 1.27 +++ www/mod_mp3/Makefile 3 Nov 2003 20:53:53 -0000 @@ -15,15 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module to allow MP3 streaming -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes HAS_CONFIGURE= yes MAKE_ARGS+= APXS="${APXS}" USE_PERL5= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 DOCS= ChangeLog README TODO faq.html CONTRIBUTORS .if defined(WITH_MYSQL) Index: www/mod_mylo/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mylo/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_mylo/Makefile 7 Sep 2003 12:22:15 -0000 1.6 +++ www/mod_mylo/Makefile 3 Nov 2003 20:53:53 -0000 @@ -13,12 +13,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module to make Apache log to MySQL -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - +USE_APACHE= yes USE_MYSQL= YES -APXS= ${LOCALBASE}/sbin/apxs DOCS= mod_mylo.sql README do-build: Index: www/mod_mysqluserdir/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_mysqluserdir/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_mysqluserdir/Makefile 20 Feb 2003 19:15:29 -0000 1.3 +++ www/mod_mysqluserdir/Makefile 3 Nov 2003 20:53:53 -0000 @@ -14,11 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module to make Apache get userdirs from MySQL -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -APXS= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes do-build: (cd ${WRKSRC} && ${APXS} -c -I${LOCALBASE}/include \ Index: www/mod_pcgi2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_pcgi2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_pcgi2/Makefile 25 Feb 2003 06:25:35 -0000 1.2 +++ www/mod_pcgi2/Makefile 3 Nov 2003 20:53:53 -0000 @@ -17,18 +17,17 @@ RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope .if defined(WITH_APACHE13) -BUILD_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT} .else -BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 +BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE_PORT} +RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE_PORT} .endif USE_PYTHON= yes # You can change this in the environment if you like. SZOPEBASEDIR?= www/Zope -APXS?= ${LOCALBASE}/sbin/apxs # Don't change these ZOPEBASEDIR= ${LOCALBASE}/${SZOPEBASEDIR} @@ -43,6 +42,7 @@ .if defined(WITH_APACHE13) APACHEVER= apache .else +WITH_APACHE2= yes APACHEVER= apache2 BUILDOPT+= -DAPACHE2 -Wc,-shared .endif Index: www/mod_perl/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- www/mod_perl/Makefile 24 Oct 2003 12:04:29 -0000 1.24 +++ www/mod_perl/Makefile 3 Nov 2003 20:53:53 -0000 @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Embeds a Perl interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww RUN_DEPENDS= ${BUILD_DEPENDS} @@ -36,7 +36,6 @@ mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \ mod_perl_tuning.3 PERLSITEDIR= ${PREFIX}/lib/perl5/site_perl/${PERL_VER} -APACHE_PORT?= ${PORTSDIR}/www/apache13 .include <bsd.port.pre.mk> @@ -46,7 +45,7 @@ PREFIX=${PREFIX} INSTALLSITELIB=${PERLSITEDIR} \ INSTALLSITEARCH=${PERLSITEDIR}/${PERL_ARCH} \ INSTALLMAN3DIR=${MANPREFIX}/man/man3 \ - WITH_APXS=${LOCALBASE}/sbin/apxs \ + WITH_APXS=${APXS} \ PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"' post-install: Index: www/mod_perl2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl2/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- www/mod_perl2/Makefile 2 Nov 2003 23:29:08 -0000 1.28 +++ www/mod_perl2/Makefile 3 Nov 2003 20:53:53 -0000 @@ -17,10 +17,10 @@ MAINTAINER= larse@isi.edu COMMENT= Embeds a Perl interpreter in the Apache2 server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} - +USE_APACHE= yes +WITH_APACHE2= yes PERL_CONFIGURE= yes + CONFIGURE_ARGS= MP_APXS=${LOCALBASE}/sbin/apxs \ MP_INST_APACHE2=1 PREFIX=${PREFIX} @@ -28,8 +28,6 @@ Apache::TestTrace.3 Apache::TestMM.3 Bundle::ApacheTest.3 \ Apache::Test.3 Apache::TestUtil.3 Apache::Build.3 \ Bundle::Apache2.3 ModPerl::Code.3 - -APACHE2_PORT?= ${PORTSDIR}/www/apache2 .include <bsd.port.pre.mk> Index: www/mod_php3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_php3/Makefile,v retrieving revision 1.135 diff -u -r1.135 Makefile --- www/mod_php3/Makefile 6 Mar 2003 19:23:19 -0000 1.135 +++ www/mod_php3/Makefile 3 Nov 2003 20:53:54 -0000 @@ -28,8 +28,7 @@ COMMENT?= PHP3 module for Apache .if !defined(STANDALONE) -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +USE_APACHE= yes .endif PATCH_DIST_ARGS= -d ${WRKSRC}/functions @@ -37,8 +36,6 @@ PHP_DISTDIR= distributions SLAVEDIRS= lang/php3 -APACHE_PORT?= ${PORTSDIR}/www/apache13 -APXS?= ${LOCALBASE}/sbin/apxs USE_SUBMAKE= yes GNU_CONFIGURE= yes @@ -51,7 +48,7 @@ CONFIGURE_ARGS= --with-config-file-path=${PREFIX}/etc/php.standalone \ --enable-discard-path .else -CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs \ +CONFIGURE_ARGS= --with-apxs=${APXS} \ --with-config-file-path=${PREFIX}/etc .endif Index: www/mod_proxy_add_forward/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_proxy_add_forward/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_proxy_add_forward/Makefile 1 Apr 2003 22:45:49 -0000 1.6 +++ www/mod_proxy_add_forward/Makefile 3 Nov 2003 20:53:54 -0000 @@ -16,12 +16,8 @@ MAINTAINER= anders@FreeBSD.org COMMENT= Apache module that adds a client IP header to outgoing proxy requests -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 - +USE_APACHE= yes NO_WRKSUBDIR= YES - -APXS?= ${LOCALBASE}/sbin/apxs do-extract: @${MKDIR} ${WRKDIR} Index: www/mod_put/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_put/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_put/Makefile 20 Feb 2003 19:15:29 -0000 1.5 +++ www/mod_put/Makefile 3 Nov 2003 20:53:54 -0000 @@ -14,11 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module that provides PUT and DELETE methods -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} do-build: Index: www/mod_python/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_python/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- www/mod_python/Makefile 27 Sep 2003 01:01:07 -0000 1.21 +++ www/mod_python/Makefile 3 Nov 2003 20:53:54 -0000 @@ -16,16 +16,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for integrating Python -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes NO_PACKAGE= "Requires Python without threads support" USE_PYTHON= yes .include <bsd.port.pre.mk> - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${APXS} Index: www/mod_python3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_python3/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/mod_python3/Makefile 5 Aug 2003 03:14:38 -0000 1.23 +++ www/mod_python3/Makefile 3 Nov 2003 20:53:54 -0000 @@ -15,12 +15,8 @@ MAINTAINER= perky@FreeBSD.org COMMENT= Apache module that embeds the Python interpreter within the server -BUILD_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2 - +USE_APACHE= yes USE_PYTHON= yes - -APXS?= ${LOCALBASE}/sbin/apxs GNU_CONFIGURE= yes USE_REINPLACE= yes Index: www/mod_roaming/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_roaming/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_roaming/Makefile 20 Feb 2003 19:15:29 -0000 1.8 +++ www/mod_roaming/Makefile 3 Nov 2003 20:53:54 -0000 @@ -14,12 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Apache module that works as a Netscape Roaming Access server -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - +USE_APACHE= yes DOCS= CHANGES INSTALL LICENSE README do-build: Index: www/mod_roaming2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_roaming2/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_roaming2/Makefile 21 Feb 2003 14:01:21 -0000 1.2 +++ www/mod_roaming2/Makefile 3 Nov 2003 20:53:54 -0000 @@ -16,10 +16,8 @@ MAINTAINER= vivek@kciLink.com COMMENT= An Apache module that works as a Netscape Roaming Access server -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache2 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache2 - -APXS= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes +WITH_APACHE2= yes DOCS= CHANGES INSTALL LICENSE README Index: www/mod_ruby/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_ruby/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- www/mod_ruby/Makefile 10 Sep 2003 07:38:37 -0000 1.44 +++ www/mod_ruby/Makefile 3 Nov 2003 20:53:54 -0000 @@ -14,15 +14,11 @@ MAINTAINER= knu@FreeBSD.org COMMENT= An Apache module that embeds Ruby interpreter within -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} LIB_DEPENDS= eruby.10:${PORTSDIR}/textproc/eruby -RUN_DEPENDS= ${APXS}:${APACHE_PORT} +USE_APACHE= yes USE_RUBY= yes USE_REINPLACE= yes - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 CONFIGURE_ARGS= --with-apxs="${APXS}" \ --enable-eruby=yes \ Index: www/mod_scgi/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_scgi/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- www/mod_scgi/Makefile 7 Mar 2003 06:12:45 -0000 1.2 +++ www/mod_scgi/Makefile 3 Nov 2003 20:53:54 -0000 @@ -14,9 +14,7 @@ MAINTAINER= nbm@FreeBSD.org COMMENT= Apache module that implements the client side of the SCGI protocol -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${PREFIX}/sbin/apxs +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} do-build: cd ${WRKSRC} && ${APXS} -c -o mod_scgi.so mod_scgi.c Index: www/mod_security/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_security/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/mod_security/Makefile 29 Oct 2003 14:12:59 -0000 1.8 +++ www/mod_security/Makefile 3 Nov 2003 20:53:55 -0000 @@ -13,6 +13,7 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= An intrusion detection and prevention engine +USE_APACHE= yes .include <bsd.port.pre.mk> @@ -20,21 +21,15 @@ WITH_APACHE2= yes .endif -APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 APWRKSRC?= ${WRKSRC}/apache2 PLIST_SUB= APACHE=apache2 SO= la .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 APWRKSRC?= ${WRKSRC}/apache1 PLIST_SUB= APACHE=apache SO= so .endif - -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${APACHE_PORT} DOCS= CHANGES INSTALL LICENSE README modsecurity-manual-1.7.pdf PLIST_SUB+= VER=1.7 Index: www/mod_sed/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sed/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_sed/Makefile 27 Oct 2003 01:40:56 -0000 1.6 +++ www/mod_sed/Makefile 3 Nov 2003 20:53:55 -0000 @@ -14,12 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An apache module that embeds a copy of the sed(1) command -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 - +USE_APACHE= yes MAKE_ARGS= APXS=${APXS} .include <bsd.port.mk> Index: www/mod_sequester/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sequester/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_sequester/Makefile 4 Oct 2003 07:17:16 -0000 1.6 +++ www/mod_sequester/Makefile 3 Nov 2003 20:53:55 -0000 @@ -14,12 +14,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module that controls access to the website using secure info -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - +USE_APACHE= yes WRKSRC= ${WRKDIR}/mod_sequester -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_snake/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_snake/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_snake/Makefile 4 Oct 2003 07:14:44 -0000 1.6 +++ www/mod_snake/Makefile 3 Nov 2003 20:53:55 -0000 @@ -14,13 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library to easily create flexible Apache modules -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} \ +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${PYTHON_CMD}:${PYTHON_PORTSDIR} RUN_DEPENDS= ${BUILD_DEPENDS} USE_BZIP2= yes -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs="${APXS}" Index: www/mod_sqlinclude/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_sqlinclude/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_sqlinclude/Makefile 7 Mar 2003 06:12:45 -0000 1.4 +++ www/mod_sqlinclude/Makefile 3 Nov 2003 20:53:55 -0000 @@ -15,11 +15,9 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module implementing config inclusion from MySQL databases -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -APXS?= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes DOCS= CHANGES.txt README.txt TODO.txt do-build: Index: www/mod_throttle/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_throttle/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/mod_throttle/Makefile 7 Mar 2003 06:12:45 -0000 1.5 +++ www/mod_throttle/Makefile 3 Nov 2003 20:53:55 -0000 @@ -16,12 +16,8 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module that provides bandwidth & request throttling -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - +USE_APACHE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -APXS?= ${LOCALBASE}/sbin/apxs DOCS= CHANGES.txt LICENSE.txt index.shtml Index: www/mod_ticket/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_ticket/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/mod_ticket/Makefile 27 Oct 2003 01:46:09 -0000 1.6 +++ www/mod_ticket/Makefile 3 Nov 2003 20:53:55 -0000 @@ -16,11 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache module for a digitally signed ticket in URL -BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} - -APXS?= ${LOCALBASE}/sbin/apxs -APACHE_PORT?= ${PORTSDIR}/www/apache13 +USE_APACHE= yes do-extract: ${MKDIR} ${WRKSRC} Index: www/mod_trigger/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_trigger/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_trigger/Makefile 21 Feb 2003 14:01:21 -0000 1.4 +++ www/mod_trigger/Makefile 3 Nov 2003 20:53:55 -0000 @@ -14,10 +14,7 @@ MAINTAINER= svenasse@polaris.ca COMMENT= Apache module to launch triggers if certain actions occur -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${BUILD_DEPENDS} - -APXS?= ${LOCALBASE}/sbin/apxs +USE_APACHE= yes do-build: @cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c Index: www/mod_tsunami/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_tsunami/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/mod_tsunami/Makefile 30 Sep 2003 07:14:43 -0000 1.4 +++ www/mod_tsunami/Makefile 3 Nov 2003 20:53:55 -0000 @@ -14,11 +14,7 @@ MAINTAINER= sysadmin@alexdupre.com COMMENT= Apache module which dynamically limits a site's slot usage -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - -APXS?= ${LOCALBASE}/sbin/apxs - +USE_APACHE= yes DOCS= AUTHORS Changelog INSTALL LICENSE README do-build: Index: www/mod_watch/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_watch/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- www/mod_watch/Makefile 16 Oct 2003 05:38:54 -0000 1.9 +++ www/mod_watch/Makefile 3 Nov 2003 20:53:55 -0000 @@ -17,14 +17,11 @@ MAINTAINER= anders@FreeBSD.org COMMENT= An Apache module to monitor bandwidth usage, for use with MRTG etc -BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 -RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 - +USE_APACHE= yes USE_PERL5= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -APXS?= ${LOCALBASE}/sbin/apxs MAKE_ARGS+= APXS="${APXS}" ALL_TARGET= build-dynamic Index: www/mod_webapp/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_webapp/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- www/mod_webapp/Makefile 26 Jun 2003 22:58:32 -0000 1.3 +++ www/mod_webapp/Makefile 3 Nov 2003 20:53:55 -0000 @@ -16,11 +16,10 @@ MAINTAINER= asachs@uunet.co.za COMMENT= Apache module mounts Tomcat web applications -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ - ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \ +BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \ ${AUTOCONF}:${PORTSDIR}/devel/autoconf -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +USE_APACHE= yes USE_LIBTOOL= yes LIBTOOLFILES= # none USE_GMAKE= yes @@ -33,7 +32,6 @@ .include <bsd.port.pre.mk> # Apache locations. -APXS?= ${LOCALBASE}/sbin/apxs APACHECTL?= ${LOCALBASE}/sbin/apachectl APR_LIB?= ${LOCALBASE}/lib/ APR_INCLUDE?= ${LOCALBASE}/include/apr-0/ Index: www/mod_zap/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_zap/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- www/mod_zap/Makefile 19 Oct 2003 09:20:12 -0000 1.15 +++ www/mod_zap/Makefile 3 Nov 2003 20:53:55 -0000 @@ -14,15 +14,14 @@ MAINTAINER= demon@FreeBSD.org COMMENT= An Apache module that provides Z39.50 access through WWW -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ - ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84 +BUILD_DEPENDS= ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84 LIB_DEPENDS= yaz.2:${PORTSDIR}/net/yaz -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \ - ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84 +RUN_DEPENDS= ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84 +USE_APACHE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-yazconfig=${LOCALBASE}/bin \ - --with-apxs=${LOCALBASE}/sbin/apxs \ + --with-apxs=${APXS} \ --with-tclconfig=${LOCALBASE}/lib/tcl8.4 post-install: Index: www/neowebscript/Makefile =================================================================== RCS file: /home/pcvs/ports/www/neowebscript/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- www/neowebscript/Makefile 3 Jun 2003 16:48:42 -0000 1.6 +++ www/neowebscript/Makefile 3 Nov 2003 20:53:57 -0000 @@ -15,7 +15,7 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} LIB_DEPENDS= neo82:${PORTSDIR}/devel/tcl-neo MAKEFILE= ${FILESDIR}/Makefile.bsd Index: www/p5-Apache-AuthCookie/Makefile =================================================================== RCS file: /home/pcvs/ports/www/p5-Apache-AuthCookie/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- www/p5-Apache-AuthCookie/Makefile 24 Oct 2003 12:04:31 -0000 1.11 +++ www/p5-Apache-AuthCookie/Makefile 3 Nov 2003 20:53:57 -0000 @@ -16,10 +16,9 @@ COMMENT= A perl module to provide custom forms for reauthentication BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ - ${LOCALBASE}/sbin/apxs:${APACHE_PORT} + ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} -APACHE_PORT?= ${PORTSDIR}/www/apache13 CURUSER?= `whoami` CURGRP?= `groups | ${AWK} '{print $$1}'` TESTPORT?= 8228 Index: www/rt3/Makefile =================================================================== RCS file: /home/pcvs/ports/www/rt3/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- www/rt3/Makefile 24 Oct 2003 16:12:42 -0000 1.30 +++ www/rt3/Makefile 3 Nov 2003 20:53:57 -0000 @@ -17,7 +17,7 @@ MAINTAINER= autrijus@autrijus.org COMMENT?= RT is an industrial-grade ticketing system written in Perl -BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} \ +BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \ ${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \ @@ -70,10 +70,8 @@ .if defined(WITH_FASTCGI) .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi .endif BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI @@ -81,17 +79,13 @@ .else BUILD_DEPENDS+= ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI .if defined(WITH_APACHE2) -APACHE_PORT?= ${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 DEPENDS_ARGS+= WITHOUT_MODPERL=yes DEPENDS_ARGS+= WITH_MODPERL2=yes .else -APACHE_PORT?= ${PORTSDIR}/www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl .endif .endif - -APXS?= ${LOCALBASE}/sbin/apxs DB_TYPE?= mysql Index: www/smb2www/Makefile =================================================================== RCS file: /home/pcvs/ports/www/smb2www/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- www/smb2www/Makefile 24 Oct 2003 12:05:01 -0000 1.4 +++ www/smb2www/Makefile 3 Nov 2003 20:53:57 -0000 @@ -20,7 +20,7 @@ MAINTAINER= roman@xpert.com COMMENT= Windows Network client that is accessible through a web browser -RUN_DEPENDS= httpd:${PORTSDIR}/www/apache13 \ +RUN_DEPENDS= httpd:${PORTSDIR}/${APACHE_PORT} \ smbclient:${PORTSDIR}/net/samba \ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 Index: www/suphp/Makefile =================================================================== RCS file: /home/pcvs/ports/www/suphp/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- www/suphp/Makefile 7 Oct 2003 00:49:16 -0000 1.5 +++ www/suphp/Makefile 3 Nov 2003 20:53:57 -0000 @@ -13,14 +13,13 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= A combination which provides a wrapper for PHP -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 +BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${LOCALBASE}/bin/php:${PORTSDIR}/www/php4-cgi HAS_CONFIGURE= yes USE_GMAKE= yes CONFLICTS= mod_php4-4* -APXS?= ${LOCALBASE}/sbin/apxs LOG_PATH?= /var/log PHP_PATH?= ${LOCALBASE}/bin/php APACHE_USER?= www Index: www/webglimpse/Makefile =================================================================== RCS file: /home/pcvs/ports/www/webglimpse/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- www/webglimpse/Makefile 20 Feb 2003 19:15:37 -0000 1.18 +++ www/webglimpse/Makefile 3 Nov 2003 20:53:57 -0000 @@ -15,7 +15,7 @@ MAINTAINER= ports@freebsd.org COMMENT= WWW interface to Glimpse search engine -RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= glimpse:${PORTSDIR}/textproc/glimpse WRKSRC= ${WRKDIR}/webglimpse-1.6.edu Index: www/wwwstat/Makefile =================================================================== RCS file: /home/pcvs/ports/www/wwwstat/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- www/wwwstat/Makefile 17 Jul 2003 20:39:07 -0000 1.23 +++ www/wwwstat/Makefile 3 Nov 2003 20:53:57 -0000 @@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Webserver logfile analysis package -RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13 +RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT} USE_PERL5= yes MAKE_ENV+= PERL5=${PERL5}
Joe Marcus Clarke worote: > I have your previous version of this patch running on bento now. I had > to modify it to apply to some of the ports. However, I plan on > committing the whole lot after the build finishes. Thanks, I am standby to solve any conflicts. kind regards Dirk - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org]
State Changed From-To: analyzed->closed Committed, thanks!
State Changed From-To: analyzed->closed Fixed with the comment made in the follow-up. Thanks for reporting.
State Changed From-To: analyzed->closed Committed with the additional check of INSTALL_AS_USER. Thanks!
State Changed From-To: analyzed->closed Final version committed, thanks!
With reference to the recent APACHE_PORT commit, please beware that some ports (I have recently installed textproc/htdig) put files in other directories whose name depend on the apache port installed. Eg: (excerpt from textproc/htdig/Makefile) ----------------- CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \ --with-image-dir=${PREFIX}/share/apache/icons/htdig \ --with-search-dir=${PREFIX}/share/apache/htdocs \ ----------------- On a server with apache2 installed, this Makefile causes the port to fail installation. Bye, Angelo Turetta