[csw-devel] SF.net SVN: gar:[18527] csw/mgar/pkg/xpdf/trunk

[cgrzemba at users.sourceforge.net]

Revision: 18527
          http://gar.svn.sourceforge.net/gar/?rev=18527&view=rev
Author:   cgrzemba
Date:     2012-06-25 14:25:53 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
xpdf/trunk: remove tools which are contained in CSWpoppler

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

Modified: csw/mgar/pkg/xpdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xpdf/trunk/Makefile	2012-06-25 13:47:09 UTC (rev 18526)
+++ csw/mgar/pkg/xpdf/trunk/Makefile	2012-06-25 14:25:53 UTC (rev 18527)
@@ -1,8 +1,8 @@
 NAME = xpdf
-VERSION = 3.02
+VERSION = 3.03
 CATEGORIES = utils
 GARTYPE = v2
-RELEASE = p4
+RELEASE = 
 
 DESCRIPTION = Open source viewer for Portable Document Format (PDF) files
 define BLURB
@@ -21,26 +21,59 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
+GARCOMPILER = SOS12U3
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 PACKAGES = CSWxpdf CSWxpdfutils
 CATALOGNAME_CSWxpdf = xpdf
-CATALOGNAME_CSWxpdfutils = xpdf_utils
+CATALOGNAME_CSWxpdf-utils = xpdf_utils
 SPKG_DESC_CSWxpdf = $(DESCRIPTION)
 SPKG_DESC_CSWxpdfutils = $(DESCRIPTION) - utils
 
 # we require
-RUNTIME_DEP_PKGS = CSWftype2 CSWt1lib CSWgsfonts
+RUNTIME_DEP_PKGS = CSWgsfonts
+RUNTIME_DEP_PKGS_CSWxpdf += CSWxpm
+RUNTIME_DEP_PKGS_CSWxpdf += CSWlibfreetype6
 
+
 # poppler also has pdffonts, pdfimages et al.
-INCOMPATIBLE_PKGS_CSWxpdfutils = CSWpoppler
+# INCOMPATIBLE_PKGS_CSWxpdfutils = CSWpoppler
 
 PKGFILES_CSWxpdf += $(call baseisadirs,$(bindir),[^/]*xpdf)
 PKGFILES_CSWxpdf += $(sysconfdir)/.*
 PKGFILES_CSWxpdf += $(mandir)/man.*/xpdf.*
 
+#content moved to package CSWpoppler
+EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdffonts)
+EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdfimages)
+EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdfinfo)
+EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftoabw)
+EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftohtml)
+EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftoppm)
+EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftops)
+EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftotext)
+EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdffonts.*
+EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdfimages.1
+EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdfinfo.1
+EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftoabw.1
+EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftohtml.1
+EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftoppm.1
+EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftops.1
+EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftotext.1
+
 # Yes, we need gsfonts
 CHECKPKG_OVERRIDES_CSWxpdfutils += surplus-dependency|CSWgsfonts
 CHECKPKG_OVERRIDES_CSWxpdf += surplus-dependency|CSWgsfonts
+CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/local|root/opt/csw/bin/xpdf
+CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/xpdfrc.5
+CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/xpdf.1
+CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/local|root/etc/opt/csw/xpdfrc
+CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/share|root/opt/csw/bin/xpdf
+CHECKPKG_OVERRIDES_CSWxpdfutils += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pdfdetach.1
+CHECKPKG_OVERRIDES_CSWxpdfutils += file-with-bad-content|/usr/local|root/opt/csw/bin/pdfdetach
+CHECKPKG_OVERRIDES_CSWxpdfutils += file-with-bad-content|/usr/share|root/opt/csw/bin/pdfdetach
 
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-t1-library=$(libdir)
 CONFIGURE_ARGS += --with-t1-includes=$(includedir)
@@ -51,14 +84,16 @@
 
 EXTRA_SOS_LD_FLAGS = -L/usr/openwin/lib
 EXTRA_SOS_LD_OPTIONS = -R/usr/openwin/lib
+EXTRA_CXXFLAGS = -I/opt/csw/include
+EXTRA_LINKER_FLAGS = -norunpath
 
 # apply patches
-PATCHFILES  = xpdf-3.02pl1.patch
-PATCHFILES += xpdf-3.02pl2.patch
-PATCHFILES += xpdf-3.02pl3.patch
-PATCHFILES += xpdf-3.02pl4.patch
-PATCHFILES += patch-GString.cc
-PATCHFILES += patch-XPDFCore.cc
+# PATCHFILES  = xpdf-3.02pl1.patch
+# PATCHFILES += xpdf-3.02pl2.patch
+# PATCHFILES += xpdf-3.02pl3.patch
+# PATCHFILES += xpdf-3.02pl4.patch
+# PATCHFILES += patch-GString.cc
+# PATCHFILES += patch-XPDFCore.cc
 
 # no test script
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/xpdf/trunk/checksums
===================================================================
--- csw/mgar/pkg/xpdf/trunk/checksums	2012-06-25 13:47:09 UTC (rev 18526)
+++ csw/mgar/pkg/xpdf/trunk/checksums	2012-06-25 14:25:53 UTC (rev 18527)
@@ -1,7 +1 @@
-28cd772ed42159f2dbbe3a0e8e9e4dfa  patch-GString.cc
-4c23bc375fbb6096fb8b2266d0ef527d  patch-XPDFCore.cc
-599dc4cc65a07ee868cf92a667a913d2  xpdf-3.02.tar.gz
-877118786dfe27d1b7aa5a6759cc6e45  xpdf-3.02pl1.patch
-3a5cb165ae66781e0b21e6219ae06795  xpdf-3.02pl2.patch
-581963ede0fb5715e1a69f01b5b8ce63  xpdf-3.02pl3.patch
-70b752716798dd341a4bf890df5f6fdc  xpdf-3.02pl4.patch
+af75f772bee0e5ae4a811ff9d03eac5a  xpdf-3.03.tar.gz

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