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

(-)Makefile (-11 / +8 lines)
Lines 9-14 Link Here
9
9
10
PORTNAME=	apache+ssl
10
PORTNAME=	apache+ssl
11
PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
11
PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
12
PORTREVISION=	1
12
CATEGORIES=	www security
13
CATEGORIES=	www security
13
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
14
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
14
		${MASTER_SITES_APACHE_SSL:S/$/:ssl/}
15
		${MASTER_SITES_APACHE_SSL:S/$/:ssl/}
Lines 17-26 Link Here
17
		apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl
18
		apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl
18
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
19
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
19
20
20
#PATCH_SITES=		${MASTER_SITE_APACHE_HTTPD}
21
#PATCH_SITE_SUBDIR=	patches/apply_to_${APACHE_VERSION}
22
#PATCHFILES=
23
24
MAINTAINER=	apache@FreeBSD.org
21
MAINTAINER=	apache@FreeBSD.org
25
COMMENT=	Apache secure webserver integrating OpenSSL
22
COMMENT=	Apache secure webserver integrating OpenSSL
26
23
Lines 28-34 Link Here
28
		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
25
		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
29
		apache+mod_ssl+mod_snmp+mod_accel-1.* \
26
		apache+mod_ssl+mod_snmp+mod_accel-1.* \
30
		apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \
27
		apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \
31
		caudium-devel-1.* caudium10-1.* caudium12-* \
28
		caudium-devel-1.* caudium10-1.* caudium12-1.* \
32
		ru-apache+mod_ssl-1.* ru-apache-1.*
29
		ru-apache+mod_ssl-1.* ru-apache-1.*
33
30
34
APACHE_VERSION=		1.3.41
31
APACHE_VERSION=		1.3.41
Lines 36-47 Link Here
36
USE_OPENSSL=		yes
33
USE_OPENSSL=		yes
37
USE_PERL5=		yes
34
USE_PERL5=		yes
38
HAS_CONFIGURE=		yes
35
HAS_CONFIGURE=		yes
39
USE_RC_SUBR=		yes
36
USE_RC_SUBR=		apache.sh
40
RC_SCRIPTS_SUB=		PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} WWWOWN=${WWWOWN}
37
SUB_LIST+=		WWWOWN=${WWWOWN}
41
MAKE_ENV+=		EXAMPLESDIR=${EXAMPLESDIR}
38
MAKE_ENV+=		EXAMPLESDIR=${EXAMPLESDIR}
42
USE_APACHE=		common13
39
USE_APACHE=		common13
43
40
44
MASTER_SITES_APACHE_SSL= \
41
MASTER_SITES_APACHE_SSL=	\
45
		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
42
		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
46
		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
43
		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
47
		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/
44
		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/
Lines 100-109 Link Here
100
post-patch:
97
post-patch:
101
	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE}
98
	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE}
102
	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist
99
	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist
103
	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
104
		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
105
	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
100
	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
106
		${WRKSRC}/src/Configure
101
		${WRKSRC}/src/Configure
102
.if defined(NOPORTDOCS)
103
	(cd ${WRKSRC} ; ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/no_port_docs)
104
.endif
107
105
108
post-install:
106
post-install:
109
	@${ECHO_CMD} ""
107
	@${ECHO_CMD} ""
Lines 112-118 Link Here
112
	@${ECHO_CMD} "  http://www.apache-ssl.org/docs.html"
110
	@${ECHO_CMD} "  http://www.apache-ssl.org/docs.html"
113
	@${ECHO_CMD} " to know how to configure correctly apache-ssl"
111
	@${ECHO_CMD} " to know how to configure correctly apache-ssl"
114
	@${ECHO_CMD} ""
112
	@${ECHO_CMD} ""
115
	@${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d
116
113
117
certificate:
114
certificate:
118
	-${MKDIR} ${PREFIX}/etc/apache/certs
115
	-${MKDIR} ${PREFIX}/etc/apache/certs
(-)pkg-plist (-8 / +7 lines)
Lines 4-10 Link Here
4
bin/htdigest
4
bin/htdigest
5
bin/htpasswd
5
bin/htpasswd
6
@exec mkdir -p %D/etc/apache 2> /dev/null
6
@exec mkdir -p %D/etc/apache 2> /dev/null
7
etc/rc.d/apache.sh
8
@unexec if cmp -s %D/etc/apache/access.conf% %D/%%EXAMPLESDIR%%/access.conf-dist; then rm -f %D/etc/apache/access.conf%; fi
7
@unexec if cmp -s %D/etc/apache/access.conf% %D/%%EXAMPLESDIR%%/access.conf-dist; then rm -f %D/etc/apache/access.conf%; fi
9
%%EXAMPLESDIR%%/access.conf-dist
8
%%EXAMPLESDIR%%/access.conf-dist
10
@exec [ -f %D/etc/apache/access.conf% ] || cp %D/%%EXAMPLESDIR%%/access.conf-dist %D/etc/apache/access.conf
9
@exec [ -f %D/etc/apache/access.conf% ] || cp %D/%%EXAMPLESDIR%%/access.conf-dist %D/etc/apache/access.conf
Lines 660-672 Link Here
660
@dirrm include/apache/xml
659
@dirrm include/apache/xml
661
@dirrm include/apache
660
@dirrm include/apache
662
@dirrm libexec/apache
661
@dirrm libexec/apache
663
@dirrm %%PORTDOCS%%%%DOCSDIR%%/howto
662
%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto
664
@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
663
%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
665
@dirrm %%PORTDOCS%%%%DOCSDIR%%/misc
664
%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
666
@dirrm %%PORTDOCS%%%%DOCSDIR%%/mod
665
%%PORTDOCS%%@dirrm %%DOCSDIR%%/mod
667
@dirrm %%PORTDOCS%%%%DOCSDIR%%/programs
666
%%PORTDOCS%%@dirrm %%DOCSDIR%%/programs
668
@dirrm %%PORTDOCS%%%%DOCSDIR%%/vhosts
667
%%PORTDOCS%%@dirrm %%DOCSDIR%%/vhosts
669
@dirrm %%PORTDOCS%%%%DOCSDIR%%
668
%%PORTDOCS%%@dirrm %%DOCSDIR%%
670
@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
669
@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
671
@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
670
@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
672
@dirrm www/cgi-bin-dist
671
@dirrm www/cgi-bin-dist
(-)files/apache.sh (-62 lines)
Removed Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp $
4
#
5
6
# PROVIDE: apache
7
# REQUIRE: NETWORKING SERVERS
8
# BEFORE: DAEMON
9
# KEYWORD: shutdown
10
11
#
12
# Add the following lines to /etc/rc.conf to enable apache:
13
# apache_enable (bool):      Set to "NO" by default.
14
#                             Set it to "YES" to enable apache
15
# apachelimits_enable (bool):Set to "NO" by default.
16
#                             Set it to yes to run `limits $limits_args`
17
#                             just before apache starts.
18
# apache_flags (str):        Set to "" by default.
19
#                             Extra flags passed to start command.
20
# apachelimits_args (str):   Default to "-e -C daemon"
21
#                             Arguments of pre-start limits run.
22
#
23
. %%RC_SUBR%%
24
25
name="apache"
26
rcvar=`set_rcvar`
27
28
start_precmd="apache_precmd"
29
restart_precmd="apache_checkconfig"
30
reload_precmd="apache_checkconfig"
31
command="%%PREFIX%%/sbin/httpsd"
32
pidfile="/var/run/httpsd.pid"
33
required_files=%%PREFIX%%/etc/apache/httpsd.conf
34
35
[ -z "$apache_enable" ]       && apache_enable="NO"
36
[ -z "$apache_flags" ]        && apache_flags=""
37
[ -z "$apachelimits_enable" ] && apachelimits_enable="NO"
38
[ -z "$apachelimits_args" ]   && apachelimits_args="-e -C daemon"
39
40
load_rc_config $name
41
42
apache_checkconfig()
43
{
44
	echo "Performing sanity check on apache configuration:"
45
	${command} -t
46
}
47
48
apache_precmd() 
49
{
50
	if checkyesno apachelimits_enable
51
	then
52
		eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null
53
	else
54
		return 0
55
        fi
56
57
}
58
59
sig_reload=SIGUSR1
60
61
extra_commands="reload"
62
run_rc_command "$1"
(-)files/apache.sh.in (+62 lines)
Added Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp $
4
#
5
6
# PROVIDE: apache
7
# REQUIRE: NETWORKING SERVERS
8
# BEFORE: DAEMON
9
# KEYWORD: shutdown
10
11
#
12
# Add the following lines to /etc/rc.conf to enable apache:
13
# apache_enable (bool):      Set to "NO" by default.
14
#                             Set it to "YES" to enable apache
15
# apachelimits_enable (bool):Set to "NO" by default.
16
#                             Set it to yes to run `limits $limits_args`
17
#                             just before apache starts.
18
# apache_flags (str):        Set to "" by default.
19
#                             Extra flags passed to start command.
20
# apachelimits_args (str):   Default to "-e -C daemon"
21
#                             Arguments of pre-start limits run.
22
#
23
. %%RC_SUBR%%
24
25
name="apache"
26
rcvar=`set_rcvar`
27
28
start_precmd="apache_precmd"
29
restart_precmd="apache_checkconfig"
30
reload_precmd="apache_checkconfig"
31
command="%%PREFIX%%/sbin/httpsd"
32
pidfile="/var/run/httpsd.pid"
33
required_files=%%PREFIX%%/etc/apache/httpsd.conf
34
35
[ -z "$apache_enable" ]       && apache_enable="NO"
36
[ -z "$apache_flags" ]        && apache_flags=""
37
[ -z "$apachelimits_enable" ] && apachelimits_enable="NO"
38
[ -z "$apachelimits_args" ]   && apachelimits_args="-e -C daemon"
39
40
load_rc_config $name
41
42
apache_checkconfig()
43
{
44
	echo "Performing sanity check on apache configuration:"
45
	${command} -t
46
}
47
48
apache_precmd() 
49
{
50
	if checkyesno apachelimits_enable
51
	then
52
		eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null
53
	else
54
		return 0
55
        fi
56
57
}
58
59
sig_reload=SIGUSR1
60
61
extra_commands="reload"
62
run_rc_command "$1"
(-)files/no_port_docs (+22 lines)
Added Link Here
1
--- Makefile.tmpl.orig	2008-07-01 01:08:04.000000000 +0000
2
+++ Makefile.tmpl	2008-07-01 01:08:17.000000000 +0000
3
@@ -228,7 +228,6 @@
4
 	$(MKDIR) $(root)$(mandir)/man8
5
 	$(MKDIR) $(root)$(sysconfdir)
6
 	$(MKDIR) $(root)$(htdocsdir)-dist
7
-	$(MKDIR) $(root)$(manualdir)
8
 	$(MKDIR) $(root)$(iconsdir)
9
 	$(MKDIR) $(root)$(cgidir)-dist
10
 	$(MKDIR) $(root)$(includedir)
11
@@ -422,11 +421,6 @@
12
 		(cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
13
 		find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
14
 		find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
15
-		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
16
-		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
17
-		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
18
-		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
19
-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
20
 	if [ ! -d $(root)$(htdocsdir)/ ]; then \
21
 		$(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
22
 	fi

Return to bug 125132