Date: Fri, 18 Jul 2008 03:05:16 GMT From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: clement@FreeBSD.org Subject: ports/125733: [PATCH] www/apache: Fix pkg-plist with NO* vars Message-ID: <200807180305.m6I35Gvq029890@riderwayinc.com> Resent-Message-ID: <200807180310.m6I3A25l071239@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125733
>Category: ports
>Synopsis: [PATCH] www/apache: Fix pkg-plist with NO* vars
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 18 03:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 7.0-RELEASE amd64
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008
>Description:
- Bump PORTREVISION
- Update comment to be more explicit in the httpd version
- Pet portlint warning (conflicts)
- Remove defaults from RC_SCRIPTS_SUB
- Drop 5.x support (threaded)
- Fix pkg-plist[1]
Reviewed by: itectu@
[1] - noticed by QA Tindy
Removed file(s):
- files/patch-server:main.c
- files/patch-srclib:apr:threadproc:unix:procsup.c
Port maintainer (clement@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- apache-2.0.63_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache20/Makefile,v
retrieving revision 1.252
diff -u -u -r1.252 Makefile
--- Makefile 8 Feb 2008 03:07:25 -0000 1.252
+++ Makefile 18 Jul 2008 03:02:47 -0000
@@ -9,6 +9,7 @@
PORTNAME= apache
PORTVERSION= 2.0.63
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
${MASTER_SITE_LOCAL:S/$/:powerlogo/}
@@ -19,7 +20,7 @@
EXTRACT_ONLY= ${DISTNAME}.tar.bz2
MAINTAINER?= clement@FreeBSD.org
-COMMENT?= Version 2 of Apache web server with ${WITH_MPM:L} MPM.
+COMMENT?= Version 2.0.x of Apache web server with ${WITH_MPM:L} MPM.
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
@@ -29,7 +30,7 @@
apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
apache+mod_ssl+mod_snmp+mod_accel-1.* \
apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
- caudium-devel-1.* caudium10-1.* caudium12-* \
+ caudium-devel-1.* caudium10-1.* caudium12-1.* \
ru-apache+mod_ssl-1.* ru-apache-1.*
# patch files
@@ -72,7 +73,6 @@
LOCALBASE="${LOCALBASE}"
PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}
-RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
MAKE_ENV+= EXPR_COMPAT=yes
@@ -148,13 +148,9 @@
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
-. if ${OSVERSION} > 500023
-. if ${ARCH} == i386
+. if ${ARCH} == i386
CONFIGURE_ARGS+= --enable-nonportable-atomics
-. endif
-. else
-CFLAGS+= -DFREEBSD_THREAD_HACK
-. endif
+. endif
.endif
CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/apache20/pkg-plist,v
retrieving revision 1.82
diff -u -u -r1.82 pkg-plist
--- pkg-plist 9 Sep 2007 14:48:33 -0000 1.82
+++ pkg-plist 18 Jul 2008 03:02:47 -0000
@@ -521,6 +521,7 @@
%%WWWDATA%%@dirrm www/data-dist
%%CGI%%@dirrm www/cgi-bin-dist
@dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%
@dirrm share/apache2/build
@dirrm share/apache2
@dirrmtry libexec/apache2
Index: files/patch-server:main.c
===================================================================
RCS file: files/patch-server:main.c
diff -N files/patch-server:main.c
--- files/patch-server:main.c 21 Jul 2002 02:23:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
---- server/main.c.orig Thu Jun 13 04:34:56 2002
-+++ server/main.c Sun Jul 21 08:54:09 2002
-@@ -78,6 +78,11 @@
- #include "ap_mpm.h"
- #include "mpm_common.h"
-
-+#ifdef FREEBSD_THREAD_HACK
-+#include <unistd.h>
-+AP_DECLARE(int) ap_exists_config_define(const char *name);
-+#endif
-+
- /* WARNING: Win32 binds http_main.c dynamically to the server. Please place
- * extern functions and global data in another appropriate module.
- *
-@@ -558,6 +563,21 @@
- destroy_and_exit_process(process, 1);
- }
-
-+#ifdef FREEBSD_THREAD_HACK
-+ {
-+ int r;
-+
-+ if (! ap_exists_config_define("NO_DETACH")) {
-+ if ((r = fork()) > 0)
-+ return 0;
-+ if (r == -1) {
-+ perror("fork");
-+ return 0;
-+ }
-+ setsid();
-+ }
-+ }
-+#endif
- ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp);
- ap_fixup_virtual_hosts(pconf, server_conf);
- ap_fini_vhost_config(pconf, server_conf);
Index: files/patch-srclib:apr:threadproc:unix:procsup.c
===================================================================
RCS file: files/patch-srclib:apr:threadproc:unix:procsup.c
diff -N files/patch-srclib:apr:threadproc:unix:procsup.c
--- files/patch-srclib:apr:threadproc:unix:procsup.c 21 Jul 2002 02:23:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
---- srclib/apr/threadproc/unix/procsup.c.orig Mon Apr 8 22:08:18 2002
-+++ srclib/apr/threadproc/unix/procsup.c Sun Jul 21 08:45:44 2002
-@@ -59,6 +59,7 @@
- int x;
-
- chdir("/");
-+#ifndef FREEBSD_THREAD_HACK
- #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS)
- /* Don't detach for MPE because child processes can't survive the death of
- * the parent. */
-@@ -89,6 +90,7 @@
- if (setpgid(0, 0) == -1) {
- return errno;
- }
-+#endif
- #endif
-
- /* close out the standard file descriptors */
--- apache-2.0.63_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807180305.m6I35Gvq029890>