[csw-devel] SF.net SVN: gar:[5558] csw/mgar/pkg/pango/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5558
          http://gar.svn.sourceforge.net/gar/?rev=5558&view=rev
Author:   dmichelsen
Date:     2009-07-09 18:53:47 +0000 (Thu, 09 Jul 2009)

Log Message:
-----------
pango: Fix issue with 32/64 bit modules #3750

Modified Paths:
--------------
    csw/mgar/pkg/pango/trunk/Makefile
    csw/mgar/pkg/pango/trunk/checksums
    csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall

Modified: csw/mgar/pkg/pango/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pango/trunk/Makefile	2009-07-09 13:32:35 UTC (rev 5557)
+++ csw/mgar/pkg/pango/trunk/Makefile	2009-07-09 18:53:47 UTC (rev 5558)
@@ -37,6 +37,7 @@
 
 BUILD64 = 1
 NOISALIST = 1
+ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-x --enable-gtk-doc
 CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
@@ -58,3 +59,6 @@
 
 include gar/category.mk
 
+post-merge:
+	mkdir -p $(PKGROOT)$(sysconfdir)/64/pango
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pango/trunk/checksums
===================================================================
--- csw/mgar/pkg/pango/trunk/checksums	2009-07-09 13:32:35 UTC (rev 5557)
+++ csw/mgar/pkg/pango/trunk/checksums	2009-07-09 18:53:47 UTC (rev 5558)
@@ -1,2 +1,2 @@
-02de6afbc35cb1036031da7098463555  download/CSWpango.postinstall
+236547eb782b42500d0d743f25340599  download/CSWpango.postinstall
 63979efe16fe5abaa93c8ea48959e8f3  download/pango-1.24.3.tar.bz2

Modified: csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall
===================================================================
--- csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall	2009-07-09 13:32:35 UTC (rev 5557)
+++ csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall	2009-07-09 18:53:47 UTC (rev 5558)
@@ -6,8 +6,14 @@
 
 echo 'Updating pango.modules...'
 test -x ${PKG_ROOT_DIR}/opt/csw/bin/pango-querymodules && \
-	chroot "${PKG_ROOT_DIR}" /opt/csw/bin/pango-querymodules >/opt/csw/etc/pango/pango.modules &&
-	chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/pango/pango.modules f 0644 root bin &&
-	chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f CSWpango
+	chroot "${PKG_ROOT_DIR}" /opt/csw/bin/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/pango/pango.modules &&
+	chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/pango/pango.modules f 0644 root bin
+test -x ${PKG_ROOT_DIR}/opt/csw/bin/sparcv9/pango-querymodules && \
+	chroot "${PKG_ROOT_DIR}" /opt/csw/bin/sparcv9/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/64/pango/pango.modules &&
+	chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/64/pango/pango.modules f 0644 root bin
+test -x ${PKG_ROOT_DIR}/opt/csw/bin/amd64/pango-querymodules && \
+	chroot "${PKG_ROOT_DIR}" /opt/csw/bin/amd64/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/64/pango/pango.modules &&
+	chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/64/pango/pango.modules f 0644 root bin
 
+chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f CSWpango
 /bin/true


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