cleaning

diff --git a/Makefile b/Makefile
index 46ffa46583207e0ab257bd8534e007415595a9b7..3358fffd43d879da0b331fcb146a11d16a17c094 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ PORTVERSION=    1
 PORTREVISION=  0
 CATEGORIES=    graphics gnome
 MASTER_SITES=https://inkscape.org/gallery/item/18460/
+DISTNAME=${PORTNAME}-1.0_2020-05-01_4035a4fb49
 DISTFILES=inkscape-${PORTVERSION}.${PORTREVISION}.tar.xz
-DISTNAME=${PORTNAME}-${PORTVERSION}.${PORTREVISION}_2020-05-01_4035a4fb49
 
 MAINTAINER=    gnome@FreeBSD.org
 COMMENT=       Full featured open source SVG editor
@@ -42,10 +42,12 @@ LIB_DEPENDS=        \
 USES=  compiler:c++11-lib cmake \
                iconv:wchar_t jpeg pathfix pkgconfig python:3.5+ \
                shebangfix tar:xz xorg \
-               desktop-file-utils 
+               desktop-file-utils
+
 USE_GNOME=     gtkmm30 libxml2 libxslt cairo pango
 USE_XORG=      x11 xext ice sm
 
+USE_LDCONFIG=  yes
 INSTALLS_ICONS=        yes
 
 SHEBANG_FILES= \
@@ -93,7 +95,7 @@ LCMS_DESC=                    LCMS support
 LCMS_CMAKE_BOOL=       ENABLE_LCMS
 LCMS_LIB_DEPENDS=      liblcms2.so:graphics/lcms2
 
-GTKSPELL_DESC=         Support of GTK spell    
+GTKSPELL_DESC=         Support of GTK spell
 GTKSPELL_CMAKE_BOOL=   WITH_GTKSPELL
 GTKSPELL_LIB_DEPENDS=  libgtkspell3-3.so:textproc/gtkspell3
 
@@ -106,7 +108,7 @@ IMAGEMAGICK_DESC=   Support of ImageMagick for raster extensions and image import
 IMAGEMAGICK_LIB_DEPENDS=       libMagick++-6.so:graphics/ImageMagick6
 IMAGEMAGICK_CMAKE_BOOL=WITH_IMAGE_MAGICK
 
-GRAPHICSMAGICK_DESC=   support of GraphicsMagick for raster extensions and image import resolution 
+GRAPHICSMAGICK_DESC=   support of GraphicsMagick for raster extensions and image import resolution
 GRAPHICSMAGICK_LIB_DEPENDS=    libGraphicsMagick++.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_BOOL=WITH_GRAPHICS_MAGICK
 

diff --git a/files/patch-CMakeScripts_Pod2man.cmake b/files/patch-CMakeScripts_Pod2man.cmake
index 29b42e55e8cd64a1545b661464ea2e670a5a8d31..48bb05850b9a9ecb44574cc6a9f25e4c97ff26ca 100644 (file)
--- a/files/patch-CMakeScripts_Pod2man.cmake
+++ b/files/patch-CMakeScripts_Pod2man.cmake
@@ -1,14 +1,14 @@
---- CMakeScripts/Pod2man.cmake.orig    2020-05-10 11:54:24.428342000 +0200
+--- CMakeScripts/Pod2man.cmake.orig    2020-05-01 13:17:41 UTC
 +++ CMakeScripts/Pod2man.cmake
-@@ -27,6 +27,7 @@
+@@ -27,6 +27,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
      if(NOT EXISTS ${PODFILE_FULL})
          message(FATAL ERROR "Could not find pod file ${PODFILE_FULL} to generate man page")
      endif(NOT EXISTS ${PODFILE_FULL})
 +      message(STATUS "pod2man ${CMAKE_CURRENT_SOURCE_DIR}" )
-
+ 
      if(POD2MAN)
          if(LANG)
-@@ -34,13 +35,13 @@
+@@ -34,13 +35,13 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
              set(MANFILE_TEMP "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.${LANG}.tmp")
              set(MANFILE_FULL "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.${LANG}.${SECTION}")
              set(MANFILE_FULL_GZ "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.${LANG}.${SECTION}.gz")
@@ -24,8 +24,8 @@
          endif()
          add_custom_command(
              OUTPUT ${MANFILE_TEMP}
-@@ -50,7 +51,7 @@
-
+@@ -50,7 +51,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
+ 
          add_custom_command(
              OUTPUT ${MANFILE_FULL}
 -            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fix-roff-punct "${MANFILE_TEMP}" > ${MANFILE_FULL}
@@ -33,4 +33,3 @@
              DEPENDS ${MANFILE_TEMP}
          )
          if(GZIP)
-