pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/doxygen Update to 1.8.6:
details: https://anonhg.NetBSD.org/pkgsrc/rev/c63f6c60d826
branches: trunk
changeset: 628459:c63f6c60d826
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Jan 02 18:26:36 2014 +0000
description:
Update to 1.8.6:
Highlights of Doxygen 1.8.6:
* When "using namespace" is used, a static member function in C++ is now recognized correctly;
* The install now prepends a slash to the installation path Removed superfluous;
* The HTML links in the RTF output are no longer broken;
* Indexing and searching can now treat non-ASCII identifiers;
* The RPM build via the spec file no longer fails;
* A Doxygen crash that occurred when a new-line is missing in a snippet has been fixed.
diffstat:
devel/doxygen/Makefile | 16 +++++++++++-----
devel/doxygen/PLIST | 5 +----
devel/doxygen/distinfo | 12 ++++++------
devel/doxygen/patches/patch-ab | 34 +++++++++++++++++-----------------
devel/doxygen/patches/patch-af | 13 ++-----------
5 files changed, 37 insertions(+), 43 deletions(-)
diffs (174 lines):
diff -r 9c7287968bf8 -r c63f6c60d826 devel/doxygen/Makefile
--- a/devel/doxygen/Makefile Thu Jan 02 17:58:32 2014 +0000
+++ b/devel/doxygen/Makefile Thu Jan 02 18:26:36 2014 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2013/12/16 06:35:22 asau Exp $
+# $NetBSD: Makefile,v 1.105 2014/01/02 18:26:36 wiz Exp $
-DISTNAME= doxygen-1.8.5.src
+DISTNAME= doxygen-1.8.6.src
PKGNAME= ${DISTNAME:S/.src//}
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
@@ -18,6 +18,7 @@
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --make ${GMAKE}
CONFIGURE_ARGS+= --perl ${PERL5}
+CONFIGURE_ARGS+= --python ${PYTHONBIN}
CONFIGURE_ARGS+= --install ${INSTALL}
CONFIGURE_ARGS+= --dot ${PREFIX}/bin/dot
CONFIGURE_ARGS+= --prefix ${PREFIX}
@@ -27,6 +28,8 @@
LDFLAGS.FreeBSD= -liconv
+REPLACE_PERL= tmake/bin/tmake
+
# Case Insensitive fs or Sensitive
PLIST_VARS+= ci cs
@@ -37,7 +40,6 @@
SUBST_STAGE.path= pre-configure
SUBST_FILES.path= doc/Makefile.in
SUBST_SED.path= -e "s|@EPSTOPDF@|${LOCALBASE}/bin/epstopdf|g"
-SUBST_SED.path+= -e "s|@PYTHONBIN@|${PYTHONBIN}|g"
SUBST_CLASSES+= perlbin
SUBST_STAGE.perlbin= pre-configure
@@ -71,6 +73,10 @@
post-patch:
touch ${WRKSRC}/src/doxytag.l
+# remove unnecessary files that leak tool paths
+post-install:
+ rm ${DESTDIR}${PREFIX}/share/doc/doxygen/examples/Makefile*
+
BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.12nb1
.include "options.mk"
@@ -78,9 +84,9 @@
.include "../../graphics/graphviz/buildlink3.mk"
.if !empty(PKG_BUILD_OPTIONS.graphviz:Mpangocairo)
-PLIST.pangocairo= yes
+PLIST.pangocairo= yes
.else
-PLIST.nopangocairo= yes
+PLIST.nopangocairo= yes
.endif
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c7287968bf8 -r c63f6c60d826 devel/doxygen/PLIST
--- a/devel/doxygen/PLIST Thu Jan 02 17:58:32 2014 +0000
+++ b/devel/doxygen/PLIST Thu Jan 02 18:26:36 2014 +0000
@@ -1,10 +1,7 @@
-@comment $NetBSD: PLIST,v 1.35 2013/05/21 14:43:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2014/01/02 18:26:36 wiz Exp $
bin/doxygen
man/man1/doxygen.1
${PLIST.latex}share/doc/doxygen/doxygen_manual.pdf
-${PLIST.latex}share/doc/doxygen/examples/Makefile
-${PLIST.latex}share/doc/doxygen/examples/Makefile.in
-${PLIST.latex}share/doc/doxygen/examples/Makefile.win.in
${PLIST.latex}share/doc/doxygen/examples/afterdoc.cfg
${PLIST.latex}share/doc/doxygen/examples/afterdoc.h
${PLIST.latex}share/doc/doxygen/examples/afterdoc/html/afterdoc_8h_source.html
diff -r 9c7287968bf8 -r c63f6c60d826 devel/doxygen/distinfo
--- a/devel/doxygen/distinfo Thu Jan 02 17:58:32 2014 +0000
+++ b/devel/doxygen/distinfo Thu Jan 02 18:26:36 2014 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.51 2013/09/02 16:38:56 wiz Exp $
+$NetBSD: distinfo,v 1.52 2014/01/02 18:26:36 wiz Exp $
-SHA1 (doxygen-1.8.5.src.tar.gz) = 1fc5ceec21122fe5037edee4c308ac94b59ee33e
-RMD160 (doxygen-1.8.5.src.tar.gz) = b826c120543a424a938759fc9efa71b855318008
-Size (doxygen-1.8.5.src.tar.gz) = 6511944 bytes
+SHA1 (doxygen-1.8.6.src.tar.gz) = 204f1b3695c73efac44a521609c5360241d64045
+RMD160 (doxygen-1.8.6.src.tar.gz) = a3ff624168061092c39a99759d85fb02e0dbb3b4
+Size (doxygen-1.8.6.src.tar.gz) = 7355610 bytes
SHA1 (patch-aa) = 74aa6e068c150d2e40c5a73723afd24d510f4538
-SHA1 (patch-ab) = 1bd196c38786bb6b0b1817bb9575924ca234aee3
+SHA1 (patch-ab) = d66d077fe05f26ecdb3c292d2e563e54ef7ab81a
SHA1 (patch-ac) = 87c68a2ce598c10d90d775764f4c05739eb51435
-SHA1 (patch-af) = 233fe278d6d47a0af799178cc35ed2fe2e833fd5
+SHA1 (patch-af) = 2af16b257b49c7917aff5f919da43e20bedec376
SHA1 (patch-ah) = db6f117bf1faa3a1ed0b2ca9af81fc4f8d0913f9
SHA1 (patch-aj) = d771e76cfc659442b2d41d5e3364b3c3189b42c8
diff -r 9c7287968bf8 -r c63f6c60d826 devel/doxygen/patches/patch-ab
--- a/devel/doxygen/patches/patch-ab Thu Jan 02 17:58:32 2014 +0000
+++ b/devel/doxygen/patches/patch-ab Thu Jan 02 18:26:36 2014 +0000
@@ -1,32 +1,32 @@
-$NetBSD: patch-ab,v 1.13 2013/01/06 01:00:59 wiz Exp $
+$NetBSD: patch-ab,v 1.14 2014/01/02 18:26:36 wiz Exp $
Convert $(INSTTOOL) to pkgsrc style Variables
---- Makefile.in.orig 2012-12-25 12:17:27.000000000 +0000
+--- Makefile.in.orig 2013-10-21 18:09:13.000000000 +0000
+++ Makefile.in
-@@ -56,19 +56,19 @@ DATE=$(shell date "+%B %Y")
+@@ -81,19 +81,19 @@ DATE=$(shell date "+%B %Y")
MAN1DIR = man/man1
install: doxywizard_install doxysearch_install
-- $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
-- $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
-- $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
-+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)/$(INSTALL)/bin
-+ $(BSD_INSTALL_PROGRAM) bin/doxygen $(DESTDIR)/$(INSTALL)/bin
-+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
+- $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
+- $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)$(INSTALL)/bin
+- $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
++ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(INSTALL)/bin
++ $(BSD_INSTALL_PROGRAM) bin/doxygen $(DESTDIR)$(INSTALL)/bin
++ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(INSTALL)/$(MAN1DIR)
cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1
-- $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
-+ $(BSD_INSTALL_MAN) doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
+- $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxygen.1
++ $(BSD_INSTALL_MAN) doxygen.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxygen.1
rm doxygen.1
install_docs:
-- $(INSTTOOL) -d $(DESTDIR)/$(DOCDIR)
-+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(DOCDIR)
+- $(INSTTOOL) -d $(DESTDIR)$(DOCDIR)
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(DOCDIR)
$(MAKE) -C examples
$(MAKE) -C doc
$(MAKE) -C latex
-- $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
-+ $(BSD_INSTALL_DATA) latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
- cp -r examples $(DESTDIR)/$(DOCDIR)
- cp -r html $(DESTDIR)/$(DOCDIR)
+- $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)$(DOCDIR)
++ $(BSD_INSTALL_DATA) latex/doxygen_manual.pdf $(DESTDIR)$(DOCDIR)
+ cp -r examples $(DESTDIR)$(DOCDIR)
+ cp -r html $(DESTDIR)$(DOCDIR)
diff -r 9c7287968bf8 -r c63f6c60d826 devel/doxygen/patches/patch-af
--- a/devel/doxygen/patches/patch-af Thu Jan 02 17:58:32 2014 +0000
+++ b/devel/doxygen/patches/patch-af Thu Jan 02 18:26:36 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.5 2013/09/02 16:38:56 wiz Exp $
+$NetBSD: patch-af,v 1.6 2014/01/02 18:26:36 wiz Exp $
---- doc/Makefile.in.orig 2013-07-27 21:46:15.000000000 +0000
+--- doc/Makefile.in.orig 2013-10-07 19:20:02.000000000 +0000
+++ doc/Makefile.in
@@ -23,7 +23,7 @@ all: language config.doc FORCE
@cp Makefile.latex ../latex/Makefile
@@ -11,12 +11,3 @@
clean:
rm -rf ../html ../latex *.bak
-@@ -31,7 +31,7 @@ clean:
- language: language.doc
-
- language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.py
-- python translator.py
-+ @PYTHONBIN@ translator.py
-
- config.doc: ../src/config.xml ../src/configgen.py
- python ../src/configgen.py -doc ../src/config.xml > config.doc
Home |
Main Index |
Thread Index |
Old Index