From 501b138e1c1c6a2a07afc0186bc58bdff6156e9c Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Sun, 8 Aug 2010 17:43:04 +0000 Subject: - Update to 1.1.0 PR: ports/148797 Submitted by: Xavier Beaudouin (maintainer) --- www/mod_vhs/Makefile | 51 ++++++++++++++++++++++------ www/mod_vhs/distinfo | 6 ++-- www/mod_vhs/files/patch-mod_vhs.c | 71 --------------------------------------- www/mod_vhs/pkg-descr | 2 +- 4 files changed, 44 insertions(+), 86 deletions(-) delete mode 100644 www/mod_vhs/files/patch-mod_vhs.c (limited to 'www/mod_vhs') diff --git a/www/mod_vhs/Makefile b/www/mod_vhs/Makefile index bca3e33fa068..c5843e10867d 100644 --- a/www/mod_vhs/Makefile +++ b/www/mod_vhs/Makefile @@ -6,38 +6,67 @@ # PORTNAME= mod_vhs -PORTVERSION= 1.0.32 -PORTREVISION= 2 +PORTVERSION= 1.1.0 CATEGORIES= www MASTER_SITES= ftp://ftp.oav.net/openvisp/${PORTNAME}/ DIST_SUBDIR= apache2 MAINTAINER= kiwi@oav.net -COMMENT= Allows mass virtual hosting using libhome system with Apache 2.0.x +COMMENT= Mass virtual hosting using mod_ldap or mod_dbd with Apache 2.2.x -LIB_DEPENDS+= home:${PORTSDIR}/misc/libhome +MANUAL_PACKAGE_BUILD= needs apr with LDAP and DBD options enabled -MANUAL_PACKAGE_BUILD= lang/php5 is built with www/apache13 by default which conflicts - -USE_APACHE= 2.0+ +USE_APACHE= 2.2+ USE_PHP= yes USE_PHP_BUILD= yes WANT_PHP_MOD= yes AP_FAST_BUILD= yes AP_GENPLIST= yes +SRC_FILE= *.c -WRKSRC= ${WRKDIR}/${PORTNAME} +MAKE_JOBS_SAFE= yes AP_INC+= ${LOCALBASE}/include/home \ -I ${LOCALBASE}/include/php \ -I ${LOCALBASE}/include/php/Zend \ -I ${LOCALBASE}/include/php/TSRM \ -I ${LOCALBASE}/include/php/main -AP_LIB+= ${LOCALBASE}/lib -lhome AP_EXTRAS+= -DHAVE_MOD_PHP_SUPPORT -PORTDOCS= ChangeLog AUTHORS README.logs README.wildcards WARNING \ - README.phpopt +PORTDOCS= ChangeLog AUTHORS README README.logs README.mod_suphp WARNING \ + README.phpopt THANKS WARNING WARNING.THREADS README.LDAP + +OPTIONS= LDAP "Enable mod_ldap support" on \ + DBD "Enable mod_dbd support" off \ + ITK "Enable mpm-itk support (needs a specific apache)" off \ + VDEBUG "Enable debug version (very verbose !)" off + +.include + +### mod_vhs options +.if defined(WITH_LDAP) +.if defined(WITHOUT_DBD) +AP_EXTRAS+= -DHAVE_LDAP_SUPPORT +.else +.error You cannot use LDAP and DBD at the same time. +.endif +.endif + +.if defined(WITH_DBD) +.if defined(WITHOUT_LDAP) +AP_EXTRAS+= -DHAVE_MOD_DBD_SUPPORT +.else +.error You cannot use LDAP and DBD at the same time. +.endif +.endif + +.if defined(WITH_ITK) +AP_EXTRAS+= -DHAVE_MPM_ITK_SUPPORT +.endif + +.if defined(WITH_VDEBUG) +AP_EXTRAS+= -DVH_DEBUG +.endif post-install: .if !defined (NOPORTDOCS) diff --git a/www/mod_vhs/distinfo b/www/mod_vhs/distinfo index 6f1741ce649d..461c97a027b8 100644 --- a/www/mod_vhs/distinfo +++ b/www/mod_vhs/distinfo @@ -1,3 +1,3 @@ -MD5 (apache2/mod_vhs-1.0.32.tar.gz) = bccb58b68639c2ece2d6f0adc1628ec1 -SHA256 (apache2/mod_vhs-1.0.32.tar.gz) = f2c8b72393a06532239965b7a9fdd63dd881ab8fd6f9084ffc1e839b039741a5 -SIZE (apache2/mod_vhs-1.0.32.tar.gz) = 20129 +MD5 (apache2/mod_vhs-1.1.0.tar.gz) = fff68db6e0da6c9986168522a523136c +SHA256 (apache2/mod_vhs-1.1.0.tar.gz) = a5dd6c3943b3c57cad0eb936f47c0df6c128be5dd3708d1efd8242be14469a17 +SIZE (apache2/mod_vhs-1.1.0.tar.gz) = 28967 diff --git a/www/mod_vhs/files/patch-mod_vhs.c b/www/mod_vhs/files/patch-mod_vhs.c deleted file mode 100644 index 3cb800f50b2c..000000000000 --- a/www/mod_vhs/files/patch-mod_vhs.c +++ /dev/null @@ -1,71 +0,0 @@ ---- ./mod_vhs.c.orig 2010-06-03 00:47:05.980134731 -0400 -+++ ./mod_vhs.c 2010-06-03 00:48:23.301960660 -0400 -@@ -216,16 +216,7 @@ - const char *real; - const char *fake; - char *handler; -- --#if APR_MAJOR_VERSION > 0 -- ap_regex_t *regexp; --#else --#ifdef DEBIAN - ap_regex_t *regexp; --#else -- regex_t *regexp; --#endif /* DEBIAN */ --#endif - int redir_status; /* 301, 302, 303, 410, etc... */ - } alias_entry; - -@@ -334,11 +325,7 @@ - /* XX r can NOT be relative to DocumentRoot here... compat bug. */ - - if (use_regex) { --#ifdef DEBIAN - new->regexp = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED); --#else -- new->regexp = ap_pregcomp(cmd->pool, f, REG_EXTENDED); --#endif /* DEBIAN */ - if (new->regexp == NULL) - return "Regular expression could not be compiled."; - new->real = r; -@@ -403,15 +390,7 @@ - vhs_config_rec *serverconf = ap_get_module_config(s->module_config, - &vhs_module); - int status = (int)(long)cmd->info; --#if APR_MAJOR_VERSION > 0 - ap_regex_t *r = NULL; --#else --#ifdef DEBIAN -- ap_regex_t *r = NULL; --#else -- regex_t *r = NULL; --#endif /* DEBIAN */ --#endif - const char *f = arg2; - const char *url = arg3; - -@@ -431,11 +410,7 @@ - } - - if (use_regex) { --#ifdef DEBIAN - r = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED); --#else -- r = ap_pregcomp(cmd->pool, f, REG_EXTENDED); --#endif /* DEBIAN */ - if (r == NULL) - return "Regular expression could not be compiled."; - } -@@ -531,11 +506,7 @@ - int doesc, int *status) - { - alias_entry *entries = (alias_entry *) aliases->elts; --#ifdef DEBIAN - ap_regmatch_t regm [AP_MAX_REG_MATCH]; --#else -- regmatch_t regm [AP_MAX_REG_MATCH]; --#endif /* DEBIAN */ - char *found = NULL; - int i; - diff --git a/www/mod_vhs/pkg-descr b/www/mod_vhs/pkg-descr index 9f6396e07ef6..6bd4d3e06aa9 100644 --- a/www/mod_vhs/pkg-descr +++ b/www/mod_vhs/pkg-descr @@ -1,5 +1,5 @@ mod_vhs is an Apache Web Server module allowing mass virtual hosting without the need for file based configuration. The virtual host paths are translated -using libhome system to get the corrects path at request time. +using mod_ldap or mod_dbd to get the corrects path at request time. WWW: http://www.oav.net/projects/mod_vhs/ -- cgit v1.2.3