On Wed, Nov 01, 2023 at 09:39:09PM +0100, Matthias Kilian wrote:
> Hi,
>
> On Wed, Nov 01, 2023 at 07:32:25AM +0000, Klemens Nanni wrote:
> > On Wed, Nov 01, 2023 at 01:33:36AM +0100, Matthias Kilian wrote:
> > > On Tue, Oct 31, 2023 at 10:42:16AM +0000, Klemens Nanni wrote:
> > > > 'UPDATE: xpdf-4.04' from februrary 2023 rsadowski's new 4.x port and sthen's
> > > > rename idea: https://marc.info/?l=openbsd-ports&m=167562578021303&w=2
> > > [...]
> > > > Thoughts?
> > >
> > > May it be worth the pain to re-introduce a subpackage xpdf-utils
> > > (for pdfdetach and pdftopng)?
> >
> > To be able to install xpdf and poppler-utils at the same time?
> > Port-wise this shouldn't be difficult, so why not if deemed better.
>
> Or just @comment both binaries (and man pages), and un@comment
> pdfdetach in poppler-utils PLIST. I guess we can live without
> something like pdftopng.
Why drop pdftopng from xpdf, what's the problem?
poppler does not have it.
> > But is this directly related to the update and rename?
>
> No, The update and rename is fine for me.
If at all, it'd be easier to sort this out before, imho.
>
> > Would you do this before update/rename or afterwards, i.e. only to new
> > xpdf-4.04 and leave xpdf3-3.04 without utilities?
>
> Well, @commment the utilities in both versions of xpdf, un@comment
> pdfdetach in poppler-utils, then commit all three in a small time
> window should be ok.
So you want to move pdfdetach to poppler-utils?
Can you elaborate why?
IIUC, diff below is what you want.
But again, I don't know the difference between the two versions and/or why
pdfdetach is in xpdf now while pdfattach comes from poppler.
Index: textproc/xpdf/Makefile
===================================================================
RCS file: /cvs/ports/textproc/xpdf/Makefile,v
diff -u -p -r1.98 Makefile
--- textproc/xpdf/Makefile 22 Oct 2023 15:16:54 -0000 1.98
+++ textproc/xpdf/Makefile 2 Nov 2023 02:30:18 -0000
@@ -3,7 +3,7 @@ COMMENT= PDF viewer for X11
DISTNAME= xpdf-3.04
CATEGORIES= textproc x11
EPOCH= 0
-REVISION= 2
+REVISION= 3
SITES= https://xpdfreader-dl.s3.amazonaws.com/old/
@@ -33,7 +33,7 @@ COMPILER = base-clang ports-gcc base-gc
NO_TEST= Yes
# others are already in popper-utils
-PROGS= xpdf pdfdetach pdftopng
+PROGS= xpdf pdftopng
ALL_TARGET= ${PROGS}
do-install:
Index: textproc/xpdf/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/xpdf/pkg/PLIST,v
diff -u -p -r1.14 PLIST
--- textproc/xpdf/pkg/PLIST 11 Mar 2022 20:03:37 -0000 1.14
+++ textproc/xpdf/pkg/PLIST 2 Nov 2023 02:30:12 -0000
@@ -1,10 +1,9 @@
+@conflict poppler-utils-<23.10.0p0
@conflict xpdf-utils-*
@pkgpath textproc/xpdf,-main
@pkgpath textproc/xpdf,-utils
-@bin bin/pdfdetach
@bin bin/pdftopng
@bin bin/xpdf
-@man man/man1/pdfdetach.1
@man man/man1/pdftopng.1
@man man/man1/xpdf.1
@man man/man5/xpdfrc.5
Index: print/poppler/Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.176 Makefile
--- print/poppler/Makefile 11 Oct 2023 18:09:12 -0000 1.176
+++ print/poppler/Makefile 2 Nov 2023 02:29:25 -0000
@@ -10,6 +10,7 @@ PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
PKGNAME-qt5= poppler-qt5-$V
PKGNAME-qt6= poppler-qt6-$V
+REVISION-utils= 0
EXTRACT_SUFX= .tar.xz
Index: print/poppler/pkg/PLIST-utils
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-utils,v
diff -u -p -r1.6 PLIST-utils
--- print/poppler/pkg/PLIST-utils 11 Mar 2022 19:51:06 -0000 1.6
+++ print/poppler/pkg/PLIST-utils 2 Nov 2023 02:29:07 -0000
@@ -1,8 +1,9 @@
+@conflict xpdf-<3.04p3
@conflict xpdf-utils-*
@conflict poppler-<0.18.4p0
@pkgpath textproc/xpdf,-utils
@bin bin/pdfattach
-@comment bin/pdfdetach
+@bin bin/pdfdetach
@bin bin/pdffonts
@bin bin/pdfimages
@bin bin/pdfinfo
@@ -14,7 +15,7 @@
@bin bin/pdftotext
@bin bin/pdfunite
@man man/man1/pdfattach.1
-@comment man/man1/pdfdetach.1
+@man man/man1/pdfdetach.1
@man man/man1/pdffonts.1
@man man/man1/pdfimages.1
@man man/man1/pdfinfo.1
No comments:
Post a Comment