pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mupdf: Install mjsgen, mujstest and muraster (AKA EXTRA_APPS)



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Sep 26 16:26:30 2018 +0200
Changeset:	dee16a32ce4ddfb9f96e70e0254647faa3a97885

Modified Files:
	mupdf/PLIST
	mupdf/TODO
	mupdf/distinfo
	mupdf/patches/patch-ac

Log Message:
mupdf: Install mjsgen, mujstest and muraster (AKA EXTRA_APPS)

EXTRA_APPS were no longer installed due missing adjustments of patches/patch-ac
(sorry!), readjust it and always install them like print/mupdf.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dee16a32ce4ddfb9f96e70e0254647faa3a97885

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

diffstat:
 mupdf/PLIST            | 3 +++
 mupdf/TODO             | 2 --
 mupdf/distinfo         | 2 +-
 mupdf/patches/patch-ac | 8 +++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diffs:
diff --git a/mupdf/PLIST b/mupdf/PLIST
index c67779dfa4..54628ab7c2 100644
--- a/mupdf/PLIST
+++ b/mupdf/PLIST
@@ -1,6 +1,9 @@
 @comment $NetBSD$
+bin/mjsgen
+bin/mujstest
 bin/mupdf
 ${PLIST.opengl}bin/mupdf-gl
+bin/muraster
 bin/mutool
 include/mupdf/fitz.h
 include/mupdf/fitz/annotation.h
diff --git a/mupdf/TODO b/mupdf/TODO
index 65dd11420c..9785d0ba1c 100644
--- a/mupdf/TODO
+++ b/mupdf/TODO
@@ -30,6 +30,4 @@
    (gdb) quit
 
   ...please try to investigate further!
-- Some tools in bin/* are no longer present... what happened to them? Please
-  investigate!
 - Prepare a COMMIT_MSG
diff --git a/mupdf/distinfo b/mupdf/distinfo
index 5a6f140223..ffbe30b120 100644
--- a/mupdf/distinfo
+++ b/mupdf/distinfo
@@ -6,7 +6,7 @@ SHA512 (mupdf-1.14.0-rc1-source.tar.gz) = e31b145b7fb6490751ae3b4f0b7c4877288756
 Size (mupdf-1.14.0-rc1-source.tar.gz) = 55658756 bytes
 SHA1 (patch-Makethird) = 33b7ccf235e971c44e159a687cecc033155957ba
 SHA1 (patch-ab) = 5ef190923d648165cdf29174f1521bd069c7e6f9
-SHA1 (patch-ac) = c1f9fc9223f91dc2edcffcc1111de5103cd9a1bb
+SHA1 (patch-ac) = 4f685e425bff4d257ca3bce3d2b536d5cea1e8aa
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
 SHA1 (patch-platform_gl_gl-main.c) = 8211423b2abdd1b1ce8af30da060f7d8e4c8fca0
diff --git a/mupdf/patches/patch-ac b/mupdf/patches/patch-ac
index 081fdc2133..bb30c8144b 100644
--- a/mupdf/patches/patch-ac
+++ b/mupdf/patches/patch-ac
@@ -294,10 +294,11 @@ $NetBSD: patch-ac,v 1.19 2018/05/06 13:19:10 leot Exp $
  
  # --- Format man pages ---
  
-@@ -337,27 +341,29 @@ extra-apps: $(EXTRA_APPS)
+@@ -336,28 +340,30 @@ apps: $(INSTALL_APPS)
+ extra-apps: $(EXTRA_APPS)
  extra: extra-libs extra-apps
  
- install: libs apps
+-install: libs apps
 -	install -d $(DESTDIR)$(incdir)/mupdf
 -	install -d $(DESTDIR)$(incdir)/mupdf/fitz
 -	install -d $(DESTDIR)$(incdir)/mupdf/pdf
@@ -319,6 +320,7 @@ $NetBSD: patch-ac,v 1.19 2018/05/06 13:19:10 leot Exp $
 -	install README COPYING CHANGES $(DESTDIR)$(docdir)
 -	install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
 -	install docs/examples/* $(DESTDIR)$(docdir)/examples
++install: libs apps extra-apps
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir) $(DESTDIR)$(incdir)/mupdf $(DESTDIR)$(incdir)/mupdf/fitz $(DESTDIR)$(incdir)/mupdf/pdf
 +	${BSD_INSTALL_DATA} include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
 +	${BSD_INSTALL_DATA} include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
@@ -330,7 +332,7 @@ $NetBSD: patch-ac,v 1.19 2018/05/06 13:19:10 leot Exp $
 +	done
 +
 +	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
-+	for f in $(INSTALL_APPS); do \
++	for f in $(INSTALL_APPS) $(EXTRA_APPS); do \
 +		${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $$f $(DESTDIR)$(bindir); \
 +	done
 +


Home | Main Index | Thread Index | Old Index