[csw-devel] SF.net SVN: gar:[21663] csw/mgar/pkg/nagios/trunk

[lblume at users.sourceforge.net]

Revision: 21663
          http://gar.svn.sourceforge.net/gar/?rev=21663&view=rev
Author:   lblume
Date:     2013-08-06 21:40:17 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
nagios/trunk: Recipe update for newer libg3; add a mapfile to ensure the proper level of libc; remove not useful lines

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

Added Paths:
-----------
    csw/mgar/pkg/nagios/trunk/files/mapfile

Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile	2013-08-06 21:33:11 UTC (rev 21662)
+++ csw/mgar/pkg/nagios/trunk/Makefile	2013-08-06 21:40:17 UTC (rev 21663)
@@ -15,6 +15,7 @@
 DISTFILES += cswnagios
 DISTFILES += cswusergroup
 DISTFILES += README.CSW
+DISTFILES += mapfile
 
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
@@ -29,12 +30,9 @@
 
 RUNTIME_DEP_PKGS_CSWnagios  = CSWapache2 CSWgd CSWglib2 CSWjpeg CSWlibtoolrt CSWggettextrt
 RUNTIME_DEP_PKGS_CSWnagios += CSWperl CSWnagios-plugins CSWap2-modphp5 
-RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd3
 RUNTIME_DEP_PKGS_CSWnagios += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWnagios += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWnagios += CSWlibz1
-RUNTIME_DEP_PKGS_CSWnagios += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWnagios += CSWfreetype
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibltdl7
 
 LICENSE = LICENSE
 
@@ -74,10 +72,11 @@
 CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/nagios/spool/checkresults
 CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/nagios/nagios.lock
 CONFIGURE_ARGS += --localstatedir=/var$(prefix)
-CONFIGURE_ENV  += install_user=$(USER) install_grp=csw # see PATCHFILES
-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
+EXTRA_CONFIGURE_ENV  += install_user=$(USER) install_grp=csw # see PATCHFILES
+#EXTRA_CONFIGURE_ENV  += PATH=/usr/bin:/usr/ccs/bin:/opt/csw/bin:/opt/csw/bin/
+#EXTRA_CONFIGURE_ENV  += CC=/opt/SUNWspro/bin/cc
+#EXTRA_CONFIGURE_ENV  += PERL=/opt/csw/bin/perl
+#CONFIGURE_ENV  += LD_OPTIONS="-M $(abspath $(WORKDIR)/mapfile)"
 
 #
 # build
@@ -87,8 +86,9 @@
 
 EXTRA_LIB = $(BUILD_PREFIX)/lib
 
-LD_OPTIONS += -R/opt/csw/lib
-LD_OPTIONS += -R/opt/csw/nagios/lib
+#EXTRA_LD_OPTIONS += -R/opt/csw/lib
+EXTRA_LD_OPTIONS += -R/opt/csw/nagios/lib
+EXTRA_LD_OPTIONS += -M "$(abspath $(WORKDIR)/mapfile)"
 
 BUILD_ARGS = all
 

Added: csw/mgar/pkg/nagios/trunk/files/mapfile
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/mapfile	                        (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/mapfile	2013-08-06 21:40:17 UTC (rev 21663)
@@ -0,0 +1 @@
+libc.so - SUNW_1.22.5 SUNWprivate_1.1;

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