View | Details | Raw Unified | Return to bug 58739
Collapse All | Expand All

(-)apache2/Makefile (-41 / +25 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	apache
8
PORTNAME=	apache
9
PORTVERSION=	2.0.48
9
PORTVERSION=	2.0.48
10
PORTREVISION=	1
10
CATEGORIES=	www ipv6
11
CATEGORIES=	www ipv6
11
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
12
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
12
		http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
13
		http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
Lines 33-55 Link Here
33
##      WITH_MPM:                 prefork (default)
34
##      WITH_MPM:                 prefork (default)
34
##                                worker
35
##                                worker
35
##                                perchild
36
##                                perchild
36
##      HTTP_PORT:                default: 80
37
##      WITH_HTTP_PORT:           default: 80
37
##      WITH_LDAP:                Enable LDAP support (mod_auth_ldap)
38
##      WITH_LDAP:                Enable LDAP support (mod_auth_ldap)
38
##      WITHOUT_PROXY:            Disable proxy support
39
##      WITHOUT_PROXY:            Disable proxy support
39
##          WITH_CUSTOM_PROXY:    Let you choose which proxy modules you wish
40
##          WITH_CUSTOM_PROXY:    Let you choose which proxy modules you wish
40
##      WITHOUT_AUTH:             Disable auth modules
41
##      WITHOUT_AUTH:             Disable auth modules
41
##          WITH_CUSTOM_AUTH:     Let you choose which auth modules you wish
42
##          WITH_CUSTOM_AUTH:     Let you choose which auth modules you wish
42
##      WITHOUT_DAV:              Disable DAV support
43
##      WITHOUT_DAV:              Disable DAV support
43
##      IPV6_V6ONLY:              Disable IPv4 support
44
##      WITH_IPV6_V6ONLY:         Disable IPv4 support
44
##      WITHOUT_SSL:              Disable SSL support
45
##      WITHOUT_SSL:              Disable SSL support
45
##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
46
##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
46
##           WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
47
##           WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
47
##      WITH_EXPERIMENTAL:        Enable Experimental modules
48
##      WITH_EXPERIMENTAL:        Enable Experimental modules
48
##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or ndbm (default)
49
##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or ndbm (default)
49
##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3 or db4 (default)
50
##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3 or db4 or FreeBSD (1.85)(default)
50
##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
51
##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
51
##      WITH_STATIC_APACHE:       Build a static version of httpd (implies WITH_STATIC_MODULES)
52
##      WITH_STATIC_APACHE:       Build a static version of httpd (implies WITH_STATIC_MODULES)
52
##      WITH_ALL_STATIC_APACHE:   All modules statically linked.
53
##      WITH_ALL_STATIC_MODULES:  All modules will be statically linked.
53
##      WITH_STATIC_MODULES:      List of modules to build modules statics (usefull for slave ports)
54
##      WITH_STATIC_MODULES:      List of modules to build modules statics (usefull for slave ports)
54
##                                (They must be already enabled (i.e. WITH_MODULES or with default configuration
55
##                                (They must be already enabled (i.e. WITH_MODULES or with default configuration
55
##                                use 'make show-modules', to check if they are enabled)
56
##                                use 'make show-modules', to check if they are enabled)
Lines 60-71 Link Here
60
##
61
##
61
##
62
##
62
##   Port-related:
63
##   Port-related:
63
##      NOPORTDOCS:               Do not install documentation
64
##      WITHOUT_WWW:              Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR
64
##      NO_CGI:                   Do not instal www/cgi-bin*
65
##           WITH_CUSTOM_WWW:     Let you choose your ${LOCALBASE}/www components: [cgi|errordocs|icons|wwwdata]
65
##      NO_ERROR:                   Do not instal www/error
66
##      NO_WWWDATA:               Do not instal www/data*
67
##      NO_ICONS:                 Do not instal www/icons*
68
##      NO_WWW:                   Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR
69
##
66
##
70
## Available make targets:
67
## Available make targets:
71
##      show-options:             prints this message
68
##      show-options:             prints this message
Lines 79-85 Link Here
79
##
76
##
80
77
81
WITH_MPM?=	prefork # or worker, perchild
78
WITH_MPM?=	prefork # or worker, perchild
82
HTTP_PORT?=	80
79
HTTP_PORT?=	${WITH_HTTP_PORT}
83
80
84
GNU_CONFIGURE=	yes
81
GNU_CONFIGURE=	yes
85
USE_LIBTOOL=	yes
82
USE_LIBTOOL=	yes
Lines 108-114 Link Here
108
MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
105
MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
109
MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
106
MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
110
107
111
.if !defined(IPV6_V6ONLY)
108
.if !defined(WITH_IPV6_V6ONLY)
112
CONFIGURE_ARGS+=	--enable-v4-mapped
109
CONFIGURE_ARGS+=	--enable-v4-mapped
113
.endif
110
.endif
114
111
Lines 117-161 Link Here
117
.endif
114
.endif
118
115
119
.if defined(WITH_LDAP)
116
.if defined(WITH_LDAP)
120
USE_LDAP=	YES
117
USE_OPENLDAP=	YES
121
CONFIGURE_ARGS+=	--with-ldap \
118
CONFIGURE_ARGS+=	--with-ldap \
122
			--with-ldap-lib="${LOCALBASE}/lib" \
119
			--with-ldap-lib="${LOCALBASE}/lib" \
123
			--with-ldap-include="${LOCALBASE}/include"
120
			--with-ldap-include="${LOCALBASE}/include"
124
.endif
121
.endif
125
122
126
.if defined(NO_WWW)
123
.if defined(WITHOUT_WWW)
127
NO_CGI=		YES
124
NO_CGI=		YES
128
NO_WWWDATA=	YES
125
NO_WWWDATA=	YES
129
NO_ICONS=	YES
126
NO_ICONS=	YES
130
NO_ERROR=	YES
127
NO_ERROR=	YES
131
.endif
128
.endif
132
129
133
.if defined(NO_CGI)
130
.if defined(WITH_CUSTOM_WWW)
134
MAKE_ENV+=	NO_CGI=yes
131
.    if ${WITH_CUSTOM_WWW:Mcgi} == ""
135
PLIST_SUB+=	CGI="@comment "
132
NO_CGI=		YES
136
.else
133
.    endif
137
PLIST_SUB+=	CGI=""
134
.    if ${WITH_CUSTOM_WWW:Mwwwdata} == ""
138
.endif
135
NO_WWWDATA=		YES
139
136
.    endif
140
.if defined(NO_ICONS)
137
.    if ${WITH_CUSTOM_WWW:Merrordocs} == ""
141
MAKE_ENV+=	NO_ICONS=yes
138
NO_ERROR=		YES
142
PLIST_SUB+=	ICONS="@comment "
139
.    endif
143
.else
140
.    if ${WITH_CUSTOM_WWW:Micons} == ""
144
PLIST_SUB+=	ICONS=""
141
NO_ICONS=		YES
145
.endif
142
.    endif
146
147
.if defined(NO_WWWDATA)
148
MAKE_ENV+=	NO_WWWDATA=yes
149
PLIST_SUB+=	WWWDATA="@comment "
150
.else
151
PLIST_SUB+=	WWWDATA=""
152
.endif
153
154
.if defined(NO_ERROR)
155
MAKE_ENV+=	NO_ERROR=yes
156
PLIST_SUB+=	ERROR="@comment "
157
.else
158
PLIST_SUB+=	ERROR=""
159
.endif
143
.endif
160
144
161
.if defined(WITH_STATIC_SUPPORT)
145
.if defined(WITH_STATIC_SUPPORT)
Lines 169-175 Link Here
169
CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
153
CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
170
154
171
show-options:
155
show-options:
172
	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
156
	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
173
157
174
show-modules:
158
show-modules:
175
	@for module in $(AVAILABLE_MODULES) ; do \
159
	@for module in $(AVAILABLE_MODULES) ; do \
(-)apache2/Makefile.modules (-10 / +42 lines)
Lines 35-45 Link Here
35
PLIST_SUB+=	PREFORK="@comment " WORKER="@comment "
35
PLIST_SUB+=	PREFORK="@comment " WORKER="@comment "
36
.endif
36
.endif
37
37
38
# Documentation section
39
.if defined(NO_CGI)
40
MAKE_ENV+=	NO_CGI=yes
41
PLIST_SUB+=	CGI="@comment "
42
.else
43
PLIST_SUB+=	CGI=""
44
.endif
45
46
.if defined(NO_ICONS)
47
MAKE_ENV+=	NO_ICONS=yes
48
PLIST_SUB+=	ICONS="@comment "
49
.else
50
PLIST_SUB+=	ICONS=""
51
.endif
52
53
.if defined(NO_WWWDATA)
54
MAKE_ENV+=	NO_WWWDATA=yes
55
PLIST_SUB+=	WWWDATA="@comment "
56
.else
57
PLIST_SUB+=	WWWDATA=""
58
.endif
59
60
.if defined(NO_ERROR)
61
MAKE_ENV+=	NO_ERROR=yes
62
PLIST_SUB+=	ERROR="@comment "
63
.else
64
PLIST_SUB+=	ERROR=""
65
.endif
66
67
38
# xDBM section
68
# xDBM section
39
#
69
#
40
.if !defined(WITH_DBM) && defined(WITH_BERKELEYDB)
70
.if !defined(WITH_DBM) && defined(WITH_BERKELEYDB)
41
WITH_DBM=db
71
WITH_DBM=db
42
.endif
72
.endif
73
.if defined(WITH_DBM) && !defined(WITH_BERKELEYDB)
74
WITH_BERKELEYDB=	FreeBSD
75
.endif
43
76
44
.if defined(WITH_DBM)
77
.if defined(WITH_DBM)
45
.   if ${WITH_DBM:L} == "sdbm"
78
.   if ${WITH_DBM:L} == "sdbm"
Lines 47-67 Link Here
47
.   elif ${WITH_DBM:L} == "gdbm"
80
.   elif ${WITH_DBM:L} == "gdbm"
48
LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
81
LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
49
CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
82
CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
50
.   elif ${WITH_DBM:L} == "db" || defined(WITH_BERKELEYDB)
83
.   elif ${WITH_DBM:L} == "db" 
51
.       if !defined(WITH_BERKELEYDB)
84
.       if ${WITH_BERKELEYDB} == "FreeBSD"
52
LIB_DEPENDS=		db4:${PORTSDIR}/databases/db4
85
CONFIGURE_ARGS+=	--with-dbm=db185 \
53
CONFIGURE_ARGS+=	--with-dbm=db4 \
86
			--with-berkeley-db=/usr
54
			--with-berkeley-db=${LOCALBASE}
55
.       elif ${WITH_BERKELEYDB} == "db2"
87
.       elif ${WITH_BERKELEYDB} == "db2"
56
LIB_DEPENDS=		db2:${PORTSDIR}/databases/db2
88
LIB_DEPENDS+=		db2:${PORTSDIR}/databases/db2
57
CONFIGURE_ARGS+=	--with-dbm=db2 \
89
CONFIGURE_ARGS+=	--with-dbm=db2 \
58
			--with-berkeley-db=${LOCALBASE}
90
			--with-berkeley-db=${LOCALBASE}
59
.       elif ${WITH_BERKELEYDB} == "db3"
91
.       elif ${WITH_BERKELEYDB} == "db3"
60
LIB_DEPENDS=		db2:${PORTSDIR}/databases/db3
92
LIB_DEPENDS+=		db3:${PORTSDIR}/databases/db3
61
CONFIGURE_ARGS+=	--with-dbm=db3 \
93
CONFIGURE_ARGS+=	--with-dbm=db3 \
62
			--with-berkeley-db=${LOCALBASE}
94
			--with-berkeley-db=${LOCALBASE}
63
.       elif ${WITH_BERKELEYDB} == "db4"
95
.       elif ${WITH_BERKELEYDB} == "db4"
64
LIB_DEPENDS=		db4:${PORTSDIR}/databases/db4
96
LIB_DEPENDS+=		db4:${PORTSDIR}/databases/db4
65
CONFIGURE_ARGS+=	--with-dbm=db4 \
97
CONFIGURE_ARGS+=	--with-dbm=db4 \
66
			--with-berkeley-db=${LOCALBASE}
98
			--with-berkeley-db=${LOCALBASE}
67
.       else
99
.       else
Lines 78-90 Link Here
78
# How does it works ?
110
# How does it works ?
79
# << TO BE WRITTEN >>
111
# << TO BE WRITTEN >>
80
# All supported modules
112
# All supported modules
81
AUTH_MODULES=		auth auth_anon auth_dbm auth_digest
113
AUTH_MODULES=		access auth auth_anon auth_dbm auth_digest
82
DAV_MODULES=		dav dav_fs
114
DAV_MODULES=		dav dav_fs
83
EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_lite \
115
EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_lite \
84
			optional_hook_export optional_hook_import \
116
			optional_hook_export optional_hook_import \
85
			optional_fn_import optional_fn_export
117
			optional_fn_import optional_fn_export
86
LDAP_MODULES=		ldap auth_ldap
118
LDAP_MODULES=		ldap auth_ldap
87
MISC_MODULES=		access actions alias asis autoindex cache cern_meta \
119
MISC_MODULES=		actions alias asis autoindex cache cern_meta \
88
			cgi cgid charset_lite  deflate dir disk_cache env expires \
120
			cgi cgid charset_lite  deflate dir disk_cache env expires \
89
			file_cache headers imap include info log_config logio mime \
121
			file_cache headers imap include info log_config logio mime \
90
			mime_magic negotiation rewrite setenvif speling status \
122
			mime_magic negotiation rewrite setenvif speling status \
(-)apache2/pkg-plist (-1 / +1 lines)
Lines 1554-1557 Link Here
1554
@dirrm libexec/apache2
1554
@dirrm libexec/apache2
1555
@dirrm lib/apache2
1555
@dirrm lib/apache2
1556
@dirrm include/apache2
1556
@dirrm include/apache2
1557
@dirrm etc/apache2
1557
@unexec rmdir %D/etc 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2"
(-)apache2/files/patch-srclib:apr-util:configure (+13 lines)
Added Link Here
1
--- srclib/apr-util/configure.orig	Thu Oct 30 18:52:48 2003
2
+++ srclib/apr-util/configure	Thu Oct 30 18:53:31 2003
3
@@ -11281,8 +11281,8 @@
4
     fi
5
   fi
6
   bdb_places="$places"
7
-  bdb_default_search_headers="db_185.h"
8
-  bdb_default_search_lib_names="db"
9
+  bdb_default_search_headers="db.h"
10
+  bdb_default_search_lib_names="c"
11
 
12
 
13
   apu_have_db=0

Return to bug 58739