Date: Mon, 22 Sep 2014 18:50:19 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368986 - in head/www: apache22 apache24 Message-ID: <201409221850.s8MIoJKN051240@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Mon Sep 22 18:50:18 2014 New Revision: 368986 URL: http://svnweb.freebsd.org/changeset/ports/368986 QAT: https://qat.redports.org/buildarchive/r368986/ Log: apache24 - remove check if apr is build with threads - bump PORTREVISION - adopt new pkg-plist @dir @with hat apache@ Modified: head/www/apache22/Makefile head/www/apache22/Makefile.modules head/www/apache22/pkg-plist head/www/apache24/Makefile head/www/apache24/Makefile.modules head/www/apache24/pkg-plist Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Mon Sep 22 18:48:55 2014 (r368985) +++ head/www/apache22/Makefile Mon Sep 22 18:50:18 2014 (r368986) @@ -2,7 +2,7 @@ PORTNAME= apache22 PORTVERSION= 2.2.29 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -176,10 +176,9 @@ post-install: # place for module configuration samples @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/modules.d ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${EXAMPLESDIR}/modules.d - -# suppress warning for non binary files - -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* \ - ${STAGEDIR}${PREFIX}/libexec/apache22/*.so 2>/dev/null +# strip returns an error for non binary files, but we have a big mix + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* 2>/dev/null + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache22/mod_*.so .if ${PORT_OPTIONS:MLOG_FORENSIC} @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin .endif Modified: head/www/apache22/Makefile.modules ============================================================================== --- head/www/apache22/Makefile.modules Mon Sep 22 18:48:55 2014 (r368985) +++ head/www/apache22/Makefile.modules Mon Sep 22 18:50:18 2014 (r368986) @@ -18,19 +18,6 @@ .if defined(_PREMKINCLUDED) -# check if APR was build with thread support -.if exists(${APR_CONFIG}) -APR_LIBS!= ${SH} ${APR_CONFIG} --libs | ${SED} -e 's/-//g' -. if defined(APR_LIBS) && !empty(APR_LIBS) -_T=pthread -. for lib in ${APR_LIBS} -. if ${_T:M${lib}} -APR_HAS_THREADS= yes -. endif -. endfor -. endif -.endif # exists APR_CONFIG - # check if APR-util module exists .if exists(${APU_CONFIG}) . if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MAUTHNZ_LDAP} @@ -70,13 +57,10 @@ PKGNAMESUFFIX= -${WITH_MPM}-mpm .if ${WITH_MPM} == "worker" || ${WITH_MPM} == "event" PORT_OPTIONS+= CGID -.if ${PORT_OPTIONS:MCGI} +. if ${PORT_OPTIONS:MCGI} IGNORE= When using a multi-threaded MPM, the module CGID should be used in place CGI. \ Please de-select CGI and select CGID instead. \ See http://httpd.apache.org/docs/2.2/mod/mod_cgi.html -.endif -.if exists(${APR_CONFIG}) && !defined(APR_HAS_THREADS) -IGNORE= requires APR threads. Please rebuild APR with THREAD support . endif .endif # ============================================= @@ -111,15 +95,6 @@ IGNORE= AUTH_BASIC need at least one AUT . endif .endif -.if defined(APR_HAS_THREADS) -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -.else -. if exists(${APR_CONFIG}) && ${PORT_OPTIONS:MMEM_CACHE} -IGNORE= MEM_CACHE requires APR threads. Please rebuild APR with THREAD support -. endif -.endif - CONFIGURE_ARGS+= --with-mpm=${WITH_MPM} .endif # _PREMKINCLUDED Modified: head/www/apache22/pkg-plist ============================================================================== --- head/www/apache22/pkg-plist Mon Sep 22 18:48:55 2014 (r368985) +++ head/www/apache22/pkg-plist Mon Sep 22 18:50:18 2014 (r368986) @@ -1,7 +1,3 @@ -@comment keep the next three lines on top (only required for old pkg_... tools) -@exec mkdir -p %D/%%ETCDIR%%/envvars.d -@exec mkdir -p %D/%%ETCDIR%%/extra -@exec mkdir -p %D/%%ETCDIR%%/Includes %%ETCDIR%%/Includes/no-accf.conf %%ETCDIR%%/modules.d/README_modules.d include/apache22/ap_compat.h @@ -463,22 +459,7 @@ sbin/split-logfile %%WWWDIR%%/icons/world2.gif %%WWWDIR%%/icons/world2.png @unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true -@dirrmtry %%ETCDIR%%/Includes -@dirrmtry %%ETCDIR%%/envvars.d -@dirrmtry %%ETCDIR%%/extra -@dirrmtry %%ETCDIR%%/modules.d -@dirrmtry %%ETCDIR%% -@dirrmtry include/apache22 -@dirrmtry libexec/apache22 -@dirrm %%DATADIR%%/build -@dirrm %%DATADIR%% -@dirrm %%EXAMPLESDIR%%/extra -@dirrm %%EXAMPLESDIR%%/modules.d -@dirrm %%EXAMPLESDIR%% -@dirrmtry %%WWWDIR%%/cgi-bin -@dirrmtry %%WWWDIR%%/data -@dirrm %%WWWDIR%%/error/include -@dirrm %%WWWDIR%%/error -@dirrm %%WWWDIR%%/icons/small -@dirrm %%WWWDIR%%/icons -@dirrmtry %%WWWDIR%% +@dir %%ETCDIR%%/Includes +@dir %%ETCDIR%%/envvars.d +@dir %%ETCDIR%%/extra +@dir %%WWWDIR%%/data Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Mon Sep 22 18:48:55 2014 (r368985) +++ head/www/apache24/Makefile Mon Sep 22 18:50:18 2014 (r368986) @@ -2,7 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -12,7 +12,7 @@ MAINTAINER= apache@FreeBSD.org COMMENT= Version 2.4.x of Apache web server LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ - libapr-1.so.0.5.1:${PORTSDIR}/devel/apr1 \ + libapr-1.so:${PORTSDIR}/devel/apr1 \ libpcre.so:${PORTSDIR}/devel/pcre CONFLICTS_INSTALL= caudium14-1.* \ @@ -154,14 +154,13 @@ post-install: # place for module configuration samples @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/modules.d ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${EXAMPLESDIR}/modules.d - -# suppress warning for non binary files - -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* \ - ${STAGEDIR}${PREFIX}/bin/* \ - ${STAGEDIR}${PREFIX}/libexec/apache24/*.so 2>/dev/null +# strip returns an error for non binary files, but we have a big mix + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* 2>/dev/null + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache24/mod_*.so .if ${PORT_OPTIONS:MLOG_FORENSIC} - @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin .endif # maintainer only, check for new modules Modified: head/www/apache24/Makefile.modules ============================================================================== --- head/www/apache24/Makefile.modules Mon Sep 22 18:48:55 2014 (r368985) +++ head/www/apache24/Makefile.modules Mon Sep 22 18:50:18 2014 (r368986) @@ -18,19 +18,6 @@ .if defined(_PREMKINCLUDED) -# check if APR was build with thread support -.if exists(${APR_CONFIG}) -APR_LIBS!= ${SH} ${APR_CONFIG} --libs | ${SED} -e 's/-//g' -. if defined(APR_LIBS) && !empty(APR_LIBS) -_T=pthread -. for lib in ${APR_LIBS} -. if ${_T:M${lib}} -APR_HAS_THREADS= yes -. endif -. endfor -. endif -.endif # exists APR_CONFIG - # check if APR-util module exists .if exists(${APU_CONFIG}) . if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MAUTHNZ_LDAP} @@ -47,15 +34,6 @@ IGNORE= SESSION_CRYPTO requires APR-util . endif . endif -# XXX apache24 needs only the apu-header -# perhaps we get in future the possibility to package dedicated APU modules -# -#. if ${PORT_OPTIONS:MDBD} || ${PORT_OPTIONS:MAUTHN_DBD} -#. if !exists(${APU_DBD_MYSQL}) && !exists(${APU_DBD_PGSQL}) && !exists(${APU_DBD_SQLITE3}) -#IGNORE= AUTHN_DBD and DBD requires APR-util to have DBD support build in.\ -# Please rebuild APR at last with one DBD backend -#. endif -#. endif .endif # exists APU_CONFIG # ============================================= @@ -80,12 +58,6 @@ CONFIGURE_ARGS+= --with-mpm=event .else IGNORE= Unknown MPM: .endif - -.if ${PORT_OPTIONS:MMPM_WORKER} || ${PORT_OPTIONS:MMPM_EVENT} -. if exists(${APR_CONFIG}) && !defined(APR_HAS_THREADS) -IGNORE= requires APR threads. Please rebuild APR with THREAD support -. endif -.endif # ============================================= # build develop/example modules only with additional confirmation @@ -152,13 +124,4 @@ CONFIGURE_ARGS+= --with-libxml2=${LOCALB CONFIGURE_ARGS+= --without-libxml2 .endif -.if defined(APR_HAS_THREADS) -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -.else -. if exists(${APR_CONFIG}) && ${PORT_OPTIONS:MMEM_CACHE} -IGNORE= MEM_CACHE requires APR threads. Please rebuild APR with THREAD support -. endif -.endif - .endif # _PREMKINCLUDED Modified: head/www/apache24/pkg-plist ============================================================================== --- head/www/apache24/pkg-plist Mon Sep 22 18:48:55 2014 (r368985) +++ head/www/apache24/pkg-plist Mon Sep 22 18:50:18 2014 (r368986) @@ -1,7 +1,3 @@ -@comment keep the next three lines on top (only required for old pkg_... tools) -@exec mkdir -p %D/%%ETCDIR%%/envvars.d -@exec mkdir -p %D/%%ETCDIR%%/extra -@exec mkdir -p %D/%%ETCDIR%%/Includes bin/ab bin/htdbm bin/htdigest @@ -548,22 +544,7 @@ sbin/split-logfile %%WWWDIR%%/icons/world2.png %%WWWDIR%%/icons/xml.png @unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true -@dirrmtry %%ETCDIR%%/Includes -@dirrmtry %%ETCDIR%%/envvars.d -@dirrmtry %%ETCDIR%%/extra -@dirrmtry %%ETCDIR%%/modules.d -@dirrmtry %%ETCDIR%% -@dirrmtry include/apache24 -@dirrmtry libexec/apache24 -@dirrm %%DATADIR%%/build -@dirrm %%DATADIR%% -@dirrm %%EXAMPLESDIR%%/extra -@dirrm %%EXAMPLESDIR%%/modules.d -@dirrm %%EXAMPLESDIR%% -@dirrmtry %%WWWDIR%%/cgi-bin -@dirrmtry %%WWWDIR%%/data -@dirrm %%WWWDIR%%/error/include -@dirrm %%WWWDIR%%/error -@dirrm %%WWWDIR%%/icons/small -@dirrm %%WWWDIR%%/icons -@dirrmtry %%WWWDIR%% +@dir %%ETCDIR%%/Includes +@dir %%ETCDIR%%/envvars.d +@dir %%ETCDIR%%/extra +@dir %%WWWDIR%%/data
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409221850.s8MIoJKN051240>