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

[bdwalton at users.sourceforge.net]

Revision: 9931
          http://gar.svn.sourceforge.net/gar/?rev=9931&view=rev
Author:   bdwalton
Date:     2010-05-20 00:12:44 +0000 (Thu, 20 May 2010)

Log Message:
-----------
xrender: kill the devel packages; kill the devel files for cx_libxrender

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-19 10:04:10 UTC (rev 9930)
+++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile	2010-05-20 00:12:44 UTC (rev 9931)
@@ -20,13 +20,10 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = libXrender-(\d+(?:\.\d+)*).tar.gz
 
-PACKAGES = CSWlibxrender CSWlibxrenderdevel
-PACKAGES += CSWcxlibxrender CSWcxlibxrenderdevel
+PACKAGES = CSWlibxrender CSWcxlibxrender
 
-CATALOGNAME_CSWlibxrender      = libxrender
-CATALOGNAME_CSWlibxrenderdevel = libxrender_devel
-CATALOGNAME_CSWcxlibxrender      = cx_libxrender
-CATALOGNAME_CSWcxlibxrenderdevel = cx_libxrender_devel
+CATALOGNAME_CSWlibxrender   = libxrender
+CATALOGNAME_CSWcxlibxrender = cx_libxrender
 
 BUILD_DEP_PKGS = CSWx11renderproto CSWsunx11devel
 
@@ -34,14 +31,10 @@
 RUNTIME_DEP_PKGS_CSWcxlibxrender += 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 = /opt/csw/lib/.*\.pc /opt/csw/.*\.h
-PKGFILES_CSWlibxrender = /opt/csw/lib/.*so.* /opt/csw/share/doc/libxender/.*
-PKGFILES_CSWcxlibxrenderdevel = /opt/csw/X11/.*\.pc /opt/csw/X11.*\.h
-PKGFILES_CSWcxlibxrender = /opt/csw/X11/lib/.*so.* /opt/csw/share/doc/cx_libxrender/.*
+PKGFILES_CSWlibxrender = /opt/csw/lib/.* /opt/csw/include/.*
+PKGFILES_CSWcxlibxrender = /opt/csw/X11/.* /opt/csw/share/doc/cx.*
 
 prefix_cswx11 = $(BUILD_PREFIX)/X11
 prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX))
@@ -60,10 +53,18 @@
 MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only
 MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir)
 
-PKGFILES_CSWlibxrenderdevel  = $(PKGFILES_DEVEL)
-
 CHECKPKG_OVERRIDES_CSWlibxrenderdevel += surplus-dependency|CSWlibxrender
 CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4
 CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4
 
 include gar/category.mk
+
+# if we're doing the cx version (/opt/csw/X11), then kill the devel bits that
+# are shipped with x11_xrenderproto
+post-install-modulated:
+	@( cd $(DESTDIR)/opt/csw/; \
+		if [ -d X11/include ]; then \
+			rm -rf X11/include; \
+			find . -name pkgconfig -type d | xargs rm -rf; \
+		fi )
+	@$(MAKECOOKIE)


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