diff options
| author | ijliao <ijliao@FreeBSD.org> | 2002-04-11 13:16:07 +0800 |
|---|---|---|
| committer | ijliao <ijliao@FreeBSD.org> | 2002-04-11 13:16:07 +0800 |
| commit | 4ee2b7f338ba08e2738d4902c2cf1a8293830f4b (patch) | |
| tree | 3309fdcd6494f2979584ed22050e73dfb52f7b4d | |
| parent | b653918d7e133359bd074e10dcd0aca8c0d58546 (diff) | |
| download | freebsd-ports-graphics-4ee2b7f338ba08e2738d4902c2cf1a8293830f4b.tar.gz freebsd-ports-graphics-4ee2b7f338ba08e2738d4902c2cf1a8293830f4b.tar.zst freebsd-ports-graphics-4ee2b7f338ba08e2738d4902c2cf1a8293830f4b.zip | |
- Disable THREADS by default (many ports people reported problems around
threads)
- Bump port revision
- Added two more "POSIX expr" patch target for 5-CURRENT
PR: 36981
Submitted by: maintainer
| -rw-r--r-- | www/apache2/Makefile | 12 | ||||
| -rw-r--r-- | www/apache20/Makefile | 12 | ||||
| -rw-r--r-- | www/apache21/Makefile | 12 | ||||
| -rw-r--r-- | www/apache22/Makefile | 12 |
4 files changed, 32 insertions, 16 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 42fb552410d..3d83bc636c3 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.35 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ @@ -46,7 +47,7 @@ RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' MAKE_ENV+= NOPORTDOCS=YES .endif -.if !defined(WITHOUT_THREADS) +.if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .endif @@ -73,7 +74,7 @@ PLIST_SUB+= SUEXEC="" PLIST_SUB+= SUEXEC="@comment " .endif -.if !defined(WITHOUT_CACHE) && !defined(WITHOUT_THREADS) +.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS) SHARED_MODULES+= cache file-cache disk-cache mem_cache PLIST_SUB+= MODCACHE="" .else @@ -89,7 +90,7 @@ PLIST_SUB+= MODPROXY="@comment " .if ${WITH_MPM} != "prefork" PKGNAMESUFFIX= -${WITH_MPM} -.if defined(WITHOUT_THREADS) +.if !defined(WITH_THREADS) IGNORE= "requires threads for ${WITH_MPM} mpm" .endif .endif @@ -112,8 +113,11 @@ post-patch: @${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \; @${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh .if ${OSVERSION} >= 500032 +.for ltfile in srclib/pcre/ltmain.sh srclib/apr/build/ltmain.sh \ + srclib/apr-util/xml/expat/conftools/ltmain.sh @${PERL} -pi.orig -e 's|expr|expr --|' \ - ${WRKSRC}/srclib/apr/build/ltmain.sh + ${WRKSRC}/${ltfile} +.endfor .endif pre-install: diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 42fb552410d..3d83bc636c3 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.35 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ @@ -46,7 +47,7 @@ RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' MAKE_ENV+= NOPORTDOCS=YES .endif -.if !defined(WITHOUT_THREADS) +.if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .endif @@ -73,7 +74,7 @@ PLIST_SUB+= SUEXEC="" PLIST_SUB+= SUEXEC="@comment " .endif -.if !defined(WITHOUT_CACHE) && !defined(WITHOUT_THREADS) +.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS) SHARED_MODULES+= cache file-cache disk-cache mem_cache PLIST_SUB+= MODCACHE="" .else @@ -89,7 +90,7 @@ PLIST_SUB+= MODPROXY="@comment " .if ${WITH_MPM} != "prefork" PKGNAMESUFFIX= -${WITH_MPM} -.if defined(WITHOUT_THREADS) +.if !defined(WITH_THREADS) IGNORE= "requires threads for ${WITH_MPM} mpm" .endif .endif @@ -112,8 +113,11 @@ post-patch: @${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \; @${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh .if ${OSVERSION} >= 500032 +.for ltfile in srclib/pcre/ltmain.sh srclib/apr/build/ltmain.sh \ + srclib/apr-util/xml/expat/conftools/ltmain.sh @${PERL} -pi.orig -e 's|expr|expr --|' \ - ${WRKSRC}/srclib/apr/build/ltmain.sh + ${WRKSRC}/${ltfile} +.endfor .endif pre-install: diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 42fb552410d..3d83bc636c3 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.35 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ @@ -46,7 +47,7 @@ RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' MAKE_ENV+= NOPORTDOCS=YES .endif -.if !defined(WITHOUT_THREADS) +.if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .endif @@ -73,7 +74,7 @@ PLIST_SUB+= SUEXEC="" PLIST_SUB+= SUEXEC="@comment " .endif -.if !defined(WITHOUT_CACHE) && !defined(WITHOUT_THREADS) +.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS) SHARED_MODULES+= cache file-cache disk-cache mem_cache PLIST_SUB+= MODCACHE="" .else @@ -89,7 +90,7 @@ PLIST_SUB+= MODPROXY="@comment " .if ${WITH_MPM} != "prefork" PKGNAMESUFFIX= -${WITH_MPM} -.if defined(WITHOUT_THREADS) +.if !defined(WITH_THREADS) IGNORE= "requires threads for ${WITH_MPM} mpm" .endif .endif @@ -112,8 +113,11 @@ post-patch: @${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \; @${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh .if ${OSVERSION} >= 500032 +.for ltfile in srclib/pcre/ltmain.sh srclib/apr/build/ltmain.sh \ + srclib/apr-util/xml/expat/conftools/ltmain.sh @${PERL} -pi.orig -e 's|expr|expr --|' \ - ${WRKSRC}/srclib/apr/build/ltmain.sh + ${WRKSRC}/${ltfile} +.endfor .endif pre-install: diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 42fb552410d..3d83bc636c3 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.35 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ @@ -46,7 +47,7 @@ RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' MAKE_ENV+= NOPORTDOCS=YES .endif -.if !defined(WITHOUT_THREADS) +.if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .endif @@ -73,7 +74,7 @@ PLIST_SUB+= SUEXEC="" PLIST_SUB+= SUEXEC="@comment " .endif -.if !defined(WITHOUT_CACHE) && !defined(WITHOUT_THREADS) +.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS) SHARED_MODULES+= cache file-cache disk-cache mem_cache PLIST_SUB+= MODCACHE="" .else @@ -89,7 +90,7 @@ PLIST_SUB+= MODPROXY="@comment " .if ${WITH_MPM} != "prefork" PKGNAMESUFFIX= -${WITH_MPM} -.if defined(WITHOUT_THREADS) +.if !defined(WITH_THREADS) IGNORE= "requires threads for ${WITH_MPM} mpm" .endif .endif @@ -112,8 +113,11 @@ post-patch: @${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \; @${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh .if ${OSVERSION} >= 500032 +.for ltfile in srclib/pcre/ltmain.sh srclib/apr/build/ltmain.sh \ + srclib/apr-util/xml/expat/conftools/ltmain.sh @${PERL} -pi.orig -e 's|expr|expr --|' \ - ${WRKSRC}/srclib/apr/build/ltmain.sh + ${WRKSRC}/${ltfile} +.endfor .endif pre-install: |