Skip to content

Commit

Permalink
Update to xpdf-3.03.
Browse files Browse the repository at this point in the history
  • Loading branch information
mkilian committed Oct 1, 2011
1 parent a485b03 commit a8e006d
Showing 13 changed files with 39 additions and 309 deletions.
21 changes: 7 additions & 14 deletions textproc/xpdf/Makefile
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
# $OpenBSD: Makefile,v 1.80 2011/09/16 11:41:42 espie Exp $
# $OpenBSD: Makefile,v 1.81 2011/10/01 19:46:35 kili Exp $

COMMENT-main= PDF viewer for X11
COMMENT-utils= PDF conversion tools

DISTNAME= xpdf-3.02
PKGNAME-main= xpdf-3.02.5
REVISION-main= 3
PKGNAME-utils= xpdf-utils-3.02.5
REVISION-utils = 0
DISTNAME= xpdf-3.03
PKGNAME-main= xpdf-3.03
PKGNAME-utils= xpdf-utils-3.03
CATEGORIES= textproc x11

MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
ftp://gd.tuwien.ac.at/publishing/xpdf/ \
ftp://tug.org/xpdf/
PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch \
xpdf-3.02pl3.patch xpdf-3.02pl4.patch \
xpdf-3.02pl5.patch
PATCH_DIST_STRIP=-p1
http://mirror.ctan.org/support/xpdf/

HOMEPAGE= http://www.foolabs.com/xpdf/

MULTI_PACKAGES= -main -utils

# GPLv2
# GPLv2 only or GPLv3 only or both (at our choice)
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -40,14 +34,13 @@ CONFIGURE_ENV= CPPFLAGS='-I${X11BASE}/include/freetype2 -I${X11BASE}/include -I
MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'

LIB_DEPENDS-utils=
LIB_DEPENDS-main= devel/t1lib ${LIB_DEPENDS}
RUN_DEPENDS-utils= print/ghostscript/gnu-fonts
RUN_DEPENDS-main= ${RUN_DEPENDS-utils} \
${FULLPKGNAME-utils}:textproc/xpdf,-utils

WANTLIB-utils= c m pthread stdc++ z
WANTLIB-main= ${WANTLIB} ${WANTLIB-utils} ICE SM X11 Xext Xpm Xt \
freetype t1>=3 Xm
freetype Xm

NO_REGRESS= Yes

35 changes: 5 additions & 30 deletions textproc/xpdf/distinfo
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
MD5 (xpdf-3.02.tar.gz) = WZ3EzGWgfuhoz5KmZ6kT0g==
MD5 (xpdf-3.02pl1.patch) = h3EYeG3+J9G3qlpnWcxuRQ==
MD5 (xpdf-3.02pl2.patch) = OlyxZa5meB4LIeYhmuBnlQ==
MD5 (xpdf-3.02pl3.patch) = WBlj7eD7VxXhpp8BtbjOYw==
MD5 (xpdf-3.02pl4.patch) = cLdScWeY3TQaS/iQ319v3A==
MD5 (xpdf-3.02pl5.patch) = UEkCyl6dZsZ+7QNjbsaxYw==
RMD160 (xpdf-3.02.tar.gz) = 6QDLhnC4xDC+qkWJX7R0QRyxlY0=
RMD160 (xpdf-3.02pl1.patch) = XDEPlnYPcunBBisAxXwu0DWsZ1c=
RMD160 (xpdf-3.02pl2.patch) = ACTj0gPWngc6RYVwzsVnniYK0gQ=
RMD160 (xpdf-3.02pl3.patch) = hZ7DEx08RSamB17mOcXrcEGUIRs=
RMD160 (xpdf-3.02pl4.patch) = QoBl6Mljm2eZcFsha+YD9S77iiI=
RMD160 (xpdf-3.02pl5.patch) = 9QKnxTEek18+Sl/Vt3C0TmjAmno=
SHA1 (xpdf-3.02.tar.gz) = +ZQGmIQMioBFZ36L5oq4WAkD4go=
SHA1 (xpdf-3.02pl1.patch) = zTyO1uH9NgYJi4XVzIp9GqMFJm0=
SHA1 (xpdf-3.02pl2.patch) = 0ILr4NNsrQwEYDlQIW9cUt4cJZM=
SHA1 (xpdf-3.02pl3.patch) = I/SWgEgCo9pTDx0Lq4lLrj6Tj8I=
SHA1 (xpdf-3.02pl4.patch) = GqMIehx4gohK59OlAiQKVazKZf0=
SHA1 (xpdf-3.02pl5.patch) = Cs1J5zu6R/oex7R5648TmKM+q7w=
SHA256 (xpdf-3.02.tar.gz) = szp9VvRUwzGuUJlvmJ6GyRZuV6+Xt03ijN3z1RrBHwA=
SHA256 (xpdf-3.02pl1.patch) = WPYTsAtBSoaqd2t2/NiZu0FeTuTtwhhMinxO0QBNu/M=
SHA256 (xpdf-3.02pl2.patch) = 0cHYh7C4pSg/BPgl5E8IXy6S2ve1GIiazxvInqB+2dk=
SHA256 (xpdf-3.02pl3.patch) = WUzo+9I7/ynqzd+uNTPGPH6GtKJPfUXkTxk309GeU0s=
SHA256 (xpdf-3.02pl4.patch) = sIRDlUETGHZu91CYd4f3eCMelLwV8E9/fRb0H9WBiLA=
SHA256 (xpdf-3.02pl5.patch) = kvyzCDoZ43swlpeAQ/rqjHd+eq7KODS4Mtmbwq8xcbo=
SIZE (xpdf-3.02.tar.gz) = 674912
SIZE (xpdf-3.02pl1.patch) = 1050
SIZE (xpdf-3.02pl2.patch) = 20843
SIZE (xpdf-3.02pl3.patch) = 30727
SIZE (xpdf-3.02pl4.patch) = 6982
SIZE (xpdf-3.02pl5.patch) = 1065
MD5 (xpdf-3.03.tar.gz) = r3X3cr7g5a5KgR/50D6sWg==
RMD160 (xpdf-3.03.tar.gz) = 7xM2wYkCb7Ds0Wnis3taWqIuBL4=
SHA1 (xpdf-3.03.tar.gz) = SZQj6KeV4O/XbKeYI5600NUv4kg=
SHA256 (xpdf-3.03.tar.gz) = As9j2PYybtpkQJbND5aeFYhwKthyIsHpOIqTwnD7zso=
SIZE (xpdf-3.03.tar.gz) = 795537
8 changes: 4 additions & 4 deletions textproc/xpdf/patches/patch-Makefile_in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2008/02/10 20:25:14 landry Exp $
--- Makefile.in.orig Mon Nov 12 11:33:36 2007
+++ Makefile.in Mon Nov 12 11:34:40 2007
@@ -94,13 +94,8 @@ install: dummy
$OpenBSD: patch-Makefile_in,v 1.2 2011/10/01 19:46:35 kili Exp $
--- Makefile.in.orig Mon Aug 15 23:08:52 2011
+++ Makefile.in Thu Aug 18 21:10:22 2011
@@ -102,13 +102,8 @@ install: dummy
$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
-mkdir -p $(DESTDIR)@mandir@/man5
$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
11 changes: 6 additions & 5 deletions textproc/xpdf/patches/patch-doc_sample-xpdfrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_sample-xpdfrc,v 1.3 2010/05/27 14:55:40 jasper Exp $
--- doc/sample-xpdfrc.orig Tue Feb 27 23:05:51 2007
+++ doc/sample-xpdfrc Thu May 27 16:51:17 2010
$OpenBSD: patch-doc_sample-xpdfrc,v 1.4 2011/10/01 19:46:35 kili Exp $
--- doc/sample-xpdfrc.orig Mon Aug 15 23:08:53 2011
+++ doc/sample-xpdfrc Thu Aug 18 21:10:22 2011
@@ -56,7 +56,7 @@

# Set the default PostScript file or command.
@@ -10,9 +10,10 @@ $OpenBSD: patch-doc_sample-xpdfrc,v 1.3 2010/05/27 14:55:40 jasper Exp $

# Set the default PostScript paper size -- this can be letter, legal,
# A4, or A3. You can also specify a paper size as width and height
@@ -88,4 +88,4 @@
@@ -88,5 +88,5 @@
# Set the command used to run a web browser when a URL hyperlink is
# clicked.

-#urlCommand "netscape -remote 'openURL(%s)'"
-#launchCommand viewer-script
+#urlCommand "firefox -newtab -url 'openURL(%s)'"
#urlCommand "netscape -remote 'openURL(%s)'"
34 changes: 0 additions & 34 deletions textproc/xpdf/patches/patch-splash_SplashXPathScanner_cc

This file was deleted.

8 changes: 4 additions & 4 deletions textproc/xpdf/patches/patch-splash_SplashXPath_cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$OpenBSD: patch-splash_SplashXPath_cc,v 1.2 2010/12/04 10:45:21 miod Exp $
--- splash/SplashXPath.cc.orig Tue Feb 27 22:05:52 2007
+++ splash/SplashXPath.cc Fri Dec 3 21:16:36 2010
@@ -76,10 +76,26 @@ SplashXPath::SplashXPath(SplashPath *path, SplashCoord
$OpenBSD: patch-splash_SplashXPath_cc,v 1.3 2011/10/01 19:46:35 kili Exp $
--- splash/SplashXPath.cc.orig Mon Aug 15 23:08:53 2011
+++ splash/SplashXPath.cc Thu Aug 18 21:10:22 2011
@@ -73,10 +73,26 @@ SplashXPath::SplashXPath(SplashPath *path, SplashCoord
sizeof(SplashXPathAdjust));
for (i = 0; i < path->hintsLength; ++i) {
hint = &path->hints[i];
31 changes: 0 additions & 31 deletions textproc/xpdf/patches/patch-xpdf_Catalog_cc

This file was deleted.

10 changes: 5 additions & 5 deletions textproc/xpdf/patches/patch-xpdf_GlobalParams_cc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$OpenBSD: patch-xpdf_GlobalParams_cc,v 1.1 2009/04/04 14:45:48 naddy Exp $
--- xpdf/GlobalParams.cc.orig Fri Apr 3 19:30:57 2009
+++ xpdf/GlobalParams.cc Fri Apr 3 19:31:18 2009
@@ -110,11 +110,7 @@ static char *displayFontDirs[] = {
$OpenBSD: patch-xpdf_GlobalParams_cc,v 1.2 2011/10/01 19:46:35 kili Exp $
--- xpdf/GlobalParams.cc.orig Mon Aug 15 23:08:53 2011
+++ xpdf/GlobalParams.cc Thu Aug 18 21:56:42 2011
@@ -110,11 +110,7 @@ static const char *displayFontDirs[] = {
};
#else
static char *displayFontDirs[] = {
static const char *displayFontDirs[] = {
- "/usr/share/ghostscript/fonts",
- "/usr/local/share/ghostscript/fonts",
- "/usr/share/fonts/default/Type1",
138 changes: 0 additions & 138 deletions textproc/xpdf/patches/patch-xpdf_Object_h

This file was deleted.

26 changes: 0 additions & 26 deletions textproc/xpdf/patches/patch-xpdf_SplashOutputDev_cc

This file was deleted.

12 changes: 0 additions & 12 deletions textproc/xpdf/patches/patch-xpdf_Stream_cc

This file was deleted.

Loading

0 comments on commit a8e006d

Please sign in to comment.