[csw-devel] SF.net SVN: gar:[5255] csw/mgar/pkg/x11/libxft/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5255
          http://gar.svn.sourceforge.net/gar/?rev=5255&view=rev
Author:   dmichelsen
Date:     2009-06-15 14:16:07 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
x11/libxft: Add legacy lib

Modified Paths:
--------------
    csw/mgar/pkg/x11/libxft/trunk/Makefile
    csw/mgar/pkg/x11/libxft/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/x11/libxft/trunk/files/libXft.so.2.1.2-i386
    csw/mgar/pkg/x11/libxft/trunk/files/libXft.so.2.1.2-sparc

Modified: csw/mgar/pkg/x11/libxft/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11/libxft/trunk/Makefile	2009-06-15 13:55:26 UTC (rev 5254)
+++ csw/mgar/pkg/x11/libxft/trunk/Makefile	2009-06-15 14:16:07 UTC (rev 5255)
@@ -13,12 +13,21 @@
 MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
+# 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
+# OpenCSW-specific X11 libs, whereas the existing one in /opt/csw/lib links
+# against the Sun X11.
+LEGACYLIB = libXft.so.2.1.2
+DISTFILES += $(LEGACYLIB)-i386
+DISTFILES += $(LEGACYLIB)-sparc
+
 PACKAGES = CSWlibxft2 CSWlibxft2devel
 
 CATALOGNAME_CSWlibxft2 = libxft2
 CATALOGNAME_CSWlibxft2devel = libxft2_devel
 
-REQUIRED_PKGS_CSWlibxft2 = CSWfconfig CSWftype2 CSWlibx11 CSWlibxrender
+REQUIRED_PKGS_CSWlibxft2 = CSWzlib CSWfconfig CSWftype2 CSWlibx11 CSWlibxrender
 REQUIRED_PKGS_CSWlibxft2devel = CSWlibxft2
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -32,3 +41,9 @@
 
 include gar/category.mk
 
+post-merge:
+	ginstall -d $(PKGROOT)$(BUILD_PREFIX)/lib
+	cp $(DOWNLOADDIR)/$(LEGACYLIB)-$(GARCH)  $(PKGROOT)$(BUILD_PREFIX)/lib/$(LEGACYLIB)
+	gln -s $(LEGACYLIB) $(PKGROOT)$(BUILD_PREFIX)/lib/libXft.so.2
+	gln -s $(LEGACYLIB) $(PKGROOT)$(BUILD_PREFIX)/lib/libXft.so
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/x11/libxft/trunk/checksums
===================================================================
--- csw/mgar/pkg/x11/libxft/trunk/checksums	2009-06-15 13:55:26 UTC (rev 5254)
+++ csw/mgar/pkg/x11/libxft/trunk/checksums	2009-06-15 14:16:07 UTC (rev 5255)
@@ -1 +1,3 @@
 40ebc53da7efd520e528fa7a564863db  download/libXft-2.1.13.tar.gz
+5e3b0eeedc8e2ed4926cb73de7b2bc06  download/libXft.so.2.1.2-i386
+637e1b24ae97f0070478c8096b81d81a  download/libXft.so.2.1.2-sparc

Added: csw/mgar/pkg/x11/libxft/trunk/files/libXft.so.2.1.2-i386
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/x11/libxft/trunk/files/libXft.so.2.1.2-i386
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/x11/libxft/trunk/files/libXft.so.2.1.2-sparc
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/x11/libxft/trunk/files/libXft.so.2.1.2-sparc
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


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