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

[rthurner at users.sourceforge.net]

Revision: 15079
          http://gar.svn.sourceforge.net/gar/?rev=15079&view=rev
Author:   rthurner
Date:     2011-07-17 08:13:14 +0000 (Sun, 17 Jul 2011)

Log Message:
-----------
libserf: ignore strange file collision errors reported by checkpkg

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

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2011-07-17 07:30:07 UTC (rev 15078)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2011-07-17 08:13:14 UTC (rev 15079)
@@ -14,30 +14,17 @@
 
 MASTER_SITES = http://serf.googlecode.com/files/
 DISTFILES  = $(DISTNAME).tar.bz2
+LICENSE = LICENSE
+VENDOR_URL = http://code.google.com/p/serf/
 
-DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = serf-(\d+(?:\.\d+)*).tar.bz2
 
-OBSOLETED_BY_CSWlibserf0-0 = CSWlibserf
-OBSOLETED_BY_CSWlibserf-dev = CSWlibserf
+PACKAGES += CSWlibserf1-0
+CATALOGNAME_CSWlibserf1-0 = libserf1_0
+SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, provides libserf-1.so.0
+DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib
 
-PACKAGES += CSWlibserf0-0
-CATALOGNAME_CSWlibserf0-0 = libserf0_0
-SPKG_DESC_CSWlibserf0-0 += HTTP client library built on APR, multiplexes connections, provides libserf-0.so.0
-PKGFILES_CSWlibserf0-0 += $(call baseisadirs,$(libdir),libserf-0\.so\.0(\.\d+)*)
-
-PACKAGES += CSWlibserf-dev
-CATALOGNAME_CSWlibserf-dev = libserf_dev
-SPKG_DESC_CSWlibserf-dev = Development files for libserf
-PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf0-0
-
-LICENSE = LICENSE
-
-VENDOR_URL = http://code.google.com/p/serf/
-
 # Make sure the current directory comes before everything else
 INCLUDE_FLAGS = -I. -I$(includedir)
 
@@ -53,6 +40,13 @@
 
 TEST_TARGET = check
 
+CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_util.h|CSWlibserf-devel|CSWlibserf1-0
+CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_private.h|CSWlibserf-devel|CSWlibserf1-0
+CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_types.h|CSWlibserf-devel|CSWlibserf1-0
+CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf.h|CSWlibserf-devel|CSWlibserf1-0
+CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so
+CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so
+
 include gar/category.mk
 
 post-configure-modulated: APR_LIBTOOL = $(shell $(bindir)/apr-1-config --apr-libtool)


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