[csw-devel] SF.net SVN: gar:[9889] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 9889
          http://gar.svn.sourceforge.net/gar/?rev=9889&view=rev
Author:   bdwalton
Date:     2010-05-15 21:28:50 +0000 (Sat, 15 May 2010)

Log Message:
-----------
xrender: initial work toward modulating for sun x11 and csw x11

Modified Paths:
--------------
    csw/mgar/pkg/x11/lib/xrender/trunk/Makefile

Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile	2010-05-15 21:21:25 UTC (rev 9888)
+++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile	2010-05-15 21:28:50 UTC (rev 9889)
@@ -14,6 +14,9 @@
 DISTNAME = libXrender-$(GARVERSION)
 DISTFILES = $(DISTNAME).tar.gz
 
+EXTRA_MODULATORS = X11
+MODULATIONS_X11 = sunwx11 cswx11
+
 # Legacy libraries
 # The idea is to have the legacy libs in /opt/csw/lib to guarantee the existing
 # apps will continue to work. The new lib in /opt/csw/X11/lib relies on the
@@ -27,25 +30,45 @@
 UFILES_REGEX = libXrender-(\d+(?:\.\d+)*).tar.gz
 
 PACKAGES = CSWlibxrender CSWlibxrenderdevel
+PACKAGES += CSWcxlibxrender CSWcxlibxrenderdevel
 
 CATALOGNAME_CSWlibxrender      = libxrender
 CATALOGNAME_CSWlibxrenderdevel = libxrender_devel
+CATALOGNAME_CSWcxlibxrender      = cx_libxrender
+CATALOGNAME_CSWcxlibxrenderdevel = cx_libxrender_devel
 
-BUILD_DEP_PKGS = CSWx11renderproto
+BUILD_DEP_PKGS = CSWx11renderproto CSWsunx11devel
 RUNTIME_DEP_PKGS_CSWlibxrenderdevel = CSWlibxrender
 RUNTIME_DEP_PKGS_CSWlibxrender = CSWx11common CSWlibx11
 
 SPKG_DESC_CSWlibxrender = $(DESCRIPTION)
 SPKG_DESC_CSWlibxrenderdevel  = $(DESCRIPTION) Development Package
+SPKG_DESC_CSWcxlibxrender = $(DESCRIPTION) (bound against OpenCSW X11)
+SPKG_DESC_CSWcxlibxrenderdevel  = $(DESCRIPTION) Development Package (bound against OpenCSW X11)
 
 PKGFILES_CSWlibxrenderdevel  = $(PKGFILES_DEVEL)
 
+MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all
+MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only
+MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir)
+MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only
+MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) $(includedir)
+MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only
+MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir)
+
 BUILD64 = 1 
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
+STRIP_LIBTOOL = 1
+
 include gar/category.mk
 
+# this needs to be after the include as it's not a ?= in the x11
+# category...
+prefix_cswx11 = $(BUILD_PREFIX)/X11
+prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX))
+
 post-merge:
 	ginstall -d $(PKGROOT)$(BUILD_PREFIX)/lib
 	cp $(DOWNLOADDIR)/$(LEGACYLIB)-$(GARCH)  $(PKGROOT)$(BUILD_PREFIX)/lib/$(LEGACYLIB)


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