[csw-devel] SF.net SVN: gar:[18144] csw/mgar/pkg/nagios_plugins/trunk/Makefile

[wilbury at users.sourceforge.net]

Revision: 18144
          http://gar.svn.sourceforge.net/gar/?rev=18144&view=rev
Author:   wilbury
Date:     2012-05-28 13:12:21 +0000 (Mon, 28 May 2012)
Log Message:
-----------
nagios_plugins/trunk: Fix recipe.

Modified Paths:
--------------
    csw/mgar/pkg/nagios_plugins/trunk/Makefile

Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/Makefile	2012-05-28 13:08:51 UTC (rev 18143)
+++ csw/mgar/pkg/nagios_plugins/trunk/Makefile	2012-05-28 13:12:21 UTC (rev 18144)
@@ -3,38 +3,28 @@
 CATEGORIES = apps
 GARTYPE = v2
 
-DESCRIPTION = plugins for nagios
+DESCRIPTION = Plugins for nagios
 define BLURB
-  Long description
+   Plugins for Nagios
 endef
 
 MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/nagiosplug/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
+PACKAGES += CSWnagiosp
+SPKG_CATALOG_NAME_CSWnagiosp = nagios_plugins
+
 PATCHFILES += check_procs.c.diff
 PATCHFILES += subst.in.diff
 PATCHFILES += pst3.c.diff
 PATCHFILES += 0004-Use-32-bit-pst3-on-Solaris.patch
 
-PACKAGES = CSWnagiosp
-CATALOGNAME_CSWnagiosp = nagios_plugins
+REINPLACE_USRLOCAL += contrib/*
+REINPLACE_USRLOCAL += plugins/*
+REINPLACE_USRLOCAL += plugins-scripts/*
+REINPLACE_USRLOCAL += ChangeLog
+REINPLACE_USRLOCAL += README
 
-RUNTIME_DEP_PKGS_CSWnagiosp  = CSWggettextrt CSWlibcharset1 CSWlibiconv2 CSWlibnet1 CSWlibpq5
-RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibmysqlclient15 CSWoldaprt CSWlibssl1-0-0 CSWsasl
-RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibz1 CSWperl
-
-BUILD_DEP_PKGS_CSWnagiosp += CSWmysql-dev
-BUILD_DEP_PKGS_CSWnagiosp += CSWpostgresql-dev
-BUILD_DEP_PKGS_CSWnagiosp += CSWlibz-dev
-BUILD_DEP_PKGS_CSWnagiosp += CSWlibnet-dev
-BUILD_DEP_PKGS_CSWnagiosp += CSWlibiconv-dev
-
-PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
-NOISALIST = 1
-BUILD64 = 0
-
-CFLAGS += -I /opt/csw/postgresql/include/
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-openssl=/opt/csw
 CONFIGURE_ARGS += --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin:/opt/csw/bin:/opt/csw/sbin
@@ -42,16 +32,23 @@
 CONFIGURE_ARGS += --with-pg-dir=/opt/csw/postgresql/include/
 CONFIGURE_ARGS += --disable-largefile
 CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl
-CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/nagios-plugins
 
-libexecdir ?= $(prefix)/libexec/nagios-plugins
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
-# Extra libs
+CFLAGS += -I /opt/csw/postgresql/include/
+EXTRA_INC = /opt/csw/postgresql/include
 EXTRA_LIB += /opt/csw/postgresql/lib
 
-# Extra includes
-EXTRA_INC = /opt/csw/postgresql/include
 
+RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibintl8 CSWlibpq5
+RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibmysqlclient15 CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibz1 CSWperl CSWliblber2-4-2 CSWlibldap2-4-2
+
+BUILD_DEP_PKGS_CSWnagiosp += CSWmysql-dev
+BUILD_DEP_PKGS_CSWnagiosp += CSWpostgresql-dev
+BUILD_DEP_PKGS_CSWnagiosp += CSWlibz-dev
+BUILD_DEP_PKGS_CSWnagiosp += CSWlibnet-dev
+
 TEST_TARGET = 
 
 include gar/category.mk
@@ -70,3 +67,8 @@
 	@ginstall -m 755 -d $(DOCDEST)
 	@ginstall -m 644 $(WORKSRC)/contrib.tar $(DOCDEST)
 	@$(MAKECOOKIE)
+
+post-merge:
+	@rm $(PKGROOT)$(libdir)/charset.alias
+	@$(MAKECOOKIE)
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.