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

(-)Makefile (-20 / +7 lines)
Lines 9-39 Link Here
9
PKGNAMESUFFIX=	_fp
9
PKGNAMESUFFIX=	_fp
10
PORTVERSION=	1.3.27
10
PORTVERSION=	1.3.27
11
CATEGORIES=	www
11
CATEGORIES=	www
12
MASTER_SITES=	http://www.apache.org/dist/httpd/ \
12
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
13
		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
14
		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
15
		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
16
		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
17
		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
18
		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
19
		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
20
		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
21
		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
22
		ftp://www3.service.digital.com/apache/dist/httpd/ \
23
		ftp://galileo.galilei.com/pub/apache/httpd/ \
24
		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
25
		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
26
		ftp://apache.nextpath.com/pub/apache/dist/httpd/ \
27
		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
28
		http://www.freebsd.org/gifs/:powerlogo \
13
		http://www.freebsd.org/gifs/:powerlogo \
29
		http://officeupdate.microsoft.com/frontpage/wpp/serk/:fplogo
14
		http://www.microsoft.com/frontpage/images/:fplogo
30
DISTNAME=	${PORTNAME}_${PORTVERSION}
15
DISTNAME=	${PORTNAME}_${PORTVERSION}
31
DISTFILES=	${APACHE} powerlogo.gif:powerlogo fplogo.gif:fplogo
16
DISTFILES=	${APACHE} powerlogo.gif:powerlogo createdwFP.gif:fplogo
32
17
33
MAINTAINER=	hetzels@westbend.net
18
MAINTAINER=	hetzels@westbend.net
34
COMMENT=	The Apache webserver with MS Frontpage Module
19
COMMENT=	The Apache webserver with MS Frontpage Module
35
20
36
#PATCH_SITES=	http://www.apache.org/dist/patches/apply_to_${PORTVERSION}/
21
#PATCH_SITES=	${MASTER_SITE_APACHE_HTTPD}
22
#PATCH_SITE_SUBDIR=	patches/apply_to_${PORTVERSION}/
37
#PATCHFILES=
23
#PATCHFILES=
38
24
39
APACHE=		${DISTNAME}${EXTRACT_SUFX}
25
APACHE=		${DISTNAME}${EXTRACT_SUFX}
Lines 149-155 Link Here
149
		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
135
		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
150
	fi
136
	fi
151
	@${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${IMAGES_DIR}
137
	@${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${IMAGES_DIR}
152
	@${INSTALL} -c -m 644 ${DISTDIR}/fplogo.gif ${IMAGES_DIR}
138
	@${INSTALL} -c -m 644 ${DISTDIR}/createdwFP.gif ${IMAGES_DIR}
139
	@${INSTALL_DATA} ${FILESDIR}/createdwFP.txt ${DOCSDIR}
153
	@${INSTALL} -c -m 644 ${DOCSDIR}/apache_pb.gif ${IMAGES_DIR}
140
	@${INSTALL} -c -m 644 ${DOCSDIR}/apache_pb.gif ${IMAGES_DIR}
154
	@( cd ${DOCSDIR} ; if [ -h images ] ; then ${RM} -f images ; fi ; ln -fs manual/images images)
141
	@( cd ${DOCSDIR} ; if [ -h images ] ; then ${RM} -f images ; fi ; ln -fs manual/images images)
155
	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
142
	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
(-)distinfo (-1 / +1 lines)
Lines 1-3 Link Here
1
MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa
1
MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa
2
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
2
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
3
MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
3
MD5 (createdwFP.gif) = 59e227f6dc0d2512e538489458b8835b
(-)pkg-deinstall (-1 / +1 lines)
Lines 65-71 Link Here
65
65
66
    if [ -d ${AP_DATA} ]; then
66
    if [ -d ${AP_DATA} ]; then
67
	if [ -d ${AP_DATA}/images ] ; then
67
	if [ -d ${AP_DATA}/images ] ; then
68
	    for file in apache_pb.gif fplogo.gif powerlogo.gif
68
	    for file in apache_pb.gif createdwFP.gif powerlogo.gif
69
	    {
69
	    {
70
		if remove_file ${IMAGES_DIR} ${AP_DATA}/images ${file}; then
70
		if remove_file ${IMAGES_DIR} ${AP_DATA}/images ${file}; then
71
		    if [ -d ${IMAGES_VTI} -a -f ${IMAGES_VTI}/${file} ] ; then
71
		    if [ -d ${IMAGES_VTI} -a -f ${IMAGES_VTI}/${file} ] ; then
(-)pkg-install (-4 / +4 lines)
Lines 85-91 Link Here
85
85
86
    if [ ! -d ${AP_DATA} ]; then
86
    if [ ! -d ${AP_DATA} ]; then
87
	/bin/mkdir -p ${AP_DATA}/images
87
	/bin/mkdir -p ${AP_DATA}/images
88
	for file in apache_pb.gif fplogo.gif powerlogo.gif
88
	for file in apache_pb.gif createdwFP.gif powerlogo.gif
89
	{
89
	{
90
	    /bin/cp -rp ${IMAGES_DIR}/${file} ${AP_DATA}/images
90
	    /bin/cp -rp ${IMAGES_DIR}/${file} ${AP_DATA}/images
91
	}
91
	}
Lines 118-126 Link Here
118
	   [ ! "`grep description ${IMAGES_VTI}/apache_pb.gif`" ] ; then
118
	   [ ! "`grep description ${IMAGES_VTI}/apache_pb.gif`" ] ; then
119
	    /bin/echo "vti_description:SW|Apache Webserver" >> ${IMAGES_VTI}/apache_pb.gif
119
	    /bin/echo "vti_description:SW|Apache Webserver" >> ${IMAGES_VTI}/apache_pb.gif
120
	fi
120
	fi
121
	if [ -f ${IMAGES_VTI}/fplogo.gif ] && \
121
	if [ -f ${IMAGES_VTI}/createdwFP.gif ] && \
122
	   [ ! "`grep description ${IMAGES_VTI}/fplogo.gif`" ] ; then
122
	   [ ! "`grep description ${IMAGES_VTI}/createdwFP.gif`" ] ; then
123
	    /bin/echo "vti_description:SW|Created with Microsoft FrontPage" >> ${IMAGES_VTI}/fplogo.gif
123
	    /bin/echo "vti_description:SW|Created and Managed with Microsoft FrontPage" >> ${IMAGES_VTI}/createdwFP.gif
124
	fi
124
	fi
125
	if [ -f ${IMAGES_VTI}/powerlogo.gif ] && \
125
	if [ -f ${IMAGES_VTI}/powerlogo.gif ] && \
126
	   [ ! "`grep description ${IMAGES_VTI}/powerlogo.gif`" ] ; then
126
	   [ ! "`grep description ${IMAGES_VTI}/powerlogo.gif`" ] ; then
(-)pkg-plist (-1 / +2 lines)
Lines 105-110 Link Here
105
share/doc/apache/apache_pb.gif
105
share/doc/apache/apache_pb.gif
106
@exec if [ ! -h %B/images ]; then (cd %B ; ln -s manual/images images); fi
106
@exec if [ ! -h %B/images ]; then (cd %B ; ln -s manual/images images); fi
107
@unexec if [ -h %B/images ]; then rm -f %B/images; fi
107
@unexec if [ -h %B/images ]; then rm -f %B/images; fi
108
share/doc/apache/createdwFP.txt
108
share/doc/apache/index.html.ca
109
share/doc/apache/index.html.ca
109
share/doc/apache/index.html.cz
110
share/doc/apache/index.html.cz
110
share/doc/apache/index.html.de
111
share/doc/apache/index.html.de
Lines 179-185 Link Here
179
share/doc/apache/manual/images/apache_header.gif
180
share/doc/apache/manual/images/apache_header.gif
180
share/doc/apache/manual/images/apache_pb.gif
181
share/doc/apache/manual/images/apache_pb.gif
181
share/doc/apache/manual/images/custom_errordocs.gif
182
share/doc/apache/manual/images/custom_errordocs.gif
182
share/doc/apache/manual/images/fplogo.gif
183
share/doc/apache/manual/images/createdwFP.gif
183
share/doc/apache/manual/images/home.gif
184
share/doc/apache/manual/images/home.gif
184
share/doc/apache/manual/images/index.gif
185
share/doc/apache/manual/images/index.gif
185
share/doc/apache/manual/images/mod_rewrite_fig1.fig
186
share/doc/apache/manual/images/mod_rewrite_fig1.fig
(-)files/apache.sh.tmpl (-54 / +40 lines)
Lines 10-30 Link Here
10
# If you want this script to start with the base rc scripts
10
# If you want this script to start with the base rc scripts
11
# move apache.sh to /etc/rc.d/apache
11
# move apache.sh to /etc/rc.d/apache
12
12
13
prefix=%%PREFIX%%
14
13
# Define the following apache_* variables in one of the following:
15
# Define the following apache_* variables in one of the following:
14
#       /etc/rc.conf
16
#       /etc/rc.conf
15
#       /etc/rc.conf.d/apache
17
#       /etc/rc.conf.d/apache
16
#       ${prefix}/etc/rc.conf.d/apache
18
#       /etc/rc.conf.d/apache
17
#
18
#       apache_enable  - Set to YES to enable apache
19
#
19
#
20
#       apache_program - Path to apache program
20
# DO NOT CHANGE THESE DEFAULT VALUES HERE
21
#                        Default: ${prefix}/sbin/httpd
22
#
21
#
23
#	apache_start   - Subcommand sent to apachectl to control how
22
apache_enable="YES"			# Enable Apache
24
#			 httpd is started.
23
#apache_program="${prefix}/sbin/httpd	# Location of httpd
25
#			 Default: start_FP
24
apache_start="start_FP"	# Subcommand sent to apachectl to control how
26
25
			# httpd is started.
27
prefix=%%PREFIX%%
28
26
29
apache_doit ()
27
apache_doit ()
30
{
28
{
Lines 75-130 Link Here
75
	restart_cmd="apache_doit restart"
73
	restart_cmd="apache_doit restart"
76
	reload_cmd="apache_doit reload"
74
	reload_cmd="apache_doit reload"
77
75
78
	# The below may be removed when load_local_rc_config is added to rc.subr
79
80
	if [ -f ${prefix}/etc/rc.conf.d/"$name" ]; then
81
		debug "Sourcing ${prefix}/etc/rc.conf.d/${name}"
82
		. ${prefix}/etc/rc.conf.d/"$name"
83
	fi
84
85
	load_rc_config $name
76
	load_rc_config $name
86
87
	if [ -z "${apache_enable}" ] ; then
88
		apache_enable=yes
89
	fi
90
91
	# The above may be removed when load_local_rc_config is added to rc.subr
92
	#
93
	# load_local_rc_config $name
94
95
	if [ -z "${apache_start}" ]; then
96
		apache_start="start_FP"
97
	fi
98
99
	run_rc_command "$1"
77
	run_rc_command "$1"
100
else
78
else
101
	if [ -f ${prefix}/etc/rc.conf.d/apache ]; then
79
	# Suck in the configuration variables.
102
		. ${prefix}/etc/rc.conf.d/apache
80
	if [ -z "${source_rc_confs_defined}" ]; then
103
	fi
81
		if [ -r /etc/defaults/rc.conf ]; then
104
82
			. /etc/defaults/rc.conf
105
	if [ -z '${apache_start}" ]; then
83
			source_rc_confs
106
		apache_start="start_FP"
84
		elif [ -r /etc/rc.conf ]; then
107
	fi
85
			. /etc/rc.conf
108
109
	case "$1" in
110
111
	start)
112
        	if [ -x ${prefix}/sbin/apachectl ]; then
113
			new_key
114
			${prefix}/sbin/apachectl ${apache_start} && echo -n ' httpd'
115
		fi
86
		fi
116
		;;
87
	fi
117
88
118
	stop)
89
	rc=0
119
		if [ -r /var/run/httpd.pid ]; then
120
			${prefix}/sbin/apachectl stop && echo -n ' httpd'
121
		fi
122
		;;
123
90
124
	*)
91
	case "${apache_enable}" in
125
		echo "usage: $0 {start|stop}" 1>&2
92
	    [Yy][Ee][Ss])
126
		exit 64
93
		case "$1" in
94
		    start)
95
        		if [ -x ${prefix}/sbin/apachectl ]; then
96
				new_key
97
				${prefix}/sbin/apachectl ${apache_start} && echo -n ' httpd'
98
			fi
99
			;;
100
		    stop)
101
			if [ -r /var/run/httpd.pid ]; then
102
				${prefix}/sbin/apachectl stop && echo -n ' httpd'
103
			fi
104
			;;
105
		    *)
106
			echo "usage: $0 {start|stop}" 1>&2
107
			rc=64
108
			;;
127
		;;
109
		;;
128
110
            *)
111
                rc=0
112
                ;;
129
	esac
113
	esac
114
115
	exit $rc
130
fi
116
fi
(-)files/createdwFP.txt (+17 lines)
Added Link Here
1
    Usage Guidelines for the Microsoft FrontPage Logo (createdwFP.gif)
2
3
The Microsoft FrontPage(R) Logo Program is designed to provide you with the
4
guidelines necessary for displaying the Created and Managed with Microsoft
5
FrontPage logo (the "Logo") on your Web site. 
6
7
1.  Except as Microsoft may authorize elsewhere, non-Microsoft Web sites
8
    may display only the Created and Managed with Microsoft FrontPage logo
9
    provided ("Logo"). By displaying the Logo on your Web site, you agree
10
    to be bound by these Policies.
11
12
2.  You may only display the Logo on your Web site, and not in any other
13
    manner than specified herein. It must always be an active link to the
14
    Microsoft FrontPage home page at http://www.microsoft.com/frontpage/.
15
16
For more restrictions see:
17
    http://www.microsoft.com/frontpage/logo.htm

Return to bug 52541