[csw-devel] SF.net SVN: gar:[18721] csw/mgar/pkg/icinga/trunk
j_arndt at users.sourceforge.net
j_arndt at users.sourceforge.net
Fri Jul 13 10:26:33 CEST 2012
Revision: 18721
http://gar.svn.sourceforge.net/gar/?rev=18721&view=rev
Author: j_arndt
Date: 2012-07-13 08:26:33 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
icinga/trunk: update to 1.7.1
Modified Paths:
--------------
csw/mgar/pkg/icinga/trunk/Makefile
csw/mgar/pkg/icinga/trunk/checksums
csw/mgar/pkg/icinga/trunk/files/cswicinga
csw/mgar/pkg/icinga/trunk/files/cswusergroup
Added Paths:
-----------
csw/mgar/pkg/icinga/trunk/files/0001-use-of-CSW-perl.patch
csw/mgar/pkg/icinga/trunk/files/0002-changed-install-and-command-options-in-configure.patch
Removed Paths:
-------------
csw/mgar/pkg/icinga/trunk/files/CSWicinga.gspec
csw/mgar/pkg/icinga/trunk/files/CSWicinga.prototype
csw/mgar/pkg/icinga/trunk/files/cmd.c.diff
csw/mgar/pkg/icinga/trunk/files/install-opts.diff
csw/mgar/pkg/icinga/trunk/files/patch.diff
Modified: csw/mgar/pkg/icinga/trunk/Makefile
===================================================================
--- csw/mgar/pkg/icinga/trunk/Makefile 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/Makefile 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1,100 +1,226 @@
-NAME = icinga
-VERSION = 0.8.1
-CATEGORIES = apps
-GARTYPE = v2
+NAME = icinga
+VERSION = 1.7.1
+CATEGORIES = apps
+GARTYPE = v2
-DESCRIPTION = icinga network monitoring base package (no plugins)
+#
+# package definition
+#
+
+PACKAGES += CSWicinga
+
+SPKG_DESC_CSWicinga = Icinga network monitoring base package (no plugins)
+
+CATALOGNAME_CSWicinga = icinga
+
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
+
+#
+# blurb
+#
+
define BLURB
+ Icinga is an enterprise grade open source monitoring system which keeps watch over networks and any conceivable network resource, notifies the user of errors and recoveries and generates performance data for reporting. Icinga is a fork of Nagios and is backward compatible.
endef
-SF_PROJ = icinga
-MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWicinga, prototype)
-DISTFILES += cswicinga
-DISTFILES += cswusergroup
+#
+# download, distfiles, patchfiles
+#
-PATCHFILES = cmd.c.diff # cgi/cmd.c - GNU macro __attribute__ unknown to compiler
+MASTER_SITES = $(SF_MIRRORS)
+DISTNAME = $(NAME)-$(VERSION)
+DISTFILES = $(NAME)-$(VERSION).tar.gz
-PATCHFILES += patch.diff # http://article.gmane.org/gmane.network.nagios.devel/4726
- # (Error 2)
-#PATCHFILES += configure.diff # configure.in
- # http://unix.derkeiler.com/Mailing-Lists/SunManagers/2004-11/0424.html
- # -lsunmath is needed in configure for checking of libgd
-PATCHFILES += install-opts.diff # sets in every Makefile.in "INSTALL_OPT="" (empty)
- # necessary, so ginstall doesn't get -o and -g options
+PATCHFILES += 0001-use-of-CSW-perl.patch
+PATCHFILES += 0002-changed-install-and-command-options-in-configure.patch
-RUNTIME_DEP_PKGS = CSWgd CSWggettextrt CSWglib2 CSWiconv CSWjpeg CSWperl CSWpng CSWzlib
-RUNTIME_DEP_PKGS += CSWnagiosp CSWcswclassutils
+#
+#
+#
-SPKG_CLASSES = none cswusergroup ugfiles cswpreserveconf cswinitsmf
+LICENSE = LICENSE
NOISALIST = 1
-ENABLE_CHECK = 0
+#
+# reinplacements
+#
+REINPLACE_USRLOCAL += html/docs/de/*
+REINPLACE_USRLOCAL += html/docs/en/*
+REINPLACE_USRSHARE += html/docs/de/*
+REINPLACE_USRSHARE += html/docs/en/*
+
+REINPLACE_USRLOCAL += p1\.pl\.in
+REINPLACE_USRLOCAL += base/icinga\.c
+REINPLACE_USRLOCAL += sample-config/icinga\.cfg\.in
+REINPLACE_USRLOCAL += sample-config/cgi\.cfg\.in
+REINPLACE_USRLOCAL += module/idoutils/config/ido2db\.cfg-sample\.in
+REINPLACE_USRLOCAL += module/idoutils/config/idomod\.cfg-sample\.in
+
+#
+# runtime dependencies
+#
+
+RUNTIME_DEP_PKGS_CSWicinga += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWicinga += CSWlibz1
+RUNTIME_DEP_PKGS_CSWicinga += CSWfreetype
+RUNTIME_DEP_PKGS_CSWicinga += CSWlibgd2
+RUNTIME_DEP_PKGS_CSWicinga += CSWperl
+RUNTIME_DEP_PKGS_CSWicinga += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWicinga += CSWapache2
+RUNTIME_DEP_PKGS_CSWicinga += CSWap2-modphp5
+RUNTIME_DEP_PKGS_CSWicinga += CSWnagios-plugins
+
+#
+# prototypes
+#
+
+ICINGA_UGFILES += /var/opt/csw/icinga*
+ICINGA_UGFILES += /etc/opt/csw/icinga*
+ICINGA_UGFILES += /opt/csw/etc/templates/CSWicinga/.*
+
+PROTOTYPE_MODIFIERS += ugfiles
+PROTOTYPE_FILES_ugfiles += $(ICINGA_UGFILES)
+PROTOTYPE_USER_ugfiles += icinga
+PROTOTYPE_GROUP_ugfiles += icinga
+PROTOTYPE_CLASS_ugfiles += cswcptemplates
+
+ICINGA_CMD += /var/opt/csw/icinga/rw.*
+
+PROTOTYPE_MODIFIERS += cmd
+PROTOTYPE_FILES_cmd += $(ICINGA_CMD)
+PROTOTYPE_USER_cmd += icinga
+PROTOTYPE_GROUP_cmd += icingacm
+PROTOTYPE_PERMS_cmd += 2755
+PROTOTYPE_CLASS_cmd += cswcptemplates
+
+
+#
+# overrides
+#
+
+CHECKPKG_OVERRIDES_CSWicinga += file-with-bad-content|/usr/local|root/opt/csw/share/doc/icinga/Changelog
+
+CHECKPKG_OVERRIDES_CSWicinga += surplus-dependency|CSWnagios-plugins
+CHECKPKG_OVERRIDES_CSWicinga += surplus-dependency|CSWap2-modphp5
+
+#
+#
+#
+
+INITSMF = /etc/opt/csw/init.d/cswicinga
+USERGROUP = /etc/opt/csw/pkg/CSWicinga/cswusergroup
+#POSTMSG = /opt/csw/share/doc/icinga/README.CSW
+
+#
+# configure
+#
+
prefix = $(BUILD_PREFIX)/icinga
libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins
-localstatedir = /var/opt/csw/icinga
+sysconfdir = /etc$(prefix)
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --prefix=$(prefix)
-CONFIGURE_ARGS += --exec-prefix=$(exec_prefix)
-CONFIGURE_ARGS += --with-command-user=icinga
-CONFIGURE_ARGS += --with-command-group=icinga
-CONFIGURE_ARGS += --with-httpd-conf=/opt/csw/apache2/etc
-CONFIGURE_ARGS += --enable-embedded-perl
-#CONFIGURE_ARGS += --enable-idoutils # requires libdbi.so
-CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/icinga/spool/checkresults
-CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/icinga/icinga.lock
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-log-dir=/var/opt/csw/icinga/log
+CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --exec-prefix=$(exec_prefix)
+CONFIGURE_ARGS += --with-httpd-conf=$(sysconfdir)
+CONFIGURE_ARGS += --with-gd-lib=$(BUILD_PREFIX)/lib
+CONFIGURE_ARGS += --with-gd-inc=$(BUILD_PREFIX)/inc
+CONFIGURE_ARGS += --with-dbi-lib=$(BUILD_PREFIX)/lib
+CONFIGURE_ARGS += --with-dbi-inc=$(BUILD_PREFIX)/include
+CONFIGURE_ARGS += --enable-embedded-perl
+CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/icinga/icinga.lock
+CONFIGURE_ARGS += --localstatedir=/var$(prefix)
+CONFIGURE_ARGS += --enable-idoutils
+CONFIGURE_ENV += install_user=$(USER) install_grp=csw # see patch 0002-changed-install-and-command-options-in-configure.patch
+CONFIGURE_ENV += PATH=/usr/bin:/usr/ccs/bin:/opt/csw/bin:/opt/csw/bin/
+CONFIGURE_ENV += CC=/opt/SUNWspro/bin/cc
+CONFIGURE_ENV += PERL=/opt/csw/bin/perl
+#
+# build
+#
+
+BUILD_ENV_PATH = $(bindir):$(PATH)
+
EXTRA_LIB = $(BUILD_PREFIX)/lib
+LD_OPTIONS += -R/opt/csw/lib
+LD_OPTIONS += -R/opt/csw/icinga/lib
+
BUILD_ARGS = all
-#ENABLE_CHECK = 0
+TEST_SCRIPTS =
-TEST_TARGET = none
+#
+# install
+#
-INSTALL_ARGS += install-init
-#INSTALL_ARGS += install-config
+# Icinga Makefile calls 'make install' by default
+
INSTALL_ARGS += install-commandmode
-LD_OPTIONS += -R/opt/csw/lib
-LD_OPTIONS -= -R/opt/csw/nagios/lib
+# Other install targets (which are done in this recipe in post-install-modulated):
+# install-init
+# install-config
+# install-webconf
include gar/category.mk
-DOCS = Changelog INSTALLING README UPGRADING
-DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/icinga
-HTTPD_CONF = $(DESTDIR)/opt/csw/apache2/etc
-CFGDIR = $(prefix)/etc
+DOCS = Changelog INSTALLING README UPGRADING
+DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/icinga
+HTTPD_CONF = $(DESTDIR)$(sysconfdir)
+CFGDIR = /etc/opt/csw/icinga
+TEMPLATEDIR = /opt/csw/etc/templates/CSWicinga$(CFGDIR)
post-install-modulated:
+ @#
+ @# copying docs
+ @#
@ginstall -m 755 -d $(DOCDEST)
@ginstall -m 755 -d $(HTTPD_CONF)
@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
@ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST)
-# @ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-# @ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios
+ @#ginstall -m 644 $(FILEDIR)/README.CSW $(DOCDEST)
+ @#
+ @# Start / Stopp script
+ @#
+ @ginstall -d $(DESTDIR)/etc/$(BUILD_PREFIX)/init.d
+ @ginstall -m 755 $(FILEDIR)/cswicinga $(DESTDIR)/etc/$(BUILD_PREFIX)/init.d/cswicinga
+ @#
+ @# creating config dirs
+ @#
@ginstall -m 775 -d $(DESTDIR)$(CFGDIR)
@ginstall -m 775 -d $(DESTDIR)$(CFGDIR)/objects
- @ginstall -b -m 664 $(WORKSRC)/sample-config/README $(DESTDIR)$(CFGDIR)/README
- @ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW
- @ginstall -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(CFGDIR)/httpd-nagios.conf
- @ginstall -b -m 664 $(WORKSRC)/sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg.CSW
- @ginstall -b -m 660 $(WORKSRC)/sample-config/mrtg.cfg $(DESTDIR)$(CFGDIR)/mrtg.cfg.CSW
- @ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW
- @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW
- @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW
- @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW
- @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg.CSW
- @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.CSW
- @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.CSW
- @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.CSW
- @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.CSW
- @ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- @ginstall -m 755 $(FILEDIR)/cswicinga $(DESTDIR)/etc/opt/csw/init.d/cswicinga
- @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWicinga
- @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWicinga/cswusergroup
+ @ginstall -m 775 -d $(DESTDIR)$(CFGDIR)/conf.d
+ @ginstall -m 775 -d $(DESTDIR)$(CFGDIR)/modules
+ @#
+ @# preparing default config files -> cswcptemplate
+ @#
+ @ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR)
+ @ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR)/objects
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/icinga.cfg $(DESTDIR)$(TEMPLATEDIR)/icinga.cfg
+ @ginstall -b -m 664 $(WORKSRC)/module/idoutils/config/ido2db.cfg-sample $(DESTDIR)$(TEMPLATEDIR)/ido2db.cfg
+ @ginstall -b -m 664 $(WORKSRC)/module/idoutils/config/idomod.cfg-sample $(DESTDIR)$(TEMPLATEDIR)/ido2db.cfg
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(TEMPLATEDIR)/cgi.cfg
+ @ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(TEMPLATEDIR)/resource.cfg
+ @ginstall -b -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(TEMPLATEDIR)/httpd-icinga.conf
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/templates.cfg
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/commands.cfg
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/contacts.cfg
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/timeperiods.cfg
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/localhost.cfg
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/windows.cfg
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/printer.cfg
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/switch.cfg
+ @#
+ @# create user and group -> cswusergroup
+ @#
+ @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWicinga
+ @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWicinga/cswusergroup
+ @#
+ @# end of post-install
+ @#
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/icinga/trunk/checksums
===================================================================
--- csw/mgar/pkg/icinga/trunk/checksums 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/checksums 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1,8 +1 @@
-7921a4794699ca9ef28b91e1104cafca download/CSWicinga.gspec
-7119d3f33a03e1b29709bc421e176e2b download/CSWicinga.prototype
-db1163a029a4ff61787f8be18b056c5d download/cmd.c.diff
-a2c4c937bd3d0c7f2ff5361fb8424ed5 download/cswicinga
-9497da9af448701fef1e8ef4c24515e3 download/cswusergroup
-638d3c983abe46e1b291511b61a679b0 download/icinga-0.8.1.tar.gz
-d0acc20a35c59cb643b7d66963b789c5 download/install-opts.diff
-f777e837efcfd649c36a1dcef013580c download/patch.diff
+e96582d0fe3fed89451fbbecf8b83004 icinga-1.7.1.tar.gz
Added: csw/mgar/pkg/icinga/trunk/files/0001-use-of-CSW-perl.patch
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/0001-use-of-CSW-perl.patch (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/0001-use-of-CSW-perl.patch 2012-07-13 08:26:33 UTC (rev 18721)
@@ -0,0 +1,116 @@
+From 8d902b52cd3186ae7591209ec58c1a1e0ab0f7a2 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Wed, 11 Jul 2012 20:34:00 +0200
+Subject: [PATCH] use of CSW perl
+
+---
+ configure | 62 ++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/configure b/configure
+index b9d439a..4709b70 100755
+--- a/configure
++++ b/configure
+@@ -6782,15 +6782,15 @@ cat >>confdefs.h <<_ACEOF
+ #define EMBEDDEDPERL /**/
+ _ACEOF
+
+- PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
+- PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`"
+- CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`"
++ PERLLIBS="`/opt/csw/bin/perl -MExtUtils::Embed -e ldopts`"
++ PERLDIR="`/opt/csw/bin/perl -MConfig -e 'print $Config{installsitearch}'`"
++ CFLAGS="${CFLAGS} `/opt/csw/bin/perl -MExtUtils::Embed -e ccopts`"
+ USEPERL=yes
+ INSTALLPERLSTUFF=yes;
+ PERLXSI_O=perlxsi.o
+ OBJS="${OBJS} ${PERLXSI_O}"
+ echo "creating base/perlxsi.c"
+- perl -MExtUtils::Embed -e xsinit -- -o base/perlxsi.c
++ /opt/csw/bin/perl -MExtUtils::Embed -e xsinit -- -o base/perlxsi.c
+
+ echo "Embedded Perl interpreter will be compiled in..."
+
+@@ -6809,7 +6809,7 @@ $as_echo "#define DO_CLEAN \"1\"" >>confdefs.h
+ fi
+
+ if test x$USEPERL = xyes; then
+- if (perl -e 'use Config;exit -1 unless ($Config{'usethreads'});'); then
++ if (/opt/csw/bin/perl -e 'use Config;exit -1 unless ($Config{'usethreads'});'); then
+ echo "Using threaded perl"
+
+ cat >>confdefs.h <<_ACEOF
+@@ -8430,44 +8430,44 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+
+
+-perl subst $srcdir/include/locations.h
++/opt/csw/bin/perl subst $srcdir/include/locations.h
+
+-perl subst $srcdir/contrib/eventhandlers/submit_check_result
+-perl subst $srcdir/contrib/eventhandlers/disable_active_service_checks
+-perl subst $srcdir/contrib/eventhandlers/disable_notifications
+-perl subst $srcdir/contrib/eventhandlers/enable_active_service_checks
+-perl subst $srcdir/contrib/eventhandlers/enable_notifications
++/opt/csw/bin/perl subst $srcdir/contrib/eventhandlers/submit_check_result
++/opt/csw/bin/perl subst $srcdir/contrib/eventhandlers/disable_active_service_checks
++/opt/csw/bin/perl subst $srcdir/contrib/eventhandlers/disable_notifications
++/opt/csw/bin/perl subst $srcdir/contrib/eventhandlers/enable_active_service_checks
++/opt/csw/bin/perl subst $srcdir/contrib/eventhandlers/enable_notifications
+
+-perl subst $srcdir/html/index.html
+-perl subst $srcdir/html/menu.html
++/opt/csw/bin/perl subst $srcdir/html/index.html
++/opt/csw/bin/perl subst $srcdir/html/menu.html
+
+ echo ""
+ echo "Creating sample config files in sample-config/ ..."
+
+-perl subst $srcdir/sample-config/icinga.cfg
+-perl subst $srcdir/sample-config/cgi.cfg
+-perl subst $srcdir/sample-config/cgiauth.cfg
+-perl subst $srcdir/sample-config/resource.cfg
+-perl subst $srcdir/sample-config/httpd.conf
+-perl subst $srcdir/sample-config/mrtg.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/icinga.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/cgi.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/cgiauth.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/resource.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/httpd.conf
++/opt/csw/bin/perl subst $srcdir/sample-config/mrtg.cfg
+
+-perl subst $srcdir/sample-config/template-object/templates.cfg
+-perl subst $srcdir/sample-config/template-object/commands.cfg
+-perl subst $srcdir/sample-config/template-object/timeperiods.cfg
+-perl subst $srcdir/sample-config/template-object/contacts.cfg
+-perl subst $srcdir/sample-config/template-object/notifications.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/templates.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/commands.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/timeperiods.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/contacts.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/notifications.cfg
+
+-perl subst $srcdir/sample-config/template-object/localhost.cfg
+-perl subst $srcdir/sample-config/template-object/windows.cfg
+-perl subst $srcdir/sample-config/template-object/printer.cfg
+-perl subst $srcdir/sample-config/template-object/switch.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/localhost.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/windows.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/printer.cfg
++/opt/csw/bin/perl subst $srcdir/sample-config/template-object/switch.cfg
+
+ echo ""
+ echo "Creating sample config files in module/idoutils/config/ ..."
+
+-perl subst $srcdir/module/idoutils/config/idoutils.cfg-sample
+-perl subst $srcdir/module/idoutils/config/ido2db.cfg-sample
+-perl subst $srcdir/module/idoutils/config/idomod.cfg-sample
++/opt/csw/bin/perl subst $srcdir/module/idoutils/config/idoutils.cfg-sample
++/opt/csw/bin/perl subst $srcdir/module/idoutils/config/ido2db.cfg-sample
++/opt/csw/bin/perl subst $srcdir/module/idoutils/config/idomod.cfg-sample
+
+
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/icinga/trunk/files/0002-changed-install-and-command-options-in-configure.patch
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/0002-changed-install-and-command-options-in-configure.patch (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/0002-changed-install-and-command-options-in-configure.patch 2012-07-13 08:26:33 UTC (rev 18721)
@@ -0,0 +1,43 @@
+From 93af51054f341c1c44f44407a4645bbacced3480 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Wed, 11 Jul 2012 22:13:35 +0200
+Subject: [PATCH] changed install and command options in configure
+
+---
+ configure | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 4709b70..34d740b 100755
+--- a/configure
++++ b/configure
+@@ -5186,7 +5186,7 @@ cat >>confdefs.h <<_ACEOF
+ #define DEFAULT_NAGIOS_GROUP "$icinga_grp"
+ _ACEOF
+
+-INSTALL_OPTS="-o $icinga_user -g $icinga_grp"
++INSTALL_OPTS="-o $install_user -g $install_grp"
+
+
+
+@@ -5207,7 +5207,7 @@ fi
+
+
+
+-COMMAND_OPTS="-o $command_user -g $command_grp"
++COMMAND_OPTS="-o $install_user -g $install_grp"
+
+
+
+@@ -5264,7 +5264,7 @@ fi
+
+
+
+-INSTALL_OPTS_WEB="-o $web_user -g $web_group"
++INSTALL_OPTS_WEB="-o $install_user -g $install_grp"
+
+
+
+--
+1.7.10.3
+
Deleted: csw/mgar/pkg/icinga/trunk/files/CSWicinga.gspec
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/CSWicinga.gspec 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/files/CSWicinga.gspec 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1,3 +0,0 @@
-%var bitname icinga
-%var pkgname CSWicinga
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
Deleted: csw/mgar/pkg/icinga/trunk/files/CSWicinga.prototype
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/CSWicinga.prototype 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/files/CSWicinga.prototype 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1,249 +0,0 @@
-d ugfiles /opt/csw/icinga 0755 root bin
-d ugfiles /opt/csw/icinga/bin 0755 icinga icinga
-f ugfiles /opt/csw/icinga/bin/icinga 0754 icinga icinga
-f ugfiles /opt/csw/icinga/bin/icingastats 0754 icinga icinga
-f ugfiles /opt/csw/icinga/bin/p1.pl 0644 icinga icinga
-d ugfiles /opt/csw/icinga/etc 0755 icinga icinga
-f ugfiles /opt/csw/icinga/etc/README 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/cgi.cfg.CSW 0644 icinga icinga
-f ugfiles /opt/csw/icinga/etc/httpd-nagios.conf 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/icinga.cfg.CSW 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/mrtg.cfg.CSW 0640 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/resource.cfg.CSW 0640 icinga icinga
-d ugfiles /opt/csw/icinga/etc/objects 0755 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/objects/commands.cfg.CSW 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/objects/contacts.cfg.CSW 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/objects/localhost.cfg.CSW 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/objects/printer.cfg.CSW 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/objects/switch.cfg.CSW 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/objects/templates.cfg.CSW 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/objects/timeperiods.cfg.CSW 0644 icinga icinga
-f cswpreserveconf /opt/csw/icinga/etc/objects/windows.cfg.CSW 0644 icinga icinga
-d ugfiles /opt/csw/icinga/sbin 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/avail.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/cmd.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/config.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/extinfo.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/histogram.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/history.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/notifications.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/outages.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/showlog.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/status.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/statusmap.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/statuswml.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/statuswrl.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/summary.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/tac.cgi 0755 icinga icinga
-f ugfiles /opt/csw/icinga/sbin/trends.cgi 0755 icinga icinga
-d ugfiles /opt/csw/icinga/share 0755 icinga icinga
-d ugfiles /opt/csw/icinga/share/contexthelp 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/A1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/A2.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/A3.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/A4.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/A5.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/A6.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/A7.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/B1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/C1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/D1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/E1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/F1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/G1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/G2.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/G3.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/G4.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/G5.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/G6.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/H1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/H2.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/H3.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/H4.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/H5.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/H6.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/H7.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/H8.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I2.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I3.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I4.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I5.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I6.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I7.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I8.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/I9.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/J1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/K1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L10.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L11.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L12.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L13.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L2.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L3.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L4.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L5.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L6.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L7.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L8.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/L9.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/M1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/M2.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/M3.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/M4.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/M5.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/M6.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/N1.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/N2.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/N3.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/N4.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/N5.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/N6.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/contexthelp/N7.html 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/docs 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/ch_running-icinga.html 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/docs/images 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/images/logofullsize.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/index.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/ch_relnotes.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/robots.txt 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/wb_quickstart-icinga.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/wb_quickstart-idoutils.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/wb_quickstart.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/wb_startstop.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/wb_verifyconfig.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/docs/wb_whatsnew.html 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/images 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/NagiosEnterprises-whitebg-112x46.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/ack.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/action.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/arrow-menu.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/command.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/comment.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/contexthelp1.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/contexthelp2.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/critical.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/delay.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/delete.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/detail.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/disabled.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/down.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/downtime.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/empty.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/enabled.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/extinfo.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/favicon.ico 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/flapping.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/globe-support-150x150.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/greendot.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/histogram.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/history.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/hostevent.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/icinga-logo.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/info.png 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/images/interface 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/interface/bar.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/interface/menu_body.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/interface/menu_less.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/interface/menu_li1.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/interface/menu_li2.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/interface/menu_more.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/left.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/logofullsize.png 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/images/logos 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/logos/nagios.gd2 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/logos/nagios.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/logos/nagiosvrml.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/logos/unknown.gd2 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/logos/unknown.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/logrotate.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/ndisabled.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/noack.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/notes.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/notify.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/orangedot.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/passiveonly.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/recovery.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/redudancy.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/redundancy.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/restart.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/right.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/sblogo.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/serviceevent.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/sflogo.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/splunk1.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/splunk2.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/start.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/status.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/status2.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/status3.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/status4.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/stop.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/tacdisabled.jpg 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/tacdisabled.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/tacenabled.jpg 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/tacenabled.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/thermcrit.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/thermok.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/thermwarn.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/trends.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/trendshost.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/trendssvc.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/unknown.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/up.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/warning.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/weblogo1.png 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/zoom1.gif 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/images/zoom2.gif 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/includes 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/includes/utils.inc.php 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/index.html 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/js 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/js/menu.js 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/js/mootools.js 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/main.html 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/media 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/menu.html 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/robots.txt 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/sidebar.html 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/ssi 0755 icinga icinga
-d ugfiles /opt/csw/icinga/share/stylesheets 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/avail.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/checksanity.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/cmd.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/common.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/config.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/extinfo.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/histogram.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/history.css 0644 icinga icinga
-d ugfiles /opt/csw/icinga/share/stylesheets/interface 0755 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/interface/common.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/interface/menu.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/ministatus.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/notifications.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/outages.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/showlog.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/status.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/statusmap.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/summary.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/tac.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/stylesheets/trends.css 0644 icinga icinga
-f ugfiles /opt/csw/icinga/share/top.html 0644 icinga icinga
-d ugfiles /var/opt/csw/icinga 0755 icinga icinga
-d ugfiles /var/opt/csw/icinga/archives 0755 icinga icinga
-d ugfiles /var/opt/csw/icinga/rw 0755 icinga icinga
-d none /opt/csw/libexec 0755 root bin
-d none /opt/csw/libexec/nagios-plugins 0755 root bin
-d none /opt/csw/share/doc/icinga 0755 root bin
-f none /opt/csw/share/doc/icinga/Changelog 0644 root bin
-f none /opt/csw/share/doc/icinga/INSTALLING 0644 root bin
-f none /opt/csw/share/doc/icinga/LICENSE 0644 root bin
-f none /opt/csw/share/doc/icinga/README 0644 root bin
-f none /opt/csw/share/doc/icinga/UPGRADING 0644 root bin
-d ugfiles /var/opt/csw/icinga/spool 0755 icinga icinga
-d ugfiles /var/opt/csw/icinga/spool/checkresults 0755 icinga icinga
-f cswinitsmf /etc/opt/csw/init.d/cswicinga 0755 root bin
-d none /opt/csw/etc/pkg 0755 root bin
-d none /opt/csw/etc/pkg/CSWicinga 0755 root bin
-f cswusergroup /opt/csw/etc/pkg/CSWicinga/cswusergroup 0644 root bin
Deleted: csw/mgar/pkg/icinga/trunk/files/cmd.c.diff
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/cmd.c.diff 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/files/cmd.c.diff 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/cgi/cmd.c icinga-0.8/cgi/cmd.c
---- icinga-0.8.orig/cgi/cmd.c 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/cgi/cmd.c 2009-05-22 11:58:30.329840462 +0200
-@@ -1886,7 +1886,7 @@
- return;
- }
-
--__attribute__((format(printf, 2, 3)))
-+/* __attribute__((format(printf, 2, 3))) */
- static int cmd_submitf(int id, const char *fmt, ...)
- {
- char cmd[MAX_EXTERNAL_COMMAND_LENGTH];
Modified: csw/mgar/pkg/icinga/trunk/files/cswicinga
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/cswicinga 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/files/cswicinga 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1,53 +1,86 @@
#!/bin/sh
-#
+#
# chkconfig: 345 99 01
# description: Icinga network monitor
#
-# File : icinga
+# Modified for OpenCSW and Solaris by Juergen Arndt
#
-# Author : Jorge Sanchez Aymar (jsanchez at lanchile.cl)
-#
-# Changelog :
-#
-# 1999-07-09 Karl DeBisschop <kdebisschop at infoplease.com>
-# - setup for autoconf
-# - add reload function
-# 1999-08-06 Ethan Galstad <egalstad at nagios.org>
-# - Added configuration info for use with RedHat's chkconfig tool
-# per Fran Boon's suggestion
-# 1999-08-13 Jim Popovitch <jimpop at rocketship.com>
-# - added variable for icinga/var directory
-# - cd into icinga/var directory before creating tmp files on startup
-# 1999-08-16 Ethan Galstad <egalstad at nagios.org>
-# - Added test for rc.d directory as suggested by Karl DeBisschop
-# 2000-07-23 Karl DeBisschop <kdebisschop at users.sourceforge.net>
-# - Clean out redhat macros and other dependencies
-# 2003-01-11 Ethan Galstad <egalstad at nagios.org>
-# - Updated su syntax (Gary Miller)
-#
-# Description: Starts and stops the Icinga monitor
-# used to provide network services status.
-#
-# Modified for OpenCSW by Juergen Arndt, 2009-05-22
-#
+### BEGIN INIT INFO
+# Provides: icinga
+# Required-Start: $local_fs $remote_fs $syslog $named $network $time
+# Required-Stop: $local_fs $remote_fs $syslog $named $network
+# Should-Start:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop Icinga monitoring daemon
+# Description: Icinga is a service monitoring system
+### END INIT INFO
-#FMRI application # FMRI path for service, see http://wiki.opencsw.org/cswclassutils-package#toc0
+## definitions ##
+prefix=/opt/csw/icinga
+exec_prefix=/opt/csw/icinga
+IcingaBin=/opt/csw/icinga/bin/icinga
+IcingaCfgFile=/etc/opt/csw/icinga/icinga.cfg
+IcingaCommandFile=/var/opt/csw/icinga/rw/icinga.cmd
+IcingaRunFile=/var/opt/csw/icinga/icinga.lock
+IcingaLockDir=/var/lock/subsys
+IcingaLockFile=icinga
+IcingaUser=icinga
+IcingaGroup=icinga
+IcingaChkFile=/var/opt/csw/icinga/icinga.chk
+# load extra environment variables
+if [ -f /etc/sysconfig/icinga ]; then
+ . /etc/sysconfig/icinga
+fi
+
+# For Solaris
+
+SOLREL=`uname -r | awk -F. '{print $2}'`
+
+if [ -f /lib/svc/share/smf_include.sh ]
+then
+ . /lib/svc/share/smf_include.sh
+fi
+
+# 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
+fi
+
+# Check that icinga exists.
+if [ ! -f $IcingaBin ]; then
+ echo "Executable file $IcingaBin not found. Exiting."
+ exit 1
+fi
+
+# Check that icinga.cfg exists.
+if [ ! -f $IcingaCfgFile ]; then
+ echo "Configuration file $IcingaCfgFile not found. Exiting."
+
+ if [ $SOLREL -lt 10 ]
+ then
+ exit 1
+ else
+ exit $SMF_EXIT_ERR_CONFIG
+ fi
+
+fi
+
+
+## helper functions ##
+
status_icinga ()
{
- if test -x $IcingaCGI/daemonchk.cgi; then
- if $IcingaCGI/daemonchk.cgi -l $IcingaRunFile; then
- return 0
- else
- return 1
- fi
+ if ps -p $IcingaPID > /dev/null 2>&1; then
+ return 0
else
- if ps -p $IcingaPID > /dev/null 2>&1; then
- return 0
- else
- return 1
- fi
+ return 1
fi
return 1
@@ -67,17 +100,21 @@
killproc_icinga ()
{
+ if kill -0 $IcingaPID >/dev/null 2>&1; then
+ kill $2 $IcingaPID
+ fi
+}
- kill $2 $IcingaPID
-
+kill9proc_icinga()
+{
+ kill -9 $IcingaPID
}
-
pid_icinga ()
{
if test ! -f $IcingaRunFile; then
- echo "No lock file found in $IcingaRunFile"
+ echo "Icinga not running. No lock file found in $IcingaRunFile"
exit 1
fi
@@ -85,65 +122,62 @@
}
-# 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
-fi
+chk_config ()
+{
+ printf "Running configuration check..."
+ $IcingaBin -v $IcingaCfgFile > $IcingaChkFile 2>&1
+ if test $? -ne 0; then
+ if test -z "$1"; then
+ cat $IcingaChkFile
+ echo "Result saved to $IcingaChkFile"
+ else
+ echo $1
+ fi
+ exit 1
+ fi
+ rm -f $IcingaChkFile
+ echo "OK"
+ #exit 0
+}
-prefix=/opt/csw/icinga
-exec_prefix=/opt/csw/icinga
-IcingaBin=/opt/csw/icinga/bin/icinga
-IcingaCfgFile=/opt/csw/icinga/etc/icinga.cfg
-IcingaStatusFile=/opt/csw/icinga/var/status.dat
-IcingaRetentionFile=/opt/csw/icinga/var/retention.dat
-IcingaCommandFile=/opt/csw/icinga/var/rw/icinga.cmd
-IcingaVarDir=/opt/csw/icinga/var
-IcingaRunFile=/var/opt/csw/icinga/icinga.lock
-IcingaLockDir=/var/lock/subsys
-IcingaLockFile=icinga
-IcingaCGIDir=/opt/csw/icinga/sbin
-IcingaUser=icinga
-IcingaGroup=icinga
-
+start(){
+ # Check if icinga is already running
+ $0 status > /dev/null
+ if [ $? -eq 0 ]; then
+ pid_icinga
+ # check if pid can be found running
+ if status_icinga > /dev/null; then
+ echo "Icinga is already running. PID: $IcingaPID"
+ exit 1
+ else
+ echo "Icinga PID $IcingaPID not running. Removing lockfile."
+ rm -f $IcingaRunFile $IcingaLockDir/$IcingaLockFile
+ fi
+ fi
-# Check that icinga exists.
-if [ ! -f $IcingaBin ]; then
- echo "Executable file $IcingaBin not found. Exiting."
- exit 1
-fi
+ printf "Starting icinga: "
+ rm -f $IcingaCommandFile
+ touch $IcingaRunFile
+ chown $IcingaUser:$IcingaGroup $IcingaRunFile
+ $IcingaBin -d $IcingaCfgFile
+ if [ -d $IcingaLockDir ]; then touch $IcingaLockDir/$IcingaLockFile; fi
+ echo "Starting icinga done."
+ exit 0
-# Check that icinga.cfg exists.
-if [ ! -f $IcingaCfgFile ]; then
- echo "Configuration file $IcingaCfgFile not found. Exiting."
- exit 1
-fi
-
+}
+
+
+## MAIN ##
# See how we were called.
case "$1" in
start)
- echo -n "Starting icinga:"
- $IcingaBin -v $IcingaCfgFile > /dev/null 2>&1;
- if [ $? -eq 0 ]; then
- su - $IcingaUser -c "touch $IcingaVarDir/icinga.log $IcingaRetentionFile"
- rm -f $IcingaCommandFile
- touch $IcingaRunFile
- chown $IcingaUser:$IcingaGroup $IcingaRunFile
- $IcingaBin -d $IcingaCfgFile
- if [ -d $IcingaLockDir ]; then touch $IcingaLockDir/$IcingaLockFile; fi
- echo " done."
- exit 0
- else
- echo "CONFIG ERROR! Start aborted. Check your Icinga configuration."
- exit 1
- fi
+ chk_config "CONFIG ERROR! Start aborted. See $IcingaChkFile for details."
+ start
;;
stop)
- echo -n "Stopping icinga: "
+ printf "Stopping icinga: "
pid_icinga
killproc_icinga icinga
@@ -153,10 +187,10 @@
# happen, and then the exiting icinga will remove the
# new IcingaRunFile, allowing multiple icinga daemons
# to (sooner or later) run - John Sellens
- #echo -n 'Waiting for icinga to exit .'
- for i in 1 2 3 4 5 6 7 8 9 10 ; do
+ #printf 'Waiting for icinga to exit .'
+ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
if status_icinga > /dev/null; then
- echo -n '.'
+ printf '.'
sleep 1
else
break
@@ -164,12 +198,13 @@
done
if status_icinga > /dev/null; then
echo ''
- echo 'Warning - icinga did not exit in a timely manner'
+ echo 'Warning - icinga did not exit in a timely manner. Sending kill -9'
+ kill9proc_icinga
else
- echo 'done.'
+ echo 'Stopping icinga done.'
+ rm -f $IcingaRunFile $IcingaLockDir/$IcingaLockFile
fi
- rm -f $IcingaStatusFile $IcingaRunFile $IcingaLockDir/$IcingaLockFile $IcingaCommandFile
;;
status)
@@ -178,58 +213,41 @@
;;
checkconfig)
- printf "Running configuration check..."
- $IcingaBin -v $IcingaCfgFile > /dev/null 2>&1;
- if [ $? -eq 0 ]; then
- echo " OK."
- else
- echo " CONFIG ERROR! Check your Icinga configuration."
- exit 1
- fi
+ chk_config " CONFIG ERROR! See $IcingaChkFile for details."
;;
+ show-errors)
+ chk_config
+ ;;
+
restart)
- printf "Running configuration check..."
- $IcingaBin -v $IcingaCfgFile > /dev/null 2>&1;
- if [ $? -eq 0 ]; then
- echo "done."
- $0 stop
- $0 start
- else
- echo " CONFIG ERROR! Restart aborted. Check your Icinga configuration."
- exit 1
- fi
+ chk_config " CONFIG ERROR! Restart aborted. See $IcingaChkFile for details."
+ $0 stop
+ start
;;
reload|force-reload)
- printf "Running configuration check..."
- $IcingaBin -v $IcingaCfgFile > /dev/null 2>&1;
- if [ $? -eq 0 ]; then
- echo "done."
- if test ! -f $IcingaRunFile; then
+ chk_config " CONFIG ERROR! Reload aborted. See $IcingaChkFile for details."
+ if test ! -f $IcingaRunFile; then
+ $0 start
+ else
+ pid_icinga
+ if status_icinga > /dev/null; then
+ printf "Reloading icinga configuration..."
+ killproc_icinga icinga -HUP
+ echo "done"
+ else
+ $0 stop
$0 start
- else
- pid_icinga
- if status_icinga > /dev/null; then
- printf "Reloading icinga configuration..."
- killproc_icinga icinga -HUP
- echo "done"
- else
- $0 stop
- $0 start
- fi
fi
- else
- echo " CONFIG ERROR! Reload aborted. Check your Icinga configuration."
- exit 1
fi
;;
*)
- echo "Usage: icinga {start|stop|restart|reload|force-reload|status|checkconfig}"
+ echo "Usage: icinga {start|stop|restart|reload|force-reload|status|checkconfig|show-errors}"
exit 1
;;
esac
-
+
# End of this script
Modified: csw/mgar/pkg/icinga/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/cswusergroup 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/files/cswusergroup 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1 +1,3 @@
-icinga:icinga:Icinga User:/opt/csw/icinga:/bin/false:::
+:icingacm::::::
+:icinga::::::
+icinga:icinga:Icinga User:/etc/opt/csw/icinga::m:r:NP:icingacm
Deleted: csw/mgar/pkg/icinga/trunk/files/install-opts.diff
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/install-opts.diff 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/files/install-opts.diff 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1,90 +0,0 @@
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/Makefile.in icinga-0.8/Makefile.in
---- icinga-0.8.orig/Makefile.in 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/Makefile.in 2009-05-22 12:57:00.973528770 +0200
-@@ -30,11 +30,11 @@
- LIBEXECDIR=@libexecdir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
--COMMAND_OPTS=@COMMAND_OPTS@
-+INSTALL_OPTS=
-+COMMAND_OPTS=
- HTTPD_CONF=@HTTPD_CONF@
- INIT_DIR=@init_dir@
--INIT_OPTS=-o root -g root
-+INIT_OPTS=
- CGICFGDIR=$(CGIDIR)
- PERLDIR=@PERLDIR@
-
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/base/Makefile.in icinga-0.8/base/Makefile.in
---- icinga-0.8.orig/base/Makefile.in 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/base/Makefile.in 2009-05-22 12:54:39.811066523 +0200
-@@ -39,7 +39,7 @@
- CGIDIR=@sbindir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
-+INSTALL_OPTS=
- COMMAND_OPTS=@COMMAND_OPTS@
- STRIP=@STRIP@
-
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/cgi/Makefile.in icinga-0.8/cgi/Makefile.in
---- icinga-0.8.orig/cgi/Makefile.in 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/cgi/Makefile.in 2009-05-22 12:55:03.790961065 +0200
-@@ -18,7 +18,7 @@
- CGIDIR=@sbindir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
-+INSTALL_OPTS=
- COMMAND_OPTS=@COMMAND_OPTS@
- STRIP=@STRIP@
-
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/common/Makefile.in icinga-0.8/common/Makefile.in
---- icinga-0.8.orig/common/Makefile.in 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/common/Makefile.in 2009-05-22 12:55:23.192592201 +0200
-@@ -20,7 +20,7 @@
- CGIDIR=@sbindir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
-+INSTALL_OPTS=
- COMMAND_OPTS=@COMMAND_OPTS@
-
- CP=@CP@
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/contrib/Makefile.in icinga-0.8/contrib/Makefile.in
---- icinga-0.8.orig/contrib/Makefile.in 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/contrib/Makefile.in 2009-05-22 12:55:40.861094735 +0200
-@@ -15,7 +15,7 @@
- # Generated automatically from configure script
- SNPRINTF_O=@SNPRINTF_O@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
-+INSTALL_OPTS=
-
-
- prefix=@prefix@
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/html/Makefile.in icinga-0.8/html/Makefile.in
---- icinga-0.8.orig/html/Makefile.in 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/html/Makefile.in 2009-05-22 12:56:26.447629708 +0200
-@@ -10,7 +10,7 @@
- CGIDIR=@sbindir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
-+INSTALL_OPTS=
- COMMAND_OPTS=@COMMAND_OPTS@
-
- CP=@CP@
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/module/Makefile.in icinga-0.8/module/Makefile.in
---- icinga-0.8.orig/module/Makefile.in 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/module/Makefile.in 2009-05-22 12:57:18.719328688 +0200
-@@ -19,7 +19,7 @@
- exec_prefix=@exec_prefix@
- BINDIR=@bindir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
-+INSTALL_OPTS=
- COMMAND_OPTS=@COMMAND_OPTS@
- STRIP=@STRIP@
-
Deleted: csw/mgar/pkg/icinga/trunk/files/patch.diff
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/patch.diff 2012-07-13 08:20:30 UTC (rev 18720)
+++ csw/mgar/pkg/icinga/trunk/files/patch.diff 2012-07-13 08:26:33 UTC (rev 18721)
@@ -1,33 +0,0 @@
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/include/nebmodules.h icinga-0.8/include/nebmodules.h
---- icinga-0.8.orig/include/nebmodules.h 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/include/nebmodules.h 2009-05-22 12:13:24.195253042 +0200
-@@ -31,7 +31,7 @@
-
- /***** MODULE VERSION INFORMATION *****/
-
--#define NEB_API_VERSION(x) int __neb_api_version = x;
-+#define NEB_API_VERSION(x) int __neb_api_version = x
- #define CURRENT_NEB_API_VERSION 3
-
-
-diff --speed-large-files --minimal -Nru icinga-0.8.orig/module/Makefile.in icinga-0.8/module/Makefile.in
---- icinga-0.8.orig/module/Makefile.in 2009-05-19 23:01:43.000000000 +0200
-+++ icinga-0.8/module/Makefile.in 2009-05-22 12:16:03.078812414 +0200
-@@ -25,13 +25,13 @@
-
- CP=@CP@
-
--all: helloworld.o
-+all: helloworld
-
--helloworld.o: helloworld.c
-- $(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld.o helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS)
-+helloworld: helloworld.c
-+ $(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS)
-
- clean:
-- rm -f helloworld.o
-+ rm -f helloworld
- rm -f core *.o
- rm -f *~ *.*~
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list