Attachment 13360 Details for Bug 25482 – file.diff

[patch] file.diff

file.diff (text/plain), 12.58 KB, created by George Reid on 2001-03-01 22:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George Reid

Created: 2001-03-01 22:20:01 UTC

Size: 12.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/home/ncvs/ports/net/netsaint/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- Makefile	2001/02/12 10:01:06	1.6
>+++ Makefile	2001/03/01 21:49:33
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	netsaint
>-PORTVERSION=	0.0.6
>-PORTREVISION=	1
>+PORTVERSION=	0.0.7b2
> CATEGORIES=	net
> MASTER_SITES=	http://netsaint.sourceforge.net/download/
> 
>Index: distinfo
>===================================================================
>RCS file: /usr/home/ncvs/ports/net/netsaint/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	2001/01/12 23:36:31	1.2
>+++ distinfo	2001/03/01 21:57:03
>@@ -1 +1 @@
>-MD5 (netsaint-0.0.6.tar.gz) = 0d85b66c7258fcb8dd3fbf775dd7728d
>+MD5 (netsaint-0.0.7b2.tar.gz) = 37a6ebe592888a4c7e25d7dbd5689007
>Index: pkg-plist
>===================================================================
>RCS file: /usr/home/ncvs/ports/net/netsaint/pkg-plist,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-plist
>--- pkg-plist	2001/01/12 23:36:31	1.3
>+++ pkg-plist	2001/03/01 22:16:29
>@@ -7,7 +7,6 @@
> etc/rc.d/netsaint.sh
> share/netsaint/docs/about.html
> share/netsaint/docs/addons.html
>-share/netsaint/docs/bigtime.html
> share/netsaint/docs/cgiauth.html
> share/netsaint/docs/cgis.html
> share/netsaint/docs/checkscheduling.html
>@@ -17,6 +16,7 @@
> share/netsaint/docs/configcgi.html
> share/netsaint/docs/confighost.html
> share/netsaint/docs/configmain.html
>+share/netsaint/docs/dependencies.html
> share/netsaint/docs/developer/commentfile.html
> share/netsaint/docs/developer/images/xcdapi.gif
> share/netsaint/docs/developer/images/xedapi.gif
>@@ -34,12 +34,15 @@
> share/netsaint/docs/developer/xrd.html
> share/netsaint/docs/developer/xsd.html
> share/netsaint/docs/distributed.html
>+share/netsaint/docs/downtime.html
> share/netsaint/docs/escalations.html
> share/netsaint/docs/eventhandlers.html
> share/netsaint/docs/extcommands.html
> share/netsaint/docs/faqs.html
>+share/netsaint/docs/flapping.html
> share/netsaint/docs/funstuff.html
> share/netsaint/docs/images/activepassive.gif
>+share/netsaint/docs/images/avail_cgi.gif
> share/netsaint/docs/images/checktiming.gif
> share/netsaint/docs/images/cmd_cgi.gif
> share/netsaint/docs/images/config_cgi.gif
>@@ -48,6 +51,7 @@
> share/netsaint/docs/images/extinfo_cgi_b.gif
> share/netsaint/docs/images/extinfo_cgi_c.gif
> share/netsaint/docs/images/extinfo_cgi_d.gif
>+share/netsaint/docs/images/extinfo_cgi_e.gif
> share/netsaint/docs/images/history_cgi.gif
> share/netsaint/docs/images/indirecthostcheck.gif
> share/netsaint/docs/images/indirectsvccheck.gif
>@@ -66,11 +70,16 @@
> share/netsaint/docs/images/plugintheory.gif
> share/netsaint/docs/images/redundancy-1.gif
> share/netsaint/docs/images/redundancy-2.gif
>+share/netsaint/docs/images/service-dependencies.gif
> share/netsaint/docs/images/showlog_cgi.gif
>+share/netsaint/docs/images/statetransitions.gif
>+share/netsaint/docs/images/statetransitions2.gif
> share/netsaint/docs/images/status_cgi_a.gif
> share/netsaint/docs/images/status_cgi_b.gif
> share/netsaint/docs/images/statusmap_cgi.gif
>+share/netsaint/docs/images/statuswml_cgi.gif
> share/netsaint/docs/images/statuswrl_cgi.gif
>+share/netsaint/docs/images/tac_cgi.gif
> share/netsaint/docs/images/trends_cgi.gif
> share/netsaint/docs/index.html
> share/netsaint/docs/indirectchecks.html
>@@ -84,6 +93,7 @@
> share/netsaint/docs/oldplugins.html
> share/netsaint/docs/parallelization.html
> share/netsaint/docs/passivechecks.html
>+share/netsaint/docs/perfdata.html
> share/netsaint/docs/pluginhowto.html
> share/netsaint/docs/plugins.html
> share/netsaint/docs/plugintheory.html
>@@ -97,38 +107,33 @@
> share/netsaint/docs/stoprestart.html
> share/netsaint/docs/theory.html
> share/netsaint/docs/timeperiods.html
>+share/netsaint/docs/tuning.html
> share/netsaint/docs/verifyconfig.html
> share/netsaint/docs/volatileservices.html
> share/netsaint/docs/whatsnew.html
>+share/netsaint/docs/xdata-db.html
> share/netsaint/images/ack.gif
> share/netsaint/images/active.gif
> share/netsaint/images/command.gif
>-share/netsaint/images/commandsbar.gif
> share/netsaint/images/comment.gif
> share/netsaint/images/config.gif
> share/netsaint/images/contact.gif
> share/netsaint/images/contactgroup.gif
>-share/netsaint/images/contactgroupsbar.gif
>-share/netsaint/images/contactsbar.gif
> share/netsaint/images/critical.gif
> share/netsaint/images/delay.gif
> share/netsaint/images/delete.gif
> share/netsaint/images/disabled.gif
>-share/netsaint/images/docbar.gif
> share/netsaint/images/down.gif
>+share/netsaint/images/downtime.gif
> share/netsaint/images/enabled.gif
> share/netsaint/images/extinfo.gif
>+share/netsaint/images/flapping.gif
> share/netsaint/images/greendot.gif
> share/netsaint/images/history.gif
>-share/netsaint/images/historybar.gif
>-share/netsaint/images/homebar.gif
> share/netsaint/images/host.gif
> share/netsaint/images/hostevent.gif
>-share/netsaint/images/hostgroupsbar.gif
>-share/netsaint/images/hostsbar.gif
> share/netsaint/images/info.gif
> share/netsaint/images/left.gif
>-share/netsaint/images/logfilebar.gif
> share/netsaint/images/logofullsize.gif
> share/netsaint/images/logos/aix.gd2
> share/netsaint/images/logos/aix.gif
>@@ -198,15 +203,11 @@
> share/netsaint/images/logrotate.gif
> share/netsaint/images/logs.gif
> share/netsaint/images/ndisabled.gif
>-share/netsaint/images/networkhealthbar.gif
>-share/netsaint/images/networkoutagesbar.gif
> share/netsaint/images/noack.gif
> share/netsaint/images/notes.gif
>-share/netsaint/images/notificationsbar.gif
> share/netsaint/images/notify.gif
> share/netsaint/images/orangedot.gif
> share/netsaint/images/parentup.gif
>-share/netsaint/images/processinfobar.gif
> share/netsaint/images/recovery.gif
> share/netsaint/images/restart.gif
> share/netsaint/images/right.gif
>@@ -215,39 +216,35 @@
> share/netsaint/images/sbgeneral.gif
> share/netsaint/images/sblogo.gif
> share/netsaint/images/sbmonitor.gif
>-share/netsaint/images/scale.gif
> share/netsaint/images/serviceevent.gif
>-share/netsaint/images/serviceproblemsbar.gif
>-share/netsaint/images/servicesbar.gif
>+share/netsaint/images/sideback.jpg
> share/netsaint/images/standby.gif
> share/netsaint/images/start.gif
> share/netsaint/images/status.gif
> share/netsaint/images/status2.gif
> share/netsaint/images/status3.gif
> share/netsaint/images/status4.gif
>-share/netsaint/images/statusdetailbar.gif
>-share/netsaint/images/statusmapbar.gif
>-share/netsaint/images/statusoverviewbar.gif
>-share/netsaint/images/statussummarybar.gif
>-share/netsaint/images/statusworldbar.gif
> share/netsaint/images/stop.gif
>+share/netsaint/images/tacdisabled.jpg
>+share/netsaint/images/tacenabled.jpg
> share/netsaint/images/thermcrit.gif
> share/netsaint/images/thermok.gif
> share/netsaint/images/thermwarn.gif
>-share/netsaint/images/timeperiodsbar.gif
> share/netsaint/images/trends.gif
>-share/netsaint/images/trendsbar.gif
> share/netsaint/images/trendshost.png
> share/netsaint/images/trendssvc.png
> share/netsaint/images/unknown.gif
> share/netsaint/images/up.gif
> share/netsaint/images/warning.gif
>+share/netsaint/images/zoom1.gif
>+share/netsaint/images/zoom2.gif
> share/netsaint/index.html
> share/netsaint/main.html
> share/netsaint/media/critical.wav
> share/netsaint/media/hostdown.wav
> share/netsaint/media/warning.wav
> share/netsaint/robots.txt
>+share/netsaint/sbin/avail.cgi
> share/netsaint/sbin/cmd.cgi
> share/netsaint/sbin/config.cgi
> share/netsaint/sbin/extinfo.cgi
>@@ -257,9 +254,12 @@
> share/netsaint/sbin/showlog.cgi
> share/netsaint/sbin/status.cgi
> share/netsaint/sbin/statusmap.cgi
>+share/netsaint/sbin/statuswml.cgi
> share/netsaint/sbin/statuswrl.cgi
>+share/netsaint/sbin/tac.cgi
> share/netsaint/sbin/trends.cgi
> share/netsaint/side.html
>+share/netsaint/stylesheets/avail.css
> share/netsaint/stylesheets/cmd.css
> share/netsaint/stylesheets/config.css
> share/netsaint/stylesheets/extinfo.css
>@@ -269,14 +269,18 @@
> share/netsaint/stylesheets/showlog.css
> share/netsaint/stylesheets/status.css
> share/netsaint/stylesheets/statusmap.css
>+share/netsaint/stylesheets/tac.css
> share/netsaint/stylesheets/trends.css
> @dirrm etc/netsaint
>-@dirrm share/netsaint/docs/developer/images
>+@dirrm share/netsaint
>+@dirrm share/netsaint/docs
> @dirrm share/netsaint/docs/developer
>+@dirrm share/netsaint/docs/developer/images
> @dirrm share/netsaint/docs/images
>-@dirrm share/netsaint/docs
>-@dirrm share/netsaint/images/logos
> @dirrm share/netsaint/images
>+@dirrm share/netsaint/images/logos
> @dirrm share/netsaint/media
> @dirrm share/netsaint/sbin
> @dirrm share/netsaint/stylesheets
>+@dirrm var/netsaint
>+@dirrm var/netsaint/archives
>Index: files/patch-aa
>===================================================================
>RCS file: /usr/home/ncvs/ports/net/netsaint/files/patch-aa,v
>retrieving revision 1.2
>diff -u -r1.2 patch-aa
>--- files/patch-aa	2001/01/12 23:36:31	1.2
>+++ files/patch-aa	2001/03/01 21:59:15
>@@ -1,5 +1,5 @@
>---- Makefile.in.orig	Sun Oct 29 14:43:54 2000
>-+++ Makefile.in	Fri Jan 12 14:54:45 2001
>+--- Makefile.in.orig	Thu Mar  1 04:49:19 2001
>++++ Makefile.in	Thu Mar  1 21:59:03 2001
> @@ -27,7 +27,7 @@
>  INSTALL_OPTS=@INSTALL_OPTS@
>  COMMAND_OPTS=@COMMAND_OPTS@
>@@ -7,10 +7,10 @@
> -INIT_OPTS=-o root -g root
> +INIT_OPTS=-o root -g wheel
>  CGICFGDIR=$(CGIDIR)
>+ PERLDIR=@PERLDIR@
>  
>- CGIEXTRAS=@CGIEXTRAS@
>-@@ -109,7 +109,7 @@
>- 	$(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint
>+@@ -108,7 +108,7 @@
>+ install-init: install-daemoninit
>  
>  install-daemoninit:
> -	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
>Index: files/patch-ab
>===================================================================
>RCS file: /usr/home/ncvs/ports/net/netsaint/files/patch-ab,v
>retrieving revision 1.2
>diff -u -r1.2 patch-ab
>--- files/patch-ab	2001/01/12 23:36:31	1.2
>+++ files/patch-ab	2001/03/01 21:58:56
>@@ -1,7 +1,7 @@
>---- base/Makefile.in.orig	Sun Jan  7 21:53:15 2001
>-+++ base/Makefile.in	Sun Jan  7 21:53:27 2001
>-@@ -83,7 +83,6 @@
>- 	rm -f *~
>+--- base/Makefile.in.orig	Sun Feb 18 22:33:22 2001
>++++ base/Makefile.in	Thu Mar  1 21:58:39 2001
>+@@ -86,7 +86,6 @@
>+ devclean: clean
>  
>  install:
> -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
>Index: files/patch-ad
>===================================================================
>RCS file: /usr/home/ncvs/ports/net/netsaint/files/patch-ad,v
>retrieving revision 1.1
>diff -u -r1.1 patch-ad
>--- files/patch-ad	2000/07/12 18:43:31	1.1
>+++ files/patch-ad	2001/03/01 21:58:30
>@@ -1,5 +1,5 @@
>---- configure	Fri Apr  7 11:11:34 2000
>-+++ configure.new	Sat Jun 10 21:21:25 2000
>+--- configure.orig	Thu Mar  1 04:54:12 2001
>++++ configure	Thu Mar  1 21:58:09 2001
> @@ -11,7 +11,7 @@
>  ac_help=
>  ac_default_prefix=/usr/local
>@@ -9,7 +9,7 @@
>  ac_help="$ac_help
>  --with-netsaint-user=<user> sets user name to run netsaint"
>  ac_help="$ac_help
>-@@ -61,12 +61,12 @@
>+@@ -117,12 +117,12 @@
>  x_includes=NONE
>  x_libraries=NONE
>  bindir='${exec_prefix}/bin'
>@@ -27,7 +27,7 @@
>  libdir='${exec_prefix}/lib'
>  includedir='${prefix}/include'
>  oldincludedir='/usr/include'
>-@@ -505,9 +505,9 @@
>+@@ -562,9 +562,9 @@
>  # Prefer explicitly selected file to automatically selected ones.
>  if test -z "$CONFIG_SITE"; then
>    if test "x$prefix" != xNONE; then
>@@ -39,7 +39,7 @@
>    fi
>  fi
>  for ac_site_file in $CONFIG_SITE; do
>-@@ -679,6 +679,9 @@
>+@@ -1298,6 +1298,9 @@
>  	LDFLAGS="${LDFLAGS} -L${withval}"
>  	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
>  	
>@@ -49,7 +49,7 @@
>  fi
>  
>  # Check whether --with-gd-inc or --without-gd-inc was given.
>-@@ -686,6 +689,8 @@
>+@@ -1305,6 +1308,8 @@
>    withval="$with_gd_inc"
>    
>  	CFLAGS="${CFLAGS} -I${withval}"
>Index: files/patch-ai
>===================================================================
>RCS file: /usr/home/ncvs/ports/net/netsaint/files/patch-ai,v
>retrieving revision 1.1
>diff -u -r1.1 patch-ai
>--- files/patch-ai	2000/07/12 18:43:32	1.1
>+++ files/patch-ai	2001/03/01 22:00:49
>@@ -1,22 +1,27 @@
>---- init-script.in	Fri Apr  7 11:11:37 2000
>-+++ init-script.in.new	Mon Jun 12 19:28:55 2000
>-@@ -26,11 +26,8 @@
>- #
>-   
>+--- daemon-init.in.orig	Sun Feb 18 22:33:21 2001
>++++ daemon-init.in	Thu Mar  1 22:00:37 2001
>+@@ -68,12 +68,9 @@
>+ 
>+ 
>  # Source function library
> -# Solaris doesn't have an rc.d directory, so do a test first
>--if [ -f /etc/rc.d/init.d/functions ]; then
>--. /etc/rc.d/init.d/functions
>--elif [ -f /etc/init.d/functions ]; then
>--. /etc/init.d/functions
>+-#if [ -f /etc/rc.d/init.d/functions ]; then
>+-#. /etc/rc.d/init.d/functions
>+-#elif [ -f /etc/init.d/functions ]; then
>+-#. /etc/init.d/functions
>+-#fi
> +if [ -f /usr/local/etc/netsaint/functions ]; then
> +. /usr/local/etc/netsaint/functions
>- fi
>++fi
>  
>  prefix=@prefix@
>-@@ -92,4 +89,4 @@
>-   
>- # End of this script
>-         
>--        
>+ exec_prefix=@exec_prefix@
>+@@ -92,7 +89,7 @@
>+ 
>+ # Check that netsaint exists.
>+ test -f $NetsaintBin || exit 0
>+-
> +        
>+ # Check that netsaint.cfg exists.
>+ test -f $NetsaintCfg || exit 0
>+

Actions: View | Diff

Attachments on bug 25482: 13360