From 20888a28dabd61eab83358db5834f5732e6c5f15 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Mon, 4 Jan 2010 19:10:19 +0000
Subject: [PATCH] - 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.
---
 www/statusnet/Makefile             | 25 ++++++-------------------
 www/statusnet/files/README.OpenBSD | 13 ++++++++++++-
 www/statusnet/pkg/MESSAGE          |  7 +------
 www/statusnet/pkg/PLIST            |  4 +++-
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/www/statusnet/Makefile b/www/statusnet/Makefile
index 9016d9dd18d..22bc46bb662 100644
--- a/www/statusnet/Makefile
+++ b/www/statusnet/Makefile
@@ -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}
diff --git a/www/statusnet/files/README.OpenBSD b/www/statusnet/files/README.OpenBSD
index 6e7450db863..5c078aa9c2e 100644
--- a/www/statusnet/files/README.OpenBSD
+++ b/www/statusnet/files/README.OpenBSD
@@ -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:
 
diff --git a/www/statusnet/pkg/MESSAGE b/www/statusnet/pkg/MESSAGE
index 7343028def4..ab58b8f697c 100644
--- a/www/statusnet/pkg/MESSAGE
+++ b/www/statusnet/pkg/MESSAGE
@@ -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.
diff --git a/www/statusnet/pkg/PLIST b/www/statusnet/pkg/PLIST
index af9fd98c950..d544bb8fdf4 100644
--- a/www/statusnet/pkg/PLIST
+++ b/www/statusnet/pkg/PLIST
@@ -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