[csw-devel] SF.net SVN: gar:[18633] csw/mgar/pkg/pdftohtml/trunk

[pfelecan at users.sourceforge.net]

Revision: 18633
          http://gar.svn.sourceforge.net/gar/?rev=18633&view=rev
Author:   pfelecan
Date:     2012-07-04 09:42:07 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
pdftohtml/trunk: verify and validated overrides

Modified Paths:
--------------
    csw/mgar/pkg/pdftohtml/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/pdftohtml/trunk/files/0002-Fix-paths.patch

Modified: csw/mgar/pkg/pdftohtml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pdftohtml/trunk/Makefile	2012-07-04 09:28:53 UTC (rev 18632)
+++ csw/mgar/pkg/pdftohtml/trunk/Makefile	2012-07-04 09:42:07 UTC (rev 18633)
@@ -5,7 +5,7 @@
 GARTYPE = v2
 CATEGORIES = apps
 
-DESCRIPTION = converts files from PDF into HTML
+DESCRIPTION = Converts files from PDF into HTML
 define BLURB
   Pdftohtml is a tool based on the Xpdf package which translates pdf
   documents into html format.
@@ -15,12 +15,19 @@
 DISTFILES		=	$(DISTNAME).tar.gz
 DISTFILES		+=	COPYING
 PATCHFILES		+=	0001-Silent-write-strings-warnings.patch
+PATCHFILES		+=	0002-Fix-paths.patch
 
 BUILD_DEP_PKGS		+=	CSWhelp2man
 
 RUNTIME_DEP_PKGS	+=	CSWlibgcc-s1
 RUNTIME_DEP_PKGS	+=	CSWlibstdc++6
+RUNTIME_DEP_PKGS	+=	CSWxpdf
+RUNTIME_DEP_PKGS	+=	CSWgsfonts
 
+CHECKPKG_OVERRIDES_CSWpdftohtml	+=	surplus-dependency|CSWxpdf
+CHECKPKG_OVERRIDES_CSWpdftohtml	+=	surplus-dependency|CSWgsfonts
+CHECKPKG_OVERRIDES_CSWpdftohtml	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/pdftohtml
+
 GARCOMPILER			=	GNU
 CONFIGURE_SCRIPTS	=
 TEST_SCRIPTS		=

Added: csw/mgar/pkg/pdftohtml/trunk/files/0002-Fix-paths.patch
===================================================================
--- csw/mgar/pkg/pdftohtml/trunk/files/0002-Fix-paths.patch	                        (rev 0)
+++ csw/mgar/pkg/pdftohtml/trunk/files/0002-Fix-paths.patch	2012-07-04 09:42:07 UTC (rev 18633)
@@ -0,0 +1,39 @@
+From 95c38b3504586ea7072dc44f3d36759d86c80370 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 4 Jul 2012 10:46:45 +0200
+Subject: [PATCH] Fix paths
+
+---
+ aconf.h              |    2 +-
+ xpdf/GlobalParams.cc |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/aconf.h b/aconf.h
+index ae0fe35..81826dd 100755
+--- a/aconf.h
++++ b/aconf.h
+@@ -36,7 +36,7 @@
+ /*
+  * Full path for the system-wide xpdfrc file.
+  */
+-#define SYSTEM_XPDFRC "/usr/local/etc/xpdfrc"
++#define SYSTEM_XPDFRC "/opt/csw/etc/xpdfrc"
+ 
+ /*
+  * Various include files and functions.
+diff --git a/xpdf/GlobalParams.cc b/xpdf/GlobalParams.cc
+index d48a948..06fc03c 100755
+--- a/xpdf/GlobalParams.cc
++++ b/xpdf/GlobalParams.cc
+@@ -107,7 +107,7 @@ static char *displayFontDirs[] = {
+ #else
+ static char *displayFontDirs[] = {
+   "/usr/share/ghostscript/fonts",
+-  "/usr/local/share/ghostscript/fonts",
++  "/opt/csw/share/ghostscript/fonts",
+   "/usr/share/fonts/default/Type1",
+   "/usr/share/fonts/default/ghostscript",
+   "/usr/share/fonts/type1/gsfonts",
+-- 
+1.7.10.3
+

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