diff --git a/graphics/podofo/files/patch-CMakeLists.txt b/graphics/podofo/files/patch-CMakeLists.txt
index e1fbc8716862..f809260c5145 100644
--- a/graphics/podofo/files/patch-CMakeLists.txt
+++ b/graphics/podofo/files/patch-CMakeLists.txt
@@ -1,79 +1,70 @@
 --- CMakeLists.txt.orig	2021-01-05 16:56:54 UTC
 +++ CMakeLists.txt
 @@ -348,6 +348,7 @@ ELSE(LIBIDN_FOUND)
  	MESSAGE("Libidn not found. AES-256 Encryption support will be disabled")
  ENDIF(LIBIDN_FOUND)
  
 +IF(WANT_LIBJPEG)
  FIND_PACKAGE(LIBJPEG)
  
  IF(LIBJPEG_FOUND)
 @@ -357,7 +358,9 @@ IF(LIBJPEG_FOUND)
  ELSE(LIBJPEG_FOUND)
    MESSAGE("Libjpeg not found. JPEG support will be disabled")
  ENDIF(LIBJPEG_FOUND)
 +ENDIF(WANT_LIBJPEG)
  
 +IF(WANT_TIFF)
  FIND_PACKAGE(TIFF)
  
  IF(TIFF_FOUND)
 @@ -367,7 +370,9 @@ IF(TIFF_FOUND)
  ELSE(TIFF_FOUND)
    MESSAGE("Libtiff not found. TIFF support will be disabled")
  ENDIF(TIFF_FOUND)
 +ENDIF(WANT_TIFF)
  
 +IF(WANT_PNG)
  FIND_PACKAGE(PNG)
  
  IF(PNG_FOUND)
 @@ -378,6 +383,7 @@ ELSE(PNG_FOUND)
    MESSAGE("LibPng not found. PNG support will be disabled")
    SET(PNG_LIBRARIES "")
  ENDIF(PNG_FOUND)
 +ENDIF(WANT_PNG)
  
  FIND_PACKAGE(UNISTRING)
  
 @@ -393,6 +399,7 @@ ENDIF(UNISTRING_FOUND)
  
  IF(NOT PODOFO_BUILD_LIB_ONLY)
  
 +IF(WANT_CppUnit)
  FIND_PACKAGE(CppUnit)
  
  IF(CppUnit_FOUND)
 @@ -402,6 +409,7 @@ IF(CppUnit_FOUND)
  ELSE(CppUnit_FOUND)
    MESSAGE("Cppunit not found. No unit tests will be built.")
  ENDIF(CppUnit_FOUND)
 +ENDIF(WANT_CppUnit)
  
  ENDIF(NOT PODOFO_BUILD_LIB_ONLY)
  
 @@ -442,6 +450,7 @@ ELSE(WANT_FONTCONFIG)
  ENDIF(WANT_FONTCONFIG)
  
  IF(NOT PODOFO_BUILD_LIB_ONLY)
 +IF(WANT_LUA)
  FIND_PACKAGE(LUA)
  IF(LUA_FOUND)
  	# If we have lua, we can build podofoimpose.
 @@ -453,6 +462,7 @@ IF(LUA_FOUND)
  ELSE(LUA_FOUND)
  	MESSAGE("Lua not found - PoDoFoImpose and PoDoFoColor will be built without Lua support")
  ENDIF(LUA_FOUND)
 +ENDIF(WANT_LUA)
  ENDIF(NOT PODOFO_BUILD_LIB_ONLY)
  
  
-@@ -539,7 +549,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC)
- #
- # Setup directories we will need
- #
--SET(MANDIR "share/man/")
-+SET(MANDIR "man/")
- 
- # Create the config file. It'll be appended to as the subdirs run though
- # then dependency information will be written to it at the end of the
diff --git a/graphics/podofo/pkg-plist b/graphics/podofo/pkg-plist
index 5d5d488d50d2..91553156fea3 100644
--- a/graphics/podofo/pkg-plist
+++ b/graphics/podofo/pkg-plist
@@ -1,147 +1,147 @@
 bin/podofobox
 bin/podofocolor
 bin/podofocountpages
 bin/podofocrop
 bin/podofoencrypt
 bin/podofogc
 bin/podofoimg2pdf
 bin/podofoimgextract
 bin/podofoimpose
 bin/podofoincrementalupdates
 bin/podofomerge
 bin/podofonooc
 bin/podofopages
 bin/podofopdfinfo
 bin/podofosign
 bin/podofotxt2pdf
 bin/podofotxtextract
 bin/podofouncompress
 bin/podofoxmp
 include/podofo/base/Pdf3rdPtyForwardDecl.h
 include/podofo/base/PdfArray.h
 include/podofo/base/PdfCanvas.h
 include/podofo/base/PdfColor.h
 include/podofo/base/PdfCompilerCompat.h
 include/podofo/base/PdfCompilerCompatPrivate.h
 include/podofo/base/PdfContentsTokenizer.h
 include/podofo/base/PdfData.h
 include/podofo/base/PdfDataType.h
 include/podofo/base/PdfDate.h
 include/podofo/base/PdfDefines.h
 include/podofo/base/PdfDefinesPrivate.h
 include/podofo/base/PdfDictionary.h
 include/podofo/base/PdfEncoding.h
 include/podofo/base/PdfEncodingFactory.h
 include/podofo/base/PdfEncrypt.h
 include/podofo/base/PdfError.h
 include/podofo/base/PdfExtension.h
 include/podofo/base/PdfFileStream.h
 include/podofo/base/PdfFilter.h
 include/podofo/base/PdfFiltersPrivate.h
 include/podofo/base/PdfImmediateWriter.h
 include/podofo/base/PdfInputDevice.h
 include/podofo/base/PdfInputStream.h
 include/podofo/base/PdfLocale.h
 include/podofo/base/PdfMemStream.h
 include/podofo/base/PdfMemoryManagement.h
 include/podofo/base/PdfName.h
 include/podofo/base/PdfObject.h
 include/podofo/base/PdfObjectStreamParserObject.h
 include/podofo/base/PdfOutputDevice.h
 include/podofo/base/PdfOutputStream.h
 include/podofo/base/PdfOwnedDataType.h
 include/podofo/base/PdfParser.h
 include/podofo/base/PdfParserObject.h
 include/podofo/base/PdfRect.h
 include/podofo/base/PdfRefCountedBuffer.h
 include/podofo/base/PdfRefCountedInputDevice.h
 include/podofo/base/PdfReference.h
 include/podofo/base/PdfStream.h
 include/podofo/base/PdfString.h
 include/podofo/base/PdfTokenizer.h
 include/podofo/base/PdfVariant.h
 include/podofo/base/PdfVecObjects.h
 include/podofo/base/PdfVersion.h
 include/podofo/base/PdfWriter.h
 include/podofo/base/PdfXRef.h
 include/podofo/base/PdfXRefStream.h
 include/podofo/base/PdfXRefStreamParserObject.h
 include/podofo/base/podofo_config.h
 include/podofo/base/podofoapi.h
 include/podofo/base/util/PdfMutex.h
 include/podofo/base/util/PdfMutexImpl_noop.h
 include/podofo/base/util/PdfMutexImpl_pthread.h
 include/podofo/base/util/PdfMutexImpl_win32.h
 include/podofo/base/util/PdfMutexWrapper.h
 include/podofo/doc/PdfAcroForm.h
 include/podofo/doc/PdfAction.h
 include/podofo/doc/PdfAnnotation.h
 include/podofo/doc/PdfCMapEncoding.h
 include/podofo/doc/PdfContents.h
 include/podofo/doc/PdfDestination.h
 include/podofo/doc/PdfDifferenceEncoding.h
 include/podofo/doc/PdfDocument.h
 include/podofo/doc/PdfElement.h
 include/podofo/doc/PdfEncodingObjectFactory.h
 include/podofo/doc/PdfExtGState.h
 include/podofo/doc/PdfField.h
 include/podofo/doc/PdfFileSpec.h
 include/podofo/doc/PdfFont.h
 include/podofo/doc/PdfFontCID.h
 include/podofo/doc/PdfFontCache.h
 include/podofo/doc/PdfFontConfigWrapper.h
 include/podofo/doc/PdfFontFactory.h
 include/podofo/doc/PdfFontFactoryBase14Data.h
 include/podofo/doc/PdfFontMetrics.h
 include/podofo/doc/PdfFontMetricsBase14.h
 include/podofo/doc/PdfFontMetricsFreetype.h
 include/podofo/doc/PdfFontMetricsObject.h
 include/podofo/doc/PdfFontSimple.h
 include/podofo/doc/PdfFontTTFSubset.h
 include/podofo/doc/PdfFontTrueType.h
 include/podofo/doc/PdfFontType1.h
 include/podofo/doc/PdfFontType1Base14.h
 include/podofo/doc/PdfFontType3.h
 include/podofo/doc/PdfFunction.h
 include/podofo/doc/PdfHintStream.h
 include/podofo/doc/PdfIdentityEncoding.h
 include/podofo/doc/PdfImage.h
 include/podofo/doc/PdfInfo.h
 include/podofo/doc/PdfMemDocument.h
 include/podofo/doc/PdfNamesTree.h
 include/podofo/doc/PdfOutlines.h
 include/podofo/doc/PdfPage.h
 include/podofo/doc/PdfPagesTree.h
 include/podofo/doc/PdfPagesTreeCache.h
 include/podofo/doc/PdfPainter.h
 include/podofo/doc/PdfPainterMM.h
 include/podofo/doc/PdfShadingPattern.h
 include/podofo/doc/PdfSignOutputDevice.h
 include/podofo/doc/PdfSignatureField.h
 include/podofo/doc/PdfStreamedDocument.h
 include/podofo/doc/PdfTable.h
 include/podofo/doc/PdfTilingPattern.h
 include/podofo/doc/PdfXObject.h
 include/podofo/podofo-base.h
 include/podofo/podofo.h
 lib/libpodofo.a
 lib/libpodofo.so
 lib/libpodofo.so.0
 libdata/pkgconfig/libpodofo.pc
-man/man1/podofobox.1.gz
-man/man1/podofocolor.1.gz
-man/man1/podofocountpages.1.gz
-man/man1/podofocrop.1.gz
-man/man1/podofoencrypt.1.gz
-man/man1/podofogc.1.gz
-man/man1/podofoimg2pdf.1.gz
-man/man1/podofoimgextract.1.gz
-man/man1/podofoimpose.1.gz
-man/man1/podofoincrementalupdates.1.gz
-man/man1/podofomerge.1.gz
-man/man1/podofopages.1.gz
-man/man1/podofopdfinfo.1.gz
-man/man1/podofotxt2pdf.1.gz
-man/man1/podofotxtextract.1.gz
-man/man1/podofouncompress.1.gz
-man/man1/podofoxmp.1.gz
+share/man/man1/podofobox.1.gz
+share/man/man1/podofocolor.1.gz
+share/man/man1/podofocountpages.1.gz
+share/man/man1/podofocrop.1.gz
+share/man/man1/podofoencrypt.1.gz
+share/man/man1/podofogc.1.gz
+share/man/man1/podofoimg2pdf.1.gz
+share/man/man1/podofoimgextract.1.gz
+share/man/man1/podofoimpose.1.gz
+share/man/man1/podofoincrementalupdates.1.gz
+share/man/man1/podofomerge.1.gz
+share/man/man1/podofopages.1.gz
+share/man/man1/podofopdfinfo.1.gz
+share/man/man1/podofotxt2pdf.1.gz
+share/man/man1/podofotxtextract.1.gz
+share/man/man1/podofouncompress.1.gz
+share/man/man1/podofoxmp.1.gz