- remove flavors and tell the user how to enable mysql/pgsql in README.OpenBSD instead

- merge part of MESSAGE into the README

based on feedback from ajacoutot@, thanks.
This commit is contained in:
jasper 2010-01-04 19:10:19 +00:00
parent d726173016
commit 20888a28da
4 changed files with 22 additions and 27 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2010/01/04 08:22:59 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2010/01/04 19:10:19 jasper Exp $
COMMENT= open source micro messaging platform
DISTNAME= statusnet-0.8.2
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= www net
@ -31,10 +31,10 @@ RUN_DEPENDS= ::databases/pear-DB \
::textproc/sphinx \
::www/apache-httpd \
::www/php-markdown \
:php${PHP_VERSION}-curl-*:www/php${PHP_VERSION}/extensions,-curl \
:php${PHP_VERSION}-gd-*:www/php${PHP_VERSION}/extensions,-gd \
:php${PHP_VERSION}-mbstring-*:www/php${PHP_VERSION}/extensions,-mbstring \
:php${PHP_VERSION}-tidy-*:www/php${PHP_VERSION}/extensions,-tidy
:php5-curl-*:www/php5/extensions,-curl \
:php5-gd-*:www/php5/extensions,-gd \
:php5-mbstring-*:www/php5/extensions,-mbstring \
:php5-tidy-*:www/php5/extensions,-tidy
NO_BUILD= Yes
NO_REGRESS= Yes
@ -44,19 +44,6 @@ PREFIX= /var/www
INSTDIR= ${PREFIX}/statusnet
SUBST_VARS= INSTDIR
PHP_VERSION= 5
FLAVORS= mysql pgsql
FLAVOR?= mysql
.if ${FLAVOR:L:Mmysql}
RUN_DEPENDS+= :php${PHP_VERSION}-mysql-*:www/php${PHP_VERSION}/extensions,-mysql
.elif ${FLAVOR:L:Mpgsql}
RUN_DEPENDS+= :php${PHP_VERSION}-pgsql-*:www/php${PHP_VERSION}/extensions,-pgsql
.else
ERRORS+= "Fatal: Invalid flavor: ${FLAVOR}"
.endif
do-install:
cp -Rp ${WRKSRC} ${INSTDIR}
${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${INSTDIR}

View File

@ -1,4 +1,4 @@
$OpenBSD: README.OpenBSD,v 1.2 2010/01/04 08:15:49 ajacoutot Exp $
$OpenBSD: README.OpenBSD,v 1.3 2010/01/04 19:10:19 jasper Exp $
This document will briefly describe the steps needed before one can
complete the Status.net installation. After taking these steps you
@ -8,8 +8,17 @@ and complete the installation.
Please refer to http://gitorious.org/statusnet/mainline/blobs/master/README
for a complete overview of how to setup Status.net with advanced features.
== Apache ==
You should point the Status.net installation directory to the
DocumentRoot of your web-server:
# ln -s ../statusnet /var/www/htdocs/statusnet
(make sure you use a relative symlink since Apache is chrooted)
== MySQL==
Please add the php5-mysql package to enable MySQL support in PHP.
MySQL users running with chroot'ed httpd might like to take the
following steps to place the mysql socket inside the chroot:
@ -37,6 +46,8 @@ Now connect to MySQL and create a user and database for Status.net:
== PostgreSQL ==
Please add the php5-pqsql package to enable PostgreSQL support in PHP.
Assuming you have an administrative account named `postgres',
you can create the 'statusnet' user and database like this:

View File

@ -1,9 +1,4 @@
Status.net has been installed into
${INSTDIR}
You should point this to the DocumentRoot of your web-server:
# ln -s ../statusnet /var/www/htdocs/statusnet
(make sure you use a relative symlink since Apache is chrooted)
Status.net has been installed into ${INSTDIR}
See ${PREFIX}/README.OpenBSD for information about configuring and running
Status.net on OpenBSD.

View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/01/03 17:29:36 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/01/04 19:10:19 jasper Exp $
@pkgpath www/statusnet,mysql
@pkgpath www/statusnet,pgsql
@owner www
statusnet/
statusnet/COPYING