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

[rthurner at users.sourceforge.net]

Revision: 15148
          http://gar.svn.sourceforge.net/gar/?rev=15148&view=rev
Author:   rthurner
Date:     2011-07-20 11:05:07 +0000 (Wed, 20 Jul 2011)

Log Message:
-----------
apr: revert changes suggested by checkpkg, just ignore them

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

Modified: csw/mgar/pkg/apr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr/trunk/Makefile	2011-07-20 07:46:59 UTC (rev 15147)
+++ csw/mgar/pkg/apr/trunk/Makefile	2011-07-20 11:05:07 UTC (rev 15148)
@@ -14,15 +14,6 @@
 LICENSE = LICENSE
 PATCHFILES = 0001-Force-newly-built-libs-in-testsuite.patch
 
-
-PACKAGES += CSWapr-dev
-CATALOGNAME_CSWapr-dev = apr_dev
-PKGFILES_CSWapr-dev += /opt/csw/lib/libapr-1.so
-PKGFILES_CSWapr-dev += /opt/csw/lib/sparcv9/libapr-1.so
-CHECKPKG_OVERRIDES_CSWapr-dev += file-collision|/opt/csw/lib/libapr-1.so|CSWapr|CSWapr-dev
-CHECKPKG_OVERRIDES_CSWapr-dev += file-collision|/opt/csw/lib/sparcv9/libapr-1.so|CSWapr|CSWapr-dev
-
-
 BUILD64 = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -48,5 +39,12 @@
 # TBD: This is dependent on 32/64, make sure to have both in separate pathes:
 #   /opt/csw/share/build-1/apr_rules.mk
 
+CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/sparcv9/libapr-1.so
+CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libapr-1.so
+CHECKPKG_OVERRIDES_CSWapr += shared-lib-pkgname-mismatch|sonames=libapr-1.so.0|pkgname=CSWapr|expected=CSWlibapr10,CSWlibapr1-0|
+CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/sparcv9/libapr-1.so
+CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libapr-1.so
+CHECKPKG_OVERRIDES_CSWapr += file-with-bad-content|/usr/local|root/opt/csw/share/build-1/libtool
+
 include gar/category.mk
 


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