[27443] trunk/dports/net/argus-monitor
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 3 22:01:56 PDT 2007
Revision: 27443
http://trac.macosforge.org/projects/macports/changeset/27443
Author: markd at macports.org
Date: 2007-08-03 22:01:56 -0700 (Fri, 03 Aug 2007)
Log Message:
-----------
Minor fixes related to the auth file; ui_msg fix; patch fix.
Modified Paths:
--------------
trunk/dports/net/argus-monitor/Portfile
trunk/dports/net/argus-monitor/files/patch-Makefile.tplt
Modified: trunk/dports/net/argus-monitor/Portfile
===================================================================
--- trunk/dports/net/argus-monitor/Portfile 2007-08-04 04:49:55 UTC (rev 27442)
+++ trunk/dports/net/argus-monitor/Portfile 2007-08-04 05:01:56 UTC (rev 27443)
@@ -14,7 +14,6 @@
distfiles argus-${version}.tgz
worksrcdir argus-${version}
-
depends_lib port:perl5.8 \
port:postfix \
port:openssl \
@@ -46,7 +45,7 @@
# Set the --data_dir configure argument and give me a pointer to it for later reference.
set argus_data_dir ${prefix}/var/argus-monitor
-# Set the Argus' htdocs directory.
+# Set the Argus htdocs directory.
set argus_htdocs ${prefix}/share/${name}/htdocs
configure.args --bin_dir=${prefix}/bin \
@@ -83,8 +82,7 @@
${destroot}${argus_data_dir}/perl \
${destroot}${argus_data_dir}/stats \
${destroot}${argus_data_dir}/html \
- ${destroot}${argus_data_dir}/notify \
- ${destroot}${argus_data_dir}/auth
+ ${destroot}${argus_data_dir}/notify
}
post-install {
@@ -97,7 +95,7 @@
-Add a directive for the Argus data directory
- ScriptAlias /argus \"${argus_htdocs}/cgi-bin/argus.cgi\"
+ ScriptAlias /argus \"${argus_htdocs}/cgi-bin/arguscgi\"
<Directory \"${argus_htdocs}/cgi-bin\">
Allow from all
Options ExecCGI
Modified: trunk/dports/net/argus-monitor/files/patch-Makefile.tplt
===================================================================
--- trunk/dports/net/argus-monitor/files/patch-Makefile.tplt 2007-08-04 04:49:55 UTC (rev 27442)
+++ trunk/dports/net/argus-monitor/files/patch-Makefile.tplt 2007-08-04 05:01:56 UTC (rev 27443)
@@ -1,101 +1,91 @@
---- Makefile.tplt.org 2007-06-01 16:30:47.000000000 -0700
-+++ Makefile.tplt 2007-07-25 20:41:28.000000000 -0700
-@@ -131,23 +131,23 @@
- $(INSTALL_DATA)/gdata $(INSTALL_DATA)/perl install-locale install-message
-
- install-lib:
-- -mkdir -p $(INSTALL_LIB)
-+ -mkdir -p $(DESTDIR)$(INSTALL_LIB)
- $(PERL) tools/install_lib -s src -l $(INSTALL_LIB) $(LIBS)
-- cp $(TEXT) $(INSTALL_LIB)/
-+ cp $(TEXT) $(DESTDIR)$(INSTALL_LIB)/
-
- install-prog: upgrade-cgi
-- -mkdir -p $(INSTALL_SBIN)
-- -mkdir -p $(INSTALL_BIN)
-- -mkdir -p $(INSTALL_CGI)
-- -mkdir -p $(INSTALL_LIB)
-- cp built/argusd $(INSTALL_SBIN)/
-- cp built/argusctl $(INSTALL_SBIN)/
-- cp built/arguscgi $(INSTALL_CGI)/
-- cp built/graphd $(INSTALL_LIB)/
-- cp built/picasso $(INSTALL_LIB)/
-- cp built/argus-config $(INSTALL_BIN)/
-- cp built/argus-agent $(INSTALL_SBIN)/
-- cp built/argusvxml $(INSTALL_CGI)/
-+ -mkdir -p $(DESTDIR)$(INSTALL_SBIN)
-+ -mkdir -p $(DESTDIR)$(INSTALL_BIN)
-+ -mkdir -p $(DESTDIR)$(INSTALL_CGI)
-+ -mkdir -p $(DESTDIR)$(INSTALL_LIB)
-+ cp built/argusd $(DESTDIR)$(INSTALL_SBIN)/
-+ cp built/argusctl $(DESTDIR)$(INSTALL_SBIN)/
-+ cp built/arguscgi $(DESTDIR)$(INSTALL_CGI)/
-+ cp built/graphd $(DESTDIR)$(INSTALL_LIB)/
-+ cp built/picasso $(DESTDIR)$(INSTALL_LIB)/
-+ cp built/argus-config $(DESTDIR)$(INSTALL_BIN)/
-+ cp built/argus-agent $(DESTDIR)$(INSTALL_SBIN)/
-+ cp built/argusvxml $(DESTDIR)$(INSTALL_CGI)/
-
- # previously, cgi was installed in sbin with symlink
- # cleanup old the files
-@@ -164,16 +164,16 @@
- # while a+rwx may be not be optimal security-wise,
- # it reduces the amount of support email the author receives
- $(INSTALL_DATA):
-- mkdir -p $(INSTALL_DATA)/stats $(INSTALL_DATA)/html $(INSTALL_DATA)/notify
-- touch $(INSTALL_DATA)/log
-- $(PERL) -e 'print getppid, "\n"' > $(INSTALL_DATA)/notno
-- chmod a+rwx $(INSTALL_DATA)
-- chmod a+r $(INSTALL_DATA)/html $(INSTALL_DATA)/log
-+ mkdir -p $(DESTDIR)$(INSTALL_DATA)/stats $(DESTDIR)$(INSTALL_DATA)/html $(DESTDIR)$(INSTALL_DATA)/notify
-+ touch $(DESTDIR)$(INSTALL_DATA)/log
-+ $(PERL) -e 'print getppid, "\n"' > $(DESTDIR)$(INSTALL_DATA)/notno
-+ chmod a+rwx $(DESTDIR)$(INSTALL_DATA)
-+ chmod a+r $(DESTDIR)$(INSTALL_DATA)/html $(DESTDIR)$(INSTALL_DATA)/log
- @echo ''
- @echo creating example files...
- @sleep 1
-- @cp examples/users $(INSTALL_DATA)/users.example
-- @cp examples/config $(INSTALL_DATA)/config.example
-+ @cp examples/users $(DESTDIR)$(INSTALL_DATA)/users.example
-+ @cp examples/config $(DESTDIR)$(INSTALL_DATA)/config.example
- @echo ''
- @echo '***' you will need to create/edit the files \'$(INSTALL_DATA)/config\'
- @echo '*** ' and \'$(INSTALL_DATA)/users\'
-@@ -182,26 +182,26 @@
-
- # if this is an upgrade, gdata might not exist even though data does
- $(INSTALL_DATA)/gdata: $(INSTALL_DATA)
-- if test ! -d $(INSTALL_DATA)/gdata; then mkdir $(INSTALL_DATA)/gdata; \
-- chmod a+rwx $(INSTALL_DATA)/gdata; fi
-- if test ! -d $(INSTALL_DATA)/gcache; then mkdir $(INSTALL_DATA)/gcache; \
-- chmod a+rwx $(INSTALL_DATA)/gcache; fi
-+ if test ! -d $(INSTALL_DATA)/gdata; then mkdir $(DESTDIR)$(INSTALL_DATA)/gdata; \
-+ chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/gdata; fi
-+ if test ! -d $(INSTALL_DATA)/gcache; then mkdir $(DESTDIR)$(INSTALL_DATA)/gcache; \
-+ chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/gcache; fi
-
- $(INSTALL_DATA)/perl: $(INSTALL_DATA)
- if test ! -d $(INSTALL_DATA)/perl; then \
-- mkdir $(INSTALL_DATA)/perl; \
-- chmod a+rwx $(INSTALL_DATA)/perl; \
-+ mkdir $(DESTDIR)$(INSTALL_DATA)/perl; \
-+ chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/perl; \
- fi
-
- install-locale: $(INSTALL_DATA)
- if test ! -d $(INSTALL_DATA)/locale; then \
-- mkdir $(INSTALL_DATA)/locale; \
-- chmod a+rx $(INSTALL_DATA)/locale; \
-+ mkdir $(DESTDIR)$(INSTALL_DATA)/locale; \
-+ chmod a+rx $(DESTDIR)$(INSTALL_DATA)/locale; \
- fi
-- -cp locale/* $(INSTALL_DATA)/locale
-+ -cp locale/* $(DESTDIR)$(INSTALL_DATA)/locale
-
- install-conf:
-- cp built/conf.pl $(INSTALL_LIB)
-+ cp built/conf.pl $(DESTDIR)$(INSTALL_LIB)
-
- HTML/config-details.html: $(BUILD)
- built/argusd -DH > HTML/config-details.html
+130c130
+< install: install-lib install-prog install-conf remove-auth $(INSTALL_DATA) \
+---
+> install: install-lib install-prog install-conf $(INSTALL_DATA) \
+134c134
+< -mkdir -p $(INSTALL_LIB)
+---
+> -mkdir -p $(DESTDIR)$(INSTALL_LIB)
+136c136
+< cp $(TEXT) $(INSTALL_LIB)/
+---
+> cp $(TEXT) $(DESTDIR)$(INSTALL_LIB)/
+139,155c139,150
+< -mkdir -p $(INSTALL_SBIN)
+< -mkdir -p $(INSTALL_BIN)
+< -mkdir -p $(INSTALL_CGI)
+< -mkdir -p $(INSTALL_LIB)
+< cp built/argusd $(INSTALL_SBIN)/
+< cp built/argusctl $(INSTALL_SBIN)/
+< cp built/arguscgi $(INSTALL_CGI)/
+< cp built/graphd $(INSTALL_LIB)/
+< cp built/picasso $(INSTALL_LIB)/
+< cp built/argus-config $(INSTALL_BIN)/
+< cp built/argus-agent $(INSTALL_SBIN)/
+< cp built/argusvxml $(INSTALL_CGI)/
+<
+< # previously, cgi was installed in sbin with symlink
+< # cleanup old the files
+< upgrade-cgi:
+< -rm $(INSTALL_SBIN)/arguscgi $(INSTALL_CGI)/arguscgi
+---
+> -mkdir -p $(DESTDIR)$(INSTALL_SBIN)
+> -mkdir -p $(DESTDIR)$(INSTALL_BIN)
+> -mkdir -p $(DESTDIR)$(INSTALL_CGI)
+> -mkdir -p $(DESTDIR)$(INSTALL_LIB)
+> cp built/argusd $(DESTDIR)$(INSTALL_SBIN)/
+> cp built/argusctl $(DESTDIR)$(INSTALL_SBIN)/
+> cp built/arguscgi $(DESTDIR)$(INSTALL_CGI)/
+> cp built/graphd $(DESTDIR)$(INSTALL_LIB)/
+> cp built/picasso $(DESTDIR)$(INSTALL_LIB)/
+> cp built/argus-config $(DESTDIR)$(INSTALL_BIN)/
+> cp built/argus-agent $(DESTDIR)$(INSTALL_SBIN)/
+> cp built/argusvxml $(DESTDIR)$(INSTALL_CGI)/
+167,171c162,166
+< mkdir -p $(INSTALL_DATA)/stats $(INSTALL_DATA)/html $(INSTALL_DATA)/notify
+< touch $(INSTALL_DATA)/log
+< $(PERL) -e 'print getppid, "\n"' > $(INSTALL_DATA)/notno
+< chmod a+rwx $(INSTALL_DATA)
+< chmod a+r $(INSTALL_DATA)/html $(INSTALL_DATA)/log
+---
+> mkdir -p $(DESTDIR)$(INSTALL_DATA)/stats $(DESTDIR)$(INSTALL_DATA)/html $(DESTDIR)$(INSTALL_DATA)/notify
+> touch $(DESTDIR)$(INSTALL_DATA)/log
+> $(PERL) -e 'print getppid, "\n"' > $(DESTDIR)$(INSTALL_DATA)/notno
+> chmod a+rwx $(DESTDIR)$(INSTALL_DATA)
+> chmod a+r $(DESTDIR)$(INSTALL_DATA)/html $(DESTDIR)$(INSTALL_DATA)/log
+175,176c170,171
+< @cp examples/users $(INSTALL_DATA)/users.example
+< @cp examples/config $(INSTALL_DATA)/config.example
+---
+> @cp examples/users $(DESTDIR)$(INSTALL_DATA)/users.example
+> @cp examples/config $(DESTDIR)$(INSTALL_DATA)/config.example
+185,188c180,183
+< if test ! -d $(INSTALL_DATA)/gdata; then mkdir $(INSTALL_DATA)/gdata; \
+< chmod a+rwx $(INSTALL_DATA)/gdata; fi
+< if test ! -d $(INSTALL_DATA)/gcache; then mkdir $(INSTALL_DATA)/gcache; \
+< chmod a+rwx $(INSTALL_DATA)/gcache; fi
+---
+> if test ! -d $(INSTALL_DATA)/gdata; then mkdir $(DESTDIR)$(INSTALL_DATA)/gdata; \
+> chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/gdata; fi
+> if test ! -d $(INSTALL_DATA)/gcache; then mkdir $(DESTDIR)$(INSTALL_DATA)/gcache; \
+> chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/gcache; fi
+192,193c187,188
+< mkdir $(INSTALL_DATA)/perl; \
+< chmod a+rwx $(INSTALL_DATA)/perl; \
+---
+> mkdir $(DESTDIR)$(INSTALL_DATA)/perl; \
+> chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/perl; \
+198,199c193,194
+< mkdir $(INSTALL_DATA)/locale; \
+< chmod a+rx $(INSTALL_DATA)/locale; \
+---
+> mkdir $(DESTDIR)$(INSTALL_DATA)/locale; \
+> chmod a+rx $(DESTDIR)$(INSTALL_DATA)/locale; \
+201c196
+< -cp locale/* $(INSTALL_DATA)/locale
+---
+> -cp locale/* $(DESTDIR)$(INSTALL_DATA)/locale
+204c199
+< cp built/conf.pl $(INSTALL_LIB)
+---
+> cp built/conf.pl $(DESTDIR)$(INSTALL_LIB)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070803/0d68c7fa/attachment.html
More information about the macports-changes
mailing list