Index: head/net-mgmt/nagios12/Makefile
===================================================================
--- head/net-mgmt/nagios12/Makefile	(revision 136125)
+++ head/net-mgmt/nagios12/Makefile	(revision 136126)
@@ -1,103 +1,101 @@
 # New ports collection makefile for:	nagios
 # Date created:				19 May 2002
 # Whom:					Blaz Zupan <blaz@si.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nagios
 PORTVERSION=	1.2
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
-
-BROKEN=		Changes ownership of installed files
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	yes
 USE_PERL5_BUILD=yes
 
 PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
 NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
 OPTIONS=	MYSQL "MySQL suport" off \
 		PGSQL "PostgreSQL suport" off \
 		FILE_PERFDATA "Save performance data to files" off
 
 CONFLICTS=	nagios-2*
 LATEST_LINK=	nagios12
 
 .include <bsd.port.pre.mk>
 
 CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -lgd"
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-command-grp=www \
 		--with-nagios-user=${NAGIOSUSER} \
 		--with-nagios-grp=${NAGIOSGROUP} \
 		--with-template-objects \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX}
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
 .else
 CONFIGURE_ARGS+=	--with-template-extinfo
 .endif
 
 .if defined(WITH_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
 SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
 		-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
 		-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
 		-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
 
 INSTALL_TARGET=	all install config install-config install-commandmode
 
 pre-build:
 	for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \
 		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \
 	done
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/net-mgmt/nagios12/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.44
\ No newline at end of property
+1.45
\ No newline at end of property
Index: head/net-mgmt/nagios12/files/patch-html-Makefile.in
===================================================================
--- head/net-mgmt/nagios12/files/patch-html-Makefile.in	(nonexistent)
+++ head/net-mgmt/nagios12/files/patch-html-Makefile.in	(revision 136126)
@@ -0,0 +1,12 @@
+--- html/Makefile.in.orig	Wed May 25 21:24:12 2005
++++ html/Makefile.in	Wed May 25 21:24:54 2005
+@@ -33,7 +33,9 @@
+ devclean: clean
+ 
+ install:
++.if !exists($(DESTDIR)$(HTMLDIR))
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
++.endif
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp

Property changes on: head/net-mgmt/nagios12/files/patch-html-Makefile.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property