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

[gadavis at users.sourceforge.net]

Revision: 11830
          http://gar.svn.sourceforge.net/gar/?rev=11830&view=rev
Author:   gadavis
Date:     2010-12-07 22:13:56 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
Make package descriptions more descriptive, remove debug flag, remove extraneous checkpkg overrides

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2010-12-07 21:38:33 UTC (rev 11829)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2010-12-07 22:13:56 UTC (rev 11830)
@@ -22,7 +22,7 @@
 
 PACKAGES = CSWnetcdf
 CATALOGNAME_CSWnetcdf = netcdf
-SPKG_DESC_CSWnetcdf = Machine-independent data formats for array-oriented scientific data
+SPKG_DESC_CSWnetcdf = NetCDF - Machine-independent data formats for array-oriented scientific data
 RUNTIME_DEP_PKGS_CSWnetcdf += CSWhdf5rt
 RUNTIME_DEP_PKGS_CSWnetcdf += CSWzlib
 RUNTIME_DEP_PKGS_CSWnetcdf += CSWlibnetcdf6
@@ -38,7 +38,7 @@
 PKGFILES_CSWlibnetcdf6 += /opt/csw/lib/amd64/libnetcdf.so.6.0.0
 PKGFILES_CSWlibnetcdf6 += /opt/csw/lib/amd64/libnetcdf.so.6\.[0-9\.]+
 PKGFILES_CSWlibnetcdf6 += /opt/csw/lib/amd64/libnetcdf.so.6
-SPKG_DESC_CSWlibnetcdf6 = Machine-independent data formats for array-oriented scientific data, libnetcdf.so.6
+SPKG_DESC_CSWlibnetcdf6 = C shared library for netcdf - libnetcdf.so.6 
 RUNTIME_DEP_PKGS_CSWlibnetcdf6  = CSWhdf5rt
 RUNTIME_DEP_PKGS_CSWlibnetcdf6 += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibnetcdf6 += CSWgcc4core # Mantis Bug #4497, missing 64 symlink
@@ -54,7 +54,7 @@
 PKGFILES_CSWlibnetcdf-c++5 += /opt/csw/lib/amd64/libnetcdf_c\+\+.so.5.0.0
 PKGFILES_CSWlibnetcdf-c++5 += /opt/csw/lib/amd64/libnetcdf_c\+\+.so.5\.[0-9\.]+
 PKGFILES_CSWlibnetcdf-c++5 += /opt/csw/lib/amd64/libnetcdf_c\+\+.so.5
-SPKG_DESC_CSWlibnetcdf-c++5 += Machine-independent data formats for array-oriented scientific data, libnetcdf_c++.so.5
+SPKG_DESC_CSWlibnetcdf-c++5 += C++ shared library for netcdf - libnetcdf_c++.so.5
 RUNTIME_DEP_PKGS_CSWlibnetcdf-c++5  = CSWhdf5rt
 RUNTIME_DEP_PKGS_CSWlibnetcdf-c++5 += CSWgcc4corert CSWgcc4core CSWgcc4g++rt
 RUNTIME_DEP_PKGS_CSWlibnetcdf-c++5 += CSWlibnetcdf6
@@ -70,7 +70,7 @@
 PKGFILES_CSWlibnetcdff5 += /opt/csw/lib/amd64/libnetcdff.so.5.0.0
 PKGFILES_CSWlibnetcdff5 += /opt/csw/lib/amd64/libnetcdff.so.5\.[0-9\.]+
 PKGFILES_CSWlibnetcdff5 += /opt/csw/lib/amd64/libnetcdff.so.5
-SPKG_DESC_CSWlibnetcdff5 = Machine-independent data formats for array-oriented scientific data, libnetcdff.so.5
+SPKG_DESC_CSWlibnetcdff5 = Fortran shared libraries for netcdf - libnetcdff.so.5 
 RUNTIME_DEP_PKGS_CSWlibnetcdff5  = CSWhdf5rt
 RUNTIME_DEP_PKGS_CSWlibnetcdff5 += CSWgcc4gfortranrt CSWgcc4corert CSWgcc4core
 RUNTIME_DEP_PKGS_CSWlibnetcdff5 += CSWlibnetcdf6
@@ -130,8 +130,6 @@
 ## Needed for "Large file support" in NetCDF
 EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 
-
-DEBUG_PACKAGING = 1
 ## Add GCC4 lib dir to CFLAGS and friends because gcc3core_rt puts it's 
 ## libgcc_s.so in /opt/csw/lib and this breaks the build in all sorts of weird 
 ## places.
@@ -154,12 +152,6 @@
 ## OPT_FLAGS_GCC = -O2 -pipe
 OPT_FLAGS_GCC = 
 
-## Mantis bug 4497 means there's no 64 symlink in CSWgcc4corert so you can't
-## link against these libraries without CSWgcc4core
-CHECKPKG_OVERRIDES_CSWlibnetcdf-c++5 += surplus-dependency|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWlibnetcdf6     += surplus-dependency|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWlibnetcdff5    += surplus-dependency|CSWgcc4core
-
 ## Git patching is failing on a remerge/repackage
 NOGITPATCH = 1
 


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