Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Sep 2014 20:09:30 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368994 - in head/net-mgmt/nagios: . files
Message-ID:  <201409222009.s8MK9UTN091585@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Mon Sep 22 20:09:29 2014
New Revision: 368994
URL: http://svnweb.freebsd.org/changeset/ports/368994
QAT: https://qat.redports.org/buildarchive/r368994/

Log:
  Don't use autotools any more.
  
  Sponsored by:	Absolight

Deleted:
  head/net-mgmt/nagios/files/patch-configure.in
Modified:
  head/net-mgmt/nagios/Makefile
  head/net-mgmt/nagios/pkg-plist

Modified: head/net-mgmt/nagios/Makefile
==============================================================================
--- head/net-mgmt/nagios/Makefile	Mon Sep 22 19:50:15 2014	(r368993)
+++ head/net-mgmt/nagios/Makefile	Mon Sep 22 20:09:29 2014	(r368994)
@@ -19,7 +19,6 @@ PORTSCOUT=	limit:^3.
 
 USES=		iconv perl5 uidfix
 USE_PERL5=	build
-USE_AUTOTOOLS=	autoconf
 USE_PHP=	yes
 USE_RC_SUBR=	nagios
 
@@ -34,7 +33,6 @@ CONFIGURE_ARGS=	--with-command-user=${NA
 		--with-cgiurl=${NAGIOSCGIURL} \
 		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
-		--datarootdir=${PREFIX}/${NAGIOSWWWDIR} \
 		--datadir=${PREFIX}/${NAGIOSWWWDIR} \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
@@ -101,6 +99,7 @@ post-extract:
 .include <bsd.port.options.mk>
 
 post-patch:
+	@${REINPLACE_CMD} '/^INSTALL_OPTS=/d' ${WRKSRC}/configure
 .if ${PORT_OPTIONS:MUNHANDLED_HACK}
 	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
 		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php

Modified: head/net-mgmt/nagios/pkg-plist
==============================================================================
--- head/net-mgmt/nagios/pkg-plist	Mon Sep 22 19:50:15 2014	(r368993)
+++ head/net-mgmt/nagios/pkg-plist	Mon Sep 22 20:09:29 2014	(r368994)
@@ -1,10 +1,3 @@
-@exec mkdir -p %D/%%NAGIOSWWWDIR%%/ssi
-@exec mkdir -p %%NAGIOSDIR%%/archives
-@exec mkdir -p %%NAGIOSDIR%%/checkresults
-@exec mkdir -p %%NAGIOSDIR%%/rw
-@exec chmod 775 %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults %%NAGIOSDIR%%/rw
-@exec chown %%NAGIOSUSER%%:%%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults
-@exec chown %%NAGIOSUSER%%:%%WWWGRP%% %%NAGIOSDIR%%/rw
 bin/nagios
 bin/nagiostats
 %%EMBEDDED_PERL%%bin/p1.pl
@@ -380,25 +373,10 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/stylesheets/summary.css
 %%NAGIOSWWWDIR%%/stylesheets/tac.css
 %%NAGIOSWWWDIR%%/stylesheets/trends.css
-@dirrmtry etc/nagios/objects
-@dirrmtry etc/nagios
-@dirrm %%NAGIOSWWWDIR%%/cgi-bin
-@dirrm %%NAGIOSWWWDIR%%/contexthelp
-@dirrm %%NAGIOSWWWDIR%%/docs/images
-@dirrm %%NAGIOSWWWDIR%%/docs
-@dirrm %%NAGIOSWWWDIR%%/images/logos
-@dirrm %%NAGIOSWWWDIR%%/images
-@dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib
-@dirrm %%NAGIOSWWWDIR%%/includes/rss
-@dirrm %%NAGIOSWWWDIR%%/includes
-@dirrm %%NAGIOSWWWDIR%%/js
-@dirrm %%NAGIOSWWWDIR%%/media
-@dirrm %%NAGIOSWWWDIR%%/ssi
-@dirrm %%NAGIOSWWWDIR%%/stylesheets
-@dirrmtry %%NAGIOSWWWDIR%%
-@dirrmtry %%NAGIOSDIR%%/archives
-@dirrmtry %%NAGIOSDIR%%/checkresults
-@dirrmtry %%NAGIOSDIR%%/rw
-@dirrmtry %%NAGIOSDIR%%
+@dir %%NAGIOSWWWDIR%%/ssi
+@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives
+@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/checkresults
+@dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw
+@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%
 @unexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi
 @unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409222009.s8MK9UTN091585>