svn commit: r368994 - in head/net-mgmt/nagios: . files

Mathieu Arnold mat at FreeBSD.org
Mon Sep 22 20:09:31 UTC 2014


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 @@
- at exec mkdir -p %D/%%NAGIOSWWWDIR%%/ssi
- at exec mkdir -p %%NAGIOSDIR%%/archives
- at exec mkdir -p %%NAGIOSDIR%%/checkresults
- at exec mkdir -p %%NAGIOSDIR%%/rw
- at exec chmod 775 %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults %%NAGIOSDIR%%/rw
- at exec chown %%NAGIOSUSER%%:%%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults
- at 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
- at dirrmtry etc/nagios/objects
- at dirrmtry etc/nagios
- at dirrm %%NAGIOSWWWDIR%%/cgi-bin
- at dirrm %%NAGIOSWWWDIR%%/contexthelp
- at dirrm %%NAGIOSWWWDIR%%/docs/images
- at dirrm %%NAGIOSWWWDIR%%/docs
- at dirrm %%NAGIOSWWWDIR%%/images/logos
- at dirrm %%NAGIOSWWWDIR%%/images
- at dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib
- at dirrm %%NAGIOSWWWDIR%%/includes/rss
- at dirrm %%NAGIOSWWWDIR%%/includes
- at dirrm %%NAGIOSWWWDIR%%/js
- at dirrm %%NAGIOSWWWDIR%%/media
- at dirrm %%NAGIOSWWWDIR%%/ssi
- at dirrm %%NAGIOSWWWDIR%%/stylesheets
- at dirrmtry %%NAGIOSWWWDIR%%
- at dirrmtry %%NAGIOSDIR%%/archives
- at dirrmtry %%NAGIOSDIR%%/checkresults
- at dirrmtry %%NAGIOSDIR%%/rw
- at dirrmtry %%NAGIOSDIR%%
+ at dir %%NAGIOSWWWDIR%%/ssi
+ at dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives
+ at dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/checkresults
+ at dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw
+ at 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


More information about the svn-ports-head mailing list