pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
zathura-pdf-{mupdf,poppler}: Remove CONFLICTS
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Sat Sep 29 18:04:00 2018 +0200
Changeset: 737f998cdbd366b2d76bc4558c9238cf3dc36c2f
Modified Files:
zathura-pdf-mupdf/Makefile
zathura-pdf-poppler/Makefile
Log Message:
zathura-pdf-{mupdf,poppler}: Remove CONFLICTS
The zathura pdf plugins now install the .so in a separate location.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=737f998cdbd366b2d76bc4558c9238cf3dc36c2f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
zathura-pdf-mupdf/Makefile | 2 --
zathura-pdf-poppler/Makefile | 2 --
2 files changed, 4 deletions(-)
diffs:
diff --git a/zathura-pdf-mupdf/Makefile b/zathura-pdf-mupdf/Makefile
index 131c9f713b..3049c11a24 100644
--- a/zathura-pdf-mupdf/Makefile
+++ b/zathura-pdf-mupdf/Makefile
@@ -11,8 +11,6 @@ HOMEPAGE= https://pwmt.org/projects/zathura-pdf-mupdf/
COMMENT= Add PDF support to zathura using mupdf rendering engine
LICENSE= zlib
-CONFLICTS+= zathura-pdf-poppler-[0-9]*
-
USE_TOOLS+= pkg-config
CPPFLAGS+= -D_XOPEN_SOURCE=600
diff --git a/zathura-pdf-poppler/Makefile b/zathura-pdf-poppler/Makefile
index 3010575f76..6a6e27b006 100644
--- a/zathura-pdf-poppler/Makefile
+++ b/zathura-pdf-poppler/Makefile
@@ -10,8 +10,6 @@ HOMEPAGE= https://pwmt.org/projects/zathura/
COMMENT= Add PDF support to zathura using poppler rendering engine
LICENSE= zlib
-CONFLICTS+= zathura-pdf-mupdf-[0-9]*
-
USE_TOOLS+= pkg-config
.include "../../devel/py-meson/build.mk"
Home |
Main Index |
Thread Index |
Old Index