tidy up icinga-web Makefile a bit, adjust DESCR.

not yet ready for consumption.

net/icinga/web/Makefile

@@ -1,81 +1,50 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/03/28 14:06:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.2 2011/03/31 09:42:21 sthen Exp $
 
-COMMENT=	web UI for icinga
-DISTNAME=	icinga-web-$V
+# Work in progress. Not yet linked to the build.
 
-BUILD_DEPENDS=	net/icinga/core,-api
-RUN_DEPENDS=	www/pear \
+COMMENT =	web UI for icinga
+DISTNAME =	icinga-web-$V
+REVISION =	0
+
+BUILD_DEPENDS =	icinga-api-$V:net/icinga/core,-api
+RUN_DEPENDS =	www/pear \
 		www/php5/core \
 		www/php5/extensions,-ldap \
 		www/php5/extensions,-pdo_mysql \
 		www/php5/extensions,-xsl \
-		net/icinga/core,-api
-# is icinga-api RUN_DEPENDS or not?
-# pdo_mysql  | pdo_pgsql
+		icinga-api-$V:net/icinga/core,-api
+# Optional php extensions: gd soap xmlrpc
+# Does this work with pgo_pgsql? So far haven't worked out how.
 
-#Optional php extension
-#        16/23 Test php5-soap ... (Extension soap does not exist) FAIL
-#        17/23 Test php5-xmlrpc ... (Extension xmlrpc does not exist) FAIL
-#        18/23 Test php5-iconv ... (iconv found) OK
-#        19/23 Test php5-gd ... (Extension gd does not exist) FAIL
-#        20/23 Test php5-ctype ... (ctype found) OK
-#        21/23 Test php5-json ... (json found v1.2.1) OK
-#        22/23 Test php5-hash ... (hash found v1.0) OK
-#        23/23 Test php.ini memory_limit ... (memory_limit='134217728') OK
+MAKE_FLAGS =	PREFIX=/var/www/icinga-web
+FAKE_FLAGS =	CFGDIR=${TRUEPREFIX}/share/examples/icinga
 
-
-
-#MODULES=	devel/gettext
-
-MAKE_FLAGS=	PREFIX=/var/www/icinga-web
-FAKE_FLAGS=	CFGDIR=${TRUEPREFIX}/share/examples/icinga
-
-USE_X11=	Yes
-CONFIGURE_STYLE=gnu
-# XXX some of this is probably crap copied from nagios or icinga/core
-CONFIGURE_ARGS+=--datarootdir=/var/www \
-		--with-icinga-api=/var/www/icinga-api \
-		--localstatedir=/var/icinga \
-		--sbindir=/var/www/cgi-bin/icinga \
-		--with-web-apache-path=/var/www/conf/modules.sample \
-		--with-api-cmd-file=/var/icinga/rw/icinga.cmd \
-		--with-web-user=www \
-		--with-web-group=www \
-		--with-bin-user=${SHAREOWN} \
-		--with-bin-group=${SHAREGRP}
-
-#		--with-web-absolute-path=/var/www/icinga-web 
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += \
+	--datarootdir=/var/www \
+	--with-icinga-api=/var/www/icinga-api \
+	--localstatedir=/var/icinga \
+	--sbindir=/var/www/cgi-bin/icinga \
+	--with-web-apache-path=/var/www/conf/modules.sample \
+	--with-api-cmd-file=/var/icinga/rw/icinga.cmd \
+	--with-web-user=www \
+	--with-web-group=www \
+	--with-bin-user=${SHAREOWN} \
+	--with-bin-group=${SHAREGRP} \
+	--with-db-socket=/var/run/mysql/mysql.sock
 
 #		--with-db-type=DBTYPE   Type of dbms (default mysql)
 #		--with-db-host=HOST     Host of dbms (default localhost)
 #		--with-db-port=PORT     Port of the dbms (default 3306)
-#		--with-db-name=DBNAME   DB name for icinga (default icinga_web)
-#		--with-db-user=USER     DB user for icinga (default icinga_web)
-#		--with-db-pass=PASS     DB pass for icinga (default icinga_web)
-##		--with-db-socket=SOCKET DB path to unix socket (default /tmp/mysql.sock)
 #		--with-api-type=APICON  API type (default CONNECTION_IDO)
 #		--with-api-subtype=TYPE DB driver or network connection
-#		--with-api-cmd-file=PATH Icinga command file (default /usr/local/icinga/var/rw/icinga.cmd)
 
+NO_REGRESS =	Yes
+NO_BUILD =	Yes
 
-NO_REGRESS=	Yes
-NO_BUILD=	Yes
+INSTALL_TARGET = install install-apache-config
 
-CFLAGS+=	-fPIC \
-		-I${LOCALBASE}/include \
-		-L${X11BASE}/lib -L${LOCALBASE}/lib
-#LDFLAGS=		
-
-#ALL_TARGET=		
-INSTALL_TARGET=	install install-apache-config
-# or install-javascript instead of install-apache-config?
-
-PREFIX=		/var/www
-#REGRESS_TARGET=	
-
-#pre-configure:
-#	@perl -pi -e 's, /etc/, ${SYSCONFDIR}/,' \
-#	    ${WRKSRC}/sample-config/httpd.conf
+PREFIX =	/var/www
 
 pre-install:
 	${INSTALL_DATA_DIR} ${WRKINST}/var/www/icinga-web

net/icinga/web/pkg/DESCR

@@ -1,2 +1,3 @@
-This package contains Icinga's modern API-based web frontend.
-The legacy frontend is also available in the icinga-cgi package.
+This package contains Icinga's modern API-based web frontend (requiring a
+database). The simpler classic frontend is also available in the icinga-cgi
+package.