From ef6f7125667ab96f2526623d808ac05ab17e72b2 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 5 Oct 2021 09:05:56 +0200
Subject: [PATCH] xpdf, bump version, remove tools provided by poppler (Arch
 approach) (#6232)

---
 .../{xpdf-4.00.recipe => xpdf-4.03.recipe}    | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)
 rename app-text/xpdf/{xpdf-4.00.recipe => xpdf-4.03.recipe} (76%)

diff --git a/app-text/xpdf/xpdf-4.00.recipe b/app-text/xpdf/xpdf-4.03.recipe
similarity index 76%
rename from app-text/xpdf/xpdf-4.00.recipe
rename to app-text/xpdf/xpdf-4.03.recipe
index 8205008b1..a4eab6e4a 100644
--- a/app-text/xpdf/xpdf-4.00.recipe
+++ b/app-text/xpdf/xpdf-4.03.recipe
@@ -3,11 +3,11 @@ DESCRIPTION="Xpdf is a free PDF viewer and toolkit, including a text extractor,
 converter, HTML converter, and more. Most of the tools are available as \
 open source."
 HOMEPAGE="https://www.xpdfreader.com/"
-COPYRIGHT="1996-2017 Glyph & Cog, LLC."
+COPYRIGHT="1996-2021 Glyph & Cog, LLC."
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="http://www.xpdfreader.com/dl/xpdf-$portVersion.tar.gz"
-CHECKSUM_SHA256="ff3d92c42166e35b1ba6aec9b5f0adffb5fc05a3eb95dc49505b6e344e4216d6"
+REVISION="1"
+SOURCE_URI="http://dl.xpdfreader.com/xpdf-$portVersion.tar.gz"
+CHECKSUM_SHA256="0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846"
 SOURCE_DIR="xpdf-$portVersion"
 ADDITIONAL_FILES="xpdfreader.rdef.in"
 
@@ -25,16 +25,8 @@ fi
 PROVIDES="
 	xpdf$secondaryArchSuffix = $portVersion
 	app:XpdfViewer$commandSuffix = $portVersion
-	cmd:xpdf$commandSuffix = $portVersion
-	cmd:pdfdetach$commandSuffix = $portVersion
-	cmd:pdffonts$commandSuffix = $portVersion
-	cmd:pdfimages$commandSuffix = $portVersion
-	cmd:pdfinfo$commandSuffix = $portVersion
 	cmd:pdftopng$commandSuffix = $portVersion
-	cmd:pdftoppm$commandSuffix = $portVersion
-	cmd:pdftops$commandSuffix = $portVersion
-	cmd:pdftohtml$commandSuffix = $portVersion
-	cmd:pdftotext$commandSuffix = $portVersion
+	cmd:xpdf$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -69,22 +61,26 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build
-	cd build
-	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSPLASH_CMYK=ON
-	make $jobArgs
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=$prefix \
+		-DCMAKE_INSTALL_MANDIR=$manDir \
+		-DSPLASH_CMYK=ON -L
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
-	rm -rf $prefix/man
+	make -C build install
 
 	mkdir -p $appsDir
 	mv $prefix/bin/xpdf $appsDir/XpdfReader
 	ln -s $appsDir/XpdfReader $prefix/bin/xpdf
 
+	# remove stuff provided by poppler
+	for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext pdftohtml; do
+		rm "$commandBinDir/${tool}" "$manDir/man1/${tool}.1"
+	done
+
 	local APP_SIGNATURE="application/x-vnd.xpdf"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"