Re: UPDATE: Add no_x11 flavor to textproc/xpdf

[Marc Balmer]

Landry Breuil wrote:

On Mon, Jan 14, 2008 at 03:32:52PM -0800, Jeremy Evans wrote:

On 11/14 08:56, Landry Breuil wrote:

On Tue, Nov 13, 2007 at 02:38:38PM -0800, Jeremy Evans wrote:

This diff adds a no_x11 flavor to textproc/xpdf.  This is necessary if
you want to use the pdftotext program without X being installed.  This
patch is the same is one sent last week, update to -current for the
recent security patch to xpdf.

Tested on i386. Please test and commit.

We (bernd and i) had a look at your previous patch, and it seems to make
more sense to have a multi-packages with xpdf-main and xpdf-utils, the latter
containing what corresponds to your no_x11 flavor.
An updated diff should appear soon, there is only a little issue about
upgrading from xpdf to xpdf-main+xpdf-utils which leads to conflicts.

I agree, multi-packages make more sense.  I'm not sure if you had time
to work on a diff, so I prepared one.  It is attached.  Hopefully we can
work out the upgrade conflicts.

Ah, yes, bernd@ sent me a diff a while ago about this one, with a
@pkgpath marker to solve the update/conflicts. It also moves pdftops to
-main package, i'm not sure if it's needed.. and -main doesn't
run_depends on -utils.

xpdf users, what do you think about it ? Is it worth making this
MULTI_PACKAGES ? Attached diff needs comments and feedback.

I'd prefer a single package.  i.e. users must have X11 installed.

Landry

Thanks,
Jeremy

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/xpdf/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile    9 Nov 2007 07:15:12 -0000       1.57
+++ Makefile    14 Jan 2008 23:27:50 -0000
@@ -1,9 +1,11 @@
 # $OpenBSD: Makefile,v 1.57 2007/11/09 07:15:12 bernd Exp $

-COMMENT= PDF viewer for X11

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

DISTNAME= xpdf-3.02

-PKGNAME=       xpdf-3.02pl2
+PKGNAME-main=  xpdf-main-3.02pl2p0
+PKGNAME-utils= xpdf-utils-3.02pl2
 CATEGORIES=    textproc x11

MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \

@@ -12,6 +14,7 @@
 PATCHFILES=    xpdf-3.02pl1.patch xpdf-3.02pl2.patch
 PATCH_DIST_STRIP=-p1

+MULTI_PACKAGES= -main -utils

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

LIB_DEPENDS+= t1.>=3::devel/t1lib

@@ -22,8 +25,8 @@
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=               ICE SM X11 Xext Xp Xpm Xt c freetype m pthread \
-                       stdc++ z
+WANTLIB-utils= c pthread stdc++ freetype z m
+WANTLIB-main=  ${WANTLIB-utils} ICE SM X11 Xext Xp Xpm Xt

USE_X11= Yes

 USE_GMAKE=     Yes
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR   15 Dec 2003 21:55:33 -0000      1.6
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-Xpdf is an open source viewer for Portable Document Format (PDF) files.
-The Xpdf project also includes a PDF text extractor, PDF-to-PostScript
-converter, and various other utilities.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-main      14 Jan 2008 23:27:50 -0000
@@ -0,0 +1 @@
+Xpdf is an open source viewer for Portable Document Format (PDF) files.
Index: pkg/DESCR-utils
===================================================================
RCS file: pkg/DESCR-utils
diff -N pkg/DESCR-utils
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-utils     14 Jan 2008 23:27:50 -0000
@@ -0,0 +1,3 @@
+These are various command line tools distributed by the Xpdf project,
+including a PDF text extractor, PDF-to-PostScript converter, and other
+utilities.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST   15 Sep 2004 18:44:09 -0000      1.9
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.9 2004/09/15 18:44:09 espie Exp $
-bin/pdffonts
-bin/pdfimages
-bin/pdfinfo
-bin/pdftoppm
-bin/pdftops
-bin/pdftotext
-bin/xpdf
[EMAIL PROTECTED] man/man1/pdffonts.1
[EMAIL PROTECTED] man/man1/pdfimages.1
[EMAIL PROTECTED] man/man1/pdfinfo.1
[EMAIL PROTECTED] man/man1/pdftoppm.1
[EMAIL PROTECTED] man/man1/pdftops.1
[EMAIL PROTECTED] man/man1/pdftotext.1
[EMAIL PROTECTED] man/man1/xpdf.1
[EMAIL PROTECTED] man/man5/xpdfrc.5
-share/examples/xpdf/
-share/examples/xpdf/xpdfrc
[EMAIL PROTECTED] ${SYSCONFDIR}/xpdfrc
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-main      14 Jan 2008 23:27:50 -0000
@@ -0,0 +1,5 @@
[EMAIL PROTECTED] $OpenBSD$
+bin/pdftoppm
+bin/xpdf
[EMAIL PROTECTED] man/man1/pdftoppm.1
[EMAIL PROTECTED] man/man1/xpdf.1
Index: pkg/PLIST-utils
===================================================================
RCS file: pkg/PLIST-utils
diff -N pkg/PLIST-utils
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-utils     14 Jan 2008 23:27:50 -0000
@@ -0,0 +1,15 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.9 2004/09/15 18:44:09 espie Exp $
+bin/pdffonts
+bin/pdfimages
+bin/pdfinfo
+bin/pdftops
+bin/pdftotext
[EMAIL PROTECTED] man/man1/pdffonts.1
[EMAIL PROTECTED] man/man1/pdfimages.1
[EMAIL PROTECTED] man/man1/pdfinfo.1
[EMAIL PROTECTED] man/man1/pdftops.1
[EMAIL PROTECTED] man/man1/pdftotext.1
[EMAIL PROTECTED] man/man5/xpdfrc.5
+share/examples/xpdf/
+share/examples/xpdf/xpdfrc
[EMAIL PROTECTED] ${SYSCONFDIR}/xpdfrc