CVS commit: pkgsrc/print/poppler

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr 17 18:07:37 UTC 2018

Modified Files:
        pkgsrc/print/poppler: Makefile Makefile.common
Removed Files:
        pkgsrc/print/poppler/patches: patch-gtkdoc.py

Log Message:
poppler: removed unused patch; pkglint fixes


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/print/poppler/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/print/poppler/Makefile.common
cvs rdiff -u -r1.2 -r0 pkgsrc/print/poppler/patches/patch-gtkdoc.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/poppler/Makefile
diff -u pkgsrc/print/poppler/Makefile:1.71 pkgsrc/print/poppler/Makefile:1.72
--- pkgsrc/print/poppler/Makefile:1.71  Tue Apr 17 05:20:34 2018
+++ pkgsrc/print/poppler/Makefile       Tue Apr 17 18:07:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2018/04/17 05:20:34 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2018/04/17 18:07:37 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -13,20 +13,19 @@ INSTALLATION_DIRS+= include/poppler shar
 
 # TODO: Later add an option to choose Splash versus Cairo backend.
 # Build the Splash graphics backend.
-CMAKE_ARGS+=    -DENABLE_SPLASH=ON
+CMAKE_ARGS+=   -DENABLE_SPLASH=ON
 # Don't compile GTK+ test program.
-CMAKE_ARGS+=    -DBUILD_GTK_TESTS=OFF
+CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
 # Don't compile GLib wrapper which also needs gtk2
-CMAKE_ARGS+=    -DENABLE_GLIB=OFF
+CMAKE_ARGS+=   -DENABLE_GLIB=OFF
 # Don't build and install the tools
-CMAKE_ARGS+=    -DENABLE_UTILS=OFF
+CMAKE_ARGS+=   -DENABLE_UTILS=OFF
 # Don't compile poppler cpp wrapper.
-CMAKE_ARGS+=    -DENABLE_CPP=OFF
+CMAKE_ARGS+=   -DENABLE_CPP=OFF
 # Don't compile poppler qt5 wrapper.
-CMAKE_ARGS+=    -DENABLE_QT5=OFF
+CMAKE_ARGS+=   -DENABLE_QT5=OFF
 # Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+=    -DENABLE_LIBCURL=OFF
-
+CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/print/poppler/Makefile.common
diff -u pkgsrc/print/poppler/Makefile.common:1.95 pkgsrc/print/poppler/Makefile.common:1.96
--- pkgsrc/print/poppler/Makefile.common:1.95   Tue Apr 17 05:20:34 2018
+++ pkgsrc/print/poppler/Makefile.common        Tue Apr 17 18:07:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.95 2018/04/17 05:20:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.96 2018/04/17 18:07:37 adam Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -26,7 +26,7 @@ USE_LANGUAGES=                c c++
 USE_CMAKE=             yes
 
 # Don't accidentally find libtiff
-CMAKE_ARGS+=    -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
+CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)