[csw-devel] SF.net SVN: gar:[9191] csw/mgar/pkg/poppler/trunk

[hson at users.sourceforge.net]

Revision: 9191
          http://gar.svn.sourceforge.net/gar/?rev=9191&view=rev
Author:   hson
Date:     2010-03-15 21:34:20 +0000 (Mon, 15 Mar 2010)

Log Message:
-----------
poppler: Fix for dependency loop

Modified Paths:
--------------
    csw/mgar/pkg/poppler/trunk/Makefile
    csw/mgar/pkg/poppler/trunk/checksums

Modified: csw/mgar/pkg/poppler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/poppler/trunk/Makefile	2010-03-15 19:59:11 UTC (rev 9190)
+++ csw/mgar/pkg/poppler/trunk/Makefile	2010-03-15 21:34:20 UTC (rev 9191)
@@ -11,24 +11,63 @@
 SPKG_SOURCEURL = http://poppler.freedesktop.org/
 MASTER_SITES = http://poppler.freedesktop.org/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += old_libs_i386.tar.bz2
+DISTFILES += old_libs_sparc.tar.bz2
 
-PATCHFILES += missing-includes.patch
+PACKAGES = CSWpoppler CSWlibpoppler CSWlibpopplerdev CSWlibpopplerdoc
+CATALOGNAME_CSWpoppler = poppler
+CATALOGNAME_CSWlibpoppler = libpoppler
+CATALOGNAME_CSWlibpopplerdev = libpoppler_devel
+CATALOGNAME_CSWlibpopplerdoc = libpoppler_doc
+SPKG_DESC_CSWpoppler = $(DESCRIPTION) - utilities
+SPKG_DESC_CSWlibpoppler = $(DESCRIPTION)
+SPKG_DESC_CSWlibpopplerdev = $(DESCRIPTION) - developer package
+SPKG_DESC_CSWlibpopplerdoc = $(DESCRIPTION) - documentation
 
-# If the url used to check for software update is different of MASTER_SITES, then 
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
+PKGFILES_CSWlibpoppler= $(PKGFILES_RT)
+PKGFILES_CSWlibpopplerdev = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibpopplerdoc = $(sharedstatedir)/gtk-doc/.*
+
+INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf
+
+RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig
+RUNTIME_DEP_PKGS_CSWpoppler += CSWftype2
+RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg
+RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler
+RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2
+
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWgtk2
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWjpeg
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibxml2
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpango
+RUNTIME_DEP_PKGS_CSWlibpoppler += CSWzlib
+
+CHECKPKG_OVERRIDES_CSWlibpopplerdev += missing-dependency|CSWlibpoppler
+
+#PATCHFILES += missing-includes.patch
+
 # UPSTREAM_MASTER_SITES = 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 BUILD64 = 1
 
+# Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib
+# when relinking libpoppler-glib during install phaze
+EXTRA_SOS_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs)
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
-RUNTIME_DEP_PKGS += CSWfconfig
-RUNTIME_DEP_PKGS += CSWftype2
-RUNTIME_DEP_PKGS += CSWggettextrt
-RUNTIME_DEP_PKGS += CSWglib2
-RUNTIME_DEP_PKGS += CSWjpeg
-RUNTIME_DEP_PKGS += CSWlibxml2
-RUNTIME_DEP_PKGS += CSWzlib
+include gar/category.mk
 
-include gar/category.mk
+post-install-isa-sparcv8:
+	(cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_sparc.tar.bz2|tar xf -)
+	$(MAKECOOKIE)
+
+post-install-isa-i386:
+	(cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_i386.tar.bz2|tar xf -)
+	$(MAKECOOKIE)

Modified: csw/mgar/pkg/poppler/trunk/checksums
===================================================================
--- csw/mgar/pkg/poppler/trunk/checksums	2010-03-15 19:59:11 UTC (rev 9190)
+++ csw/mgar/pkg/poppler/trunk/checksums	2010-03-15 21:34:20 UTC (rev 9191)
@@ -1,2 +1,3 @@
-bf4abf5006e4a812d00567eeea42faaa  missing-includes.patch
-4155346f9369b192569ce9184ff73e43  poppler-0.12.4.tar.gz
+776b02d90c238f08b9a8900d8e4a2580  old_libs_i386.tar.bz2
+eabd006c9b65bac874297157c8b774cb  old_libs_sparc.tar.bz2
+e1a2d98ba5a4199f20d7637a7d79a829  poppler-0.10.6.tar.gz


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