svn commit: r361294 - in head/www/apache22: . files
Olli Hauer
ohauer at FreeBSD.org
Tue Jul 8 21:31:50 UTC 2014
Author: ohauer
Date: Tue Jul 8 21:31:49 2014
New Revision: 361294
URL: http://svnweb.freebsd.org/changeset/ports/361294
QAT: https://qat.redports.org/buildarchive/r361294/
Log:
- strip files
- sort pkg-plist
- always install DOCS (remove Makefile hack)
- reflect modules.d in EXAMPLESDIR, next target
will be a new keyword for pkg-plist to handle
module installation.
- bump PORTREVISION
- add warning about default version change (2014-07-11)
(pkg-message, files/HEADS_UP)
Added:
head/www/apache22/files/HEADS_UP (contents, props changed)
Modified:
head/www/apache22/Makefile
head/www/apache22/files/patch-Makefile.in
head/www/apache22/pkg-message
head/www/apache22/pkg-plist
Modified: head/www/apache22/Makefile
==============================================================================
--- head/www/apache22/Makefile Tue Jul 8 21:18:25 2014 (r361293)
+++ head/www/apache22/Makefile Tue Jul 8 21:31:49 2014 (r361294)
@@ -2,7 +2,7 @@
PORTNAME= apache22
PORTVERSION= 2.2.27
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= httpd-${PORTVERSION}
@@ -50,8 +50,7 @@ WITH_SSL_PORT?= 443
AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap
# http://httpd.apache.org/docs/2.2/bind.html
-IPV4_MAPPED_CONFIGURE_OFF= --disable-v4-mapped
-IPV4_MAPPED_CONFIGURE_ON= --enable-v4-mapped
+IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped
LDAP_CONFIGURE_ON= --enable-ldap=shared
SSL_CFLAGS= -I${OPENSSLINC}
@@ -73,10 +72,6 @@ SUB_LIST+= RELOAD_CMD=graceful
SUB_LIST+= RELOAD_CMD=hrestart
.endif
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_ENV+= NOPORTDOCS=yes
-.endif
-
APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config
@@ -129,6 +124,12 @@ IGNORE= suEXEC UserDir patch requires m
show-options:
@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
+pre-everything::
+ @${CAT} ${FILESDIR}/HEADS_UP
+.if !defined(BATCH) || !defined(PORT_BUILDING)
+ @/bin/sleep 5
+.endif
+
post-extract:
# remove possible leftover .svn directories in the sources
@${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -rf
@@ -173,7 +174,13 @@ post-install:
@${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|}
${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/
${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}/${ETCDIR}/modules.d/
-
+# place for module configuration samples
+ @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/modules.d
+ ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}/${EXAMPLESDIR}/modules.d
+
+# supress warnings about all the non binary files
+ -@${STRIP_CMD} ${STAGEDIR}/usr/local/sbin/* \
+ ${STAGEDIR}/usr/local/libexec/apache22/*.so 2>/dev/null
.if ${PORT_OPTIONS:MLOG_FORENSIC}
@${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin
.endif
Added: head/www/apache22/files/HEADS_UP
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/apache22/files/HEADS_UP Tue Jul 8 21:31:49 2014 (r361294)
@@ -0,0 +1,13 @@
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ H E A D S - U P
+2014-07-11:
+ The default version will change from www/apache22 to www/apache24,
+ pre-build apache modules will also reflect this!
+
+ In case ports are build by yourself and apache22 is required
+ use the following command to keep apache22 as default
+
+ echo "APACHE_DEFAULT=2.2" >> /etc/make.conf
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Modified: head/www/apache22/files/patch-Makefile.in
==============================================================================
--- head/www/apache22/files/patch-Makefile.in Tue Jul 8 21:18:25 2014 (r361293)
+++ head/www/apache22/files/patch-Makefile.in Tue Jul 8 21:31:49 2014 (r361294)
@@ -1,5 +1,5 @@
--- ./Makefile.in.orig 2008-11-25 21:24:49.000000000 +0100
-+++ ./Makefile.in 2013-10-27 15:13:17.000000000 +0100
++++ ./Makefile.in 2014-07-08 06:12:16.000000000 +0200
@@ -31,12 +31,10 @@
install-conf:
@echo Installing configuration files
@@ -91,16 +91,8 @@
install-other:
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -203,19 +175,17 @@
- done
-
- install-man:
-- @echo Installing man pages and online manual
-+ @echo Installing man pages
- @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
- @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
- @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
-- @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+@@ -210,12 +182,7 @@
+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
- @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
@@ -109,11 +101,7 @@
- cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
- cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
-+.if !defined(NOPORTDOCS)
-+ @echo Installing online manual
-+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
-+ cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir);
-+.endif
++ cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)
install-suexec:
@if test -f $(builddir)/support/suexec; then \
Modified: head/www/apache22/pkg-message
==============================================================================
--- head/www/apache22/pkg-message Tue Jul 8 21:18:25 2014 (r361293)
+++ head/www/apache22/pkg-message Tue Jul 8 21:31:49 2014 (r361294)
@@ -4,3 +4,16 @@ in your /etc/rc.conf. Extra options can
Your hostname must be resolvable using at least 1 mechanism in
/etc/nsswitch.conf typically DNS or /etc/hosts or apache might
have issues starting depending on the modules you are using.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ H E A D S - U P
+2014-07-11:
+ The default version will change from www/apache22 to www/apache24,
+ pre-build apache modules will also reflect this!
+
+ In case ports are build by yourself and apache22 is required
+ use the following command to keep apache22 as default
+
+ echo "APACHE_DEFAULT=2.2" >> /etc/make.conf
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Modified: head/www/apache22/pkg-plist
==============================================================================
--- head/www/apache22/pkg-plist Tue Jul 8 21:18:25 2014 (r361293)
+++ head/www/apache22/pkg-plist Tue Jul 8 21:31:49 2014 (r361294)
@@ -216,6 +216,7 @@ sbin/split-logfile
@unexec if cmp -s %D/%%ETCDIR%%/mime.types %D/%%EXAMPLESDIR%%/mime.types; then rm -f %D/%%ETCDIR%%/mime.types; fi
%%EXAMPLESDIR%%/mime.types
@exec [ -f %D/%%ETCDIR%%/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types %D/%%ETCDIR%%/mime.types
+%%EXAMPLESDIR%%/modules.d/README_modules.d
%%WWWDIR%%/cgi-bin/printenv
%%WWWDIR%%/cgi-bin/test-cgi
%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var
@@ -461,22 +462,23 @@ sbin/split-logfile
%%WWWDIR%%/icons/world1.png
%%WWWDIR%%/icons/world2.gif
%%WWWDIR%%/icons/world2.png
- at dirrm %%WWWDIR%%/icons/small
- at dirrm %%WWWDIR%%/icons
- at dirrm %%WWWDIR%%/error/include
- at dirrm %%WWWDIR%%/error
- at dirrmtry %%WWWDIR%%/data
- at dirrmtry %%WWWDIR%%/cgi-bin
- at dirrmtry %%WWWDIR%%
- at dirrm %%EXAMPLESDIR%%/extra
- at dirrm %%EXAMPLESDIR%%
- at dirrm %%DATADIR%%/build
- at dirrm %%DATADIR%%
- at dirrmtry libexec/apache22
- at dirrmtry include/apache22
@unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true
- at dirrmtry %%ETCDIR%%/modules.d
- at dirrmtry %%ETCDIR%%/extra
- at dirrmtry %%ETCDIR%%/envvars.d
@dirrmtry %%ETCDIR%%/Includes
+ at dirrmtry %%ETCDIR%%/envvars.d
+ at dirrmtry %%ETCDIR%%/extra
+ at dirrmtry %%ETCDIR%%/modules.d
@dirrmtry %%ETCDIR%%
+ at dirrmtry include/apache22
+ at dirrmtry libexec/apache22
+ at dirrm %%DATADIR%%/build
+ at dirrm %%DATADIR%%
+ at dirrm %%EXAMPLESDIR%%/extra
+ at dirrm %%EXAMPLESDIR%%/modules.d
+ at dirrm %%EXAMPLESDIR%%
+ at dirrmtry %%WWWDIR%%/cgi-bin
+ at dirrmtry %%WWWDIR%%/data
+ at dirrm %%WWWDIR%%/error/include
+ at dirrm %%WWWDIR%%/error
+ at dirrm %%WWWDIR%%/icons/small
+ at dirrm %%WWWDIR%%/icons
+ at dirrmtry %%WWWDIR%%
More information about the svn-ports-all
mailing list