1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

- Removed hard dependency on Apache 2.0+

- If requested, foswiki now uses the existing Apache installation or
  installs Apache 1.3+
- Rewrote pkg-message when Apache dependency is not selected
- Bumped PORTREVISION

Requested by:	tobez
This commit is contained in:
Greg Larkin 2010-03-23 20:48:29 +00:00
parent fec759788a
commit 656511a3ef
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=251409
2 changed files with 36 additions and 42 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= foswiki
PORTVERSION= 1.0.9
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF
DISTNAME= Foswiki-${PORTVERSION}
@ -16,17 +17,17 @@ MAINTAINER= glarkin@FreeBSD.org
COMMENT= A free and open source enterprise wiki
BUILD_DEPENDS= p5-Error>=0:${PORTSDIR}/lang/p5-Error
RUN_DEPENDS= ${BUILD_DEPENDS}
RUN_DEPENDS= p5-Error>=0:${PORTSDIR}/lang/p5-Error
USE_PERL5= 5.8.4+
USE_APACHE= 2.0+
NO_BUILD= yes
OPTIONS= OPTINT "Install Perl modules for intl character support" Off \
OPTOTH "Install other optional Perl modules" On \
APACHE "Install sample Apache 2.x config file" Off
APACHE "Install Apache web server and sample config file" Off
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
.if defined(WITH_OPTINT)
BUILD_DEPENDS+= p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon
RUN_DEPENDS+= p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon
@ -40,23 +41,44 @@ BUILD_DEPENDS+= p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
p5-Lingua-EN-Sentence>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Sentence \
p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
p5-Net>=1.19:${PORTSDIR}/net/p5-Net
RUN_DEPENDS+= ${BUILD_DEPENDS}
RUN_DEPENDS+= p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
p5-CGI-Session>=4.30:${PORTSDIR}/www/p5-CGI-Session \
p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
p5-Lingua-EN-Sentence>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Sentence \
p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
p5-Net>=1.19:${PORTSDIR}/net/p5-Net
.endif
.if defined(WITH_APACHE)
USE_APACHE?= 1.3+
PLIST_SUB+= NOAPACHE=""
PKGMESSAGE= pkg-message-apache
SUB_FILES+= pkg-message-apache
.include <bsd.port.pre.mk>
CONFDIR= ${PREFIX}/${CONFDIR_REL}
.if ${APACHE_VERSION} == "13"
CONFDIR_REL= ${APACHEETCDIR}
.else
CONFDIR_REL= ${APACHEETCDIR}/Includes
.endif
PLIST_SUB+= CONFDIR=${CONFDIR_REL}
.else
# Weirdness - need to include in this branch of the .if because
# it was included in the other one. The other branch needs
# the include performed after the USE_APACHE variable is set so
# APACHE_VERSION can be tested above.
.include <bsd.port.pre.mk>
PLIST_SUB+= NOAPACHE="@comment "
PKGMESSAGE= pkg-message-noapache
SUB_FILES+= pkg-message-noapache
.endif
# Always set these so the pkg-message displays correctly
CONFDIR= ${PREFIX}/${CONFDIR_REL}
CONFDIR_REL= ${APACHEETCDIR}/Includes
PLIST_SUB+= CONFDIR=${CONFDIR_REL}
SUB_FILES+= LocalSite.cfg
post-patch:
@ -84,7 +106,7 @@ post-install:
${CONFDIR}/foswiki.conf.sample; \
else \
${ECHO_MSG} "" ; \
${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
${ECHO_MSG} "Please check your Apache installation -" ; \
${ECHO_MSG} "${CONFDIR} doesn't exist," ; \
${ECHO_MSG} "so I cannot install foswiki.conf.sample there!" ; \
${ECHO_MSG} "" ; \

View File

@ -1,35 +1,7 @@
*********************************************************************
You have just installed Foswiki without a sample Apache configuration
file.
You have just installed Foswiki without configuring it for a specific
web server.
To complete the installation, please:
- Create the file %%CONFDIR%%/foswiki.conf
(%%WWWDIR%%/foswiki_httpd_conf.txt may be used as a guide)
- If you want to configure Foswiki from a remote machine, search for the
following in %%CONFDIR%%/foswiki.conf:
<FilesMatch "^configure.*">
SetHandler cgi-script
Order Deny,Allow
Deny from all
Allow from 127.0.0.1
Require user JohnDoe
Satisfy Any
</FilesMatch>
Add your IP address to the end of the "Allow from 127.0.0.1" line, and
you will be able to access the configure script without logging in. Make
sure to remove your IP after you have set up your own user account.
- Restart Apache.
- Browse to the /foswiki URL on your web server and enter the configuration
page.
- Configure the Foswiki installation according to your needs.
- Visit http://foswiki.org/System/InstallationGuide#Configure_Foswiki for
additional post-installation configuration information.
To complete the installation, please visit:
http://foswiki.org/System/InstallationGuide