[csw-devel] SF.net SVN: gar:[16719] csw/mgar/pkg/cfengine3/trunk

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sat Jan 7 14:32:39 CET 2012


Revision: 16719
          http://gar.svn.sourceforge.net/gar/?rev=16719&view=rev
Author:   guengel
Date:     2012-01-07 13:32:39 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
cfengine3/trunk: Properly obsoleting CSWlibpromises1 now. Added Solaris 10 to PACKAGING_PLATFORMS.

Modified Paths:
--------------
    csw/mgar/pkg/cfengine3/trunk/Makefile
    csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-06 15:36:39 UTC (rev 16718)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-07 13:32:39 UTC (rev 16719)
@@ -26,6 +26,8 @@
 
 UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris9-sparc solaris9-i386
+
 # File name regex to get notifications about upstream software releases
 # NOTE: Use this only if the automatic regex creation
 #       does not work for your package
@@ -50,8 +52,12 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWlibpcre0
 CHECKPKG_OVERRIDES_CSW$(NAME)rt += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)rt|catalogname=$(NAME)_rt|expected-catalogname=$(NAME)rt
-OBSOLETED_BY_CSW$(name)rt = CSWlibpromises1
+# Moved to runtime, since there are no header files for this library.
+CHECKPKG_OVERRIDES_CSW$(NAMES)rt += shared-lib-pkgname-mismatch
+OBSOLETED_BY_CSW$(NAME)rt = CSWlibpromises1
+CATALOGNAME_CSWlibpromises1 = libpromises1_stub
 
+
 PACKAGES += CSW$(NAME)server
 CATALOGNAME_CSW$(NAME)server = $(NAME)_server
 SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary
@@ -64,9 +70,8 @@
 PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-serverd.*
 PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-runagent.*
 PKGFILES_CSW$(NAME)server += $(initddir)/csw$(NAME)-cfserverd
-PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/README.CSW
+PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/.*\.CSW
 CHECKPKG_OVERRIDES_CSW$(NAME)server += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)server|catalogname=$(NAME)_server|expected-catalogname=$(NAME)server
-CHECKPKG_OVERRIDES_CSW$(NAME)server += surplus-dependency|CSW$(NAME)rt
 
 PACKAGES += CSW$(NAME)client
 CATALOGNAME_CSW$(NAME)client = $(NAME)_client
@@ -84,7 +89,7 @@
 PKGFILES_CSW$(NAME)client += $(cfengine_workdir_bin)/cf-agent
 PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfexecd
 PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfmonitord
-PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/README.CSW
+PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/.*\.CSW
 CHECKPKG_OVERRIDES_CSW$(NAME)client += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)client|catalogname=$(NAME)_client|expected-catalogname=$(NAME)client
 
 # CFEngine provides three daemons
@@ -126,6 +131,9 @@
 EXTRA_RUNPATH_ISALIST   = $(EXTRA_RUNPATH_DIRS)
 EXTRA_LDFLAGS = -L$(prefix)/bdb48/lib/$(MM_LIBDIR)
 
+# Those libs are used by configure to detect getaddrinfo()
+EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl"
+
 include gar/category.mk
 
 post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files
@@ -179,3 +187,8 @@
 			done ; \
 		fi ; \
 	done
+
+post-merge:
+# Get rid of the .so files. Since there are no header files provided,
+# .so files are pretty much useless
+	find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \;
\ No newline at end of file

Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	2012-01-06 15:36:39 UTC (rev 16718)
+++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	2012-01-07 13:32:39 UTC (rev 16719)
@@ -2,4 +2,9 @@
 
   * Obsoleted CSWlibpromises1.
 
+  * Built now explicitely with LIBS="-lsocket -lnsl" in order to make
+    configure detect getaddrinfo()
+
+  * Packages are now also built for Solaris 10.
+
  -- Rafael Ostertag <raos at opencsw.org>  Fri, 06 Jan 2012 16:24:39 +0100

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



More information about the devel mailing list