diff options
author | mef <mef@pkgsrc.org> | 2012-07-08 12:33:39 +0000 |
---|---|---|
committer | mef <mef@pkgsrc.org> | 2012-07-08 12:33:39 +0000 |
commit | 3ac7890ebde7eb563209ade8c8b981ed99ac17e0 (patch) | |
tree | 198d4cf66dde04dd785e0db06ad1df2f3c7c0f43 | |
parent | 646243263274b6549548c4aff4e8e998d8c21c1f (diff) | |
download | pkgsrc-3ac7890ebde7eb563209ade8c8b981ed99ac17e0.tar.gz |
Based on PR pkg/46671, kdelibdocs which was broken after doxygen bump revived.
(1) patch-Makefile.am
patch-Makefile.in
Due to dropping doxytag command with bumping Doxygen to 1.8.1.1,
doxytag related target of Makefile deleted (interim solution, as pkgsrc).
(2) patch-admin_Doxyfile.global
As of bumping doxygen, Doxyfile syntax is changed.
Deleting obsolete lines (the same as above).
(3) Makefile
PKGREVISION is bumped. There is no apparent changes on PLIST,
it is really dynamically generated and installed list differ.
Also two lines added.
LICENSE= gnu-gpl-v2
USE_TOOLS+= gmake (Makefile has ${GMAKE})
(pointed by pkglint)
-rw-r--r-- | x11/kdelibdocs3/Makefile | 9 | ||||
-rw-r--r-- | x11/kdelibdocs3/distinfo | 5 | ||||
-rw-r--r-- | x11/kdelibdocs3/patches/patch-Makefile.am | 34 | ||||
-rw-r--r-- | x11/kdelibdocs3/patches/patch-Makefile.in | 27 | ||||
-rw-r--r-- | x11/kdelibdocs3/patches/patch-admin_Doxyfile.global | 50 |
5 files changed, 121 insertions, 4 deletions
diff --git a/x11/kdelibdocs3/Makefile b/x11/kdelibdocs3/Makefile index e39d2d284fa..242639d2d80 100644 --- a/x11/kdelibdocs3/Makefile +++ b/x11/kdelibdocs3/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.66 2012/06/14 07:45:00 sbd Exp $ +# $NetBSD: Makefile,v 1.67 2012/07/08 12:33:39 mef Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGNAME= kdelibdocs-${_KDE_VERSION} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= x11 devel +LICENSE= gnu-gpl-v2 COMMENT= KDE library documentation @@ -11,10 +12,12 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/kde3/Makefile.kde3" -BUILD_DEPENDS+= doxygen>=1.4.7:../../devel/doxygen +BUILD_DEPENDS+= doxygen>=1.8.1.1:../../devel/doxygen BUILD_DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz BUILD_DEPENDS+= qt3-docs>=3.1.1:../../x11/qt3-docs +USE_TOOLS+= gmake + BUILD_TARGET= apidox INSTALL_TARGET= install-data-local diff --git a/x11/kdelibdocs3/distinfo b/x11/kdelibdocs3/distinfo index d5448ec39b5..1733f35b2c6 100644 --- a/x11/kdelibdocs3/distinfo +++ b/x11/kdelibdocs3/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.38 2008/08/27 12:06:11 markd Exp $ +$NetBSD: distinfo,v 1.39 2012/07/08 12:33:39 mef Exp $ SHA1 (kdelibs-3.5.10.tar.bz2) = c930a25f4419134def55b8466c3a6f737227fb82 RMD160 (kdelibs-3.5.10.tar.bz2) = 4c960664283c83ebc8e68932ca9044336fcff223 Size (kdelibs-3.5.10.tar.bz2) = 15614607 bytes +SHA1 (patch-Makefile.am) = e44487dc7bd256cd880965cfa75142609456a19f +SHA1 (patch-Makefile.in) = f0eb56cd020d8555247056792785b0435f572ecc +SHA1 (patch-admin_Doxyfile.global) = b9681d15761ed2508a5476e139a527d7628f4010 diff --git a/x11/kdelibdocs3/patches/patch-Makefile.am b/x11/kdelibdocs3/patches/patch-Makefile.am new file mode 100644 index 00000000000..ee92b78065c --- /dev/null +++ b/x11/kdelibdocs3/patches/patch-Makefile.am @@ -0,0 +1,34 @@ +$NetBSD: patch-Makefile.am,v 1.1 2012/07/08 12:33:39 mef Exp $ + +Removing doxytag related lines (Doxytag dropped this command +at least since 1.8.1.1) + +--- Makefile.am.orig 2008-08-21 01:05:01.000000000 +0900 ++++ Makefile.am 2012-07-08 01:13:07.000000000 +0900 +@@ -94,14 +94,12 @@ + include admin/Doxyfile.am + include admin/deps.am + +-apidox-am-toplevel-yes: apidox-am-toplevel-kdelibs ++apidox-am-toplevel-yes: + +-apidox-am-toplevel-kdelibs: $(top_builddir)/apidocs/qt/qt.tag +- +-$(top_builddir)/apidocs/qt/qt.tag: +- @echo "*** Creating a tag file for the Qt library:"; \ +- $(mkinstalldirs) $(top_builddir)/apidocs/qt; \ +- doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(QTDOCDIR) ++# $(top_builddir)/apidocs/qt/qt.tag: ++# @echo "*** Creating a tag file for the Qt library:"; \ ++# $(mkinstalldirs) $(top_builddir)/apidocs/qt; \ ++# doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(QTDOCDIR) + + install-data-local: install-apidox-kdelibs + +@@ -113,5 +111,5 @@ + $(INSTALL_DATA) $(top_builddir)/apidocs/qt/qt.tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/qt; \ + fi + +-.PHONY: install-apidox-kdelibs apidox-am-toplevel-kdelibs apidox-am-toplevel-yes qtmessages ++.PHONY: install-apidox-kdelibs apidox-am-toplevel-yes qtmessages + SUBDIRS=$(TOPSUBDIRS) diff --git a/x11/kdelibdocs3/patches/patch-Makefile.in b/x11/kdelibdocs3/patches/patch-Makefile.in new file mode 100644 index 00000000000..b21aadef59e --- /dev/null +++ b/x11/kdelibdocs3/patches/patch-Makefile.in @@ -0,0 +1,27 @@ +$NetBSD: patch-Makefile.in,v 1.1 2012/07/08 12:33:39 mef Exp $ + +Removing doxytag related lines (Doxytag dropped this command +at least since 1.8.1.1) + +--- Makefile.in.orig 2008-08-21 01:05:55.000000000 +0900 ++++ Makefile.in 2012-07-08 01:14:00.000000000 +0900 +@@ -1100,14 +1100,13 @@ + $(top_srcdir)/Makefile.am.in: + $(CONF_FILES): + +-apidox-am-toplevel-yes: apidox-am-toplevel-kdelibs + +-apidox-am-toplevel-kdelibs: $(top_builddir)/apidocs/qt/qt.tag ++# apidox-am-toplevel-kdelibs: $(top_builddir)/apidocs/qt/qt.tag + +-$(top_builddir)/apidocs/qt/qt.tag: +- @echo "*** Creating a tag file for the Qt library:"; \ +- $(mkinstalldirs) $(top_builddir)/apidocs/qt; \ +- doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(QTDOCDIR) ++#$(top_builddir)/apidocs/qt/qt.tag: ++# @echo "*** Creating a tag file for the Qt library:"; \ ++# $(mkinstalldirs) $(top_builddir)/apidocs/qt; \ ++# doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(QTDOCDIR) + + install-data-local: install-apidox-kdelibs + diff --git a/x11/kdelibdocs3/patches/patch-admin_Doxyfile.global b/x11/kdelibdocs3/patches/patch-admin_Doxyfile.global new file mode 100644 index 00000000000..72cb0ff734d --- /dev/null +++ b/x11/kdelibdocs3/patches/patch-admin_Doxyfile.global @@ -0,0 +1,50 @@ +$NetBSD: patch-admin_Doxyfile.global,v 1.1 2012/07/08 12:33:39 mef Exp $ + +To avoid following messages: +warning: Tag `USE_WINDOWS_ENCODING' at line 2 of file kdefx/Doxyfile has become obsolete. +warning: Tag `HTML_ALIGN_MEMBERS' at line 85 of file kdefx/Doxyfile has become obsolete. +warning: Tag `MAX_DOT_GRAPH_WIDTH' at line 154 of file kdefx/Doxyfile has become obsolete. +warning: Tag `MAX_DOT_GRAPH_HEIGHT' at line 155 of file kdefx/Doxyfile has become obsolete. +warning: Tag `HTML_ALIGN_MEMBERS' at line 174 of file kdefx/Doxyfile has become obsolete. +warning: Tag `DETAILS_AT_TOP' at line 181 of file kdefx/Doxyfile has become obsolete. + +--- admin/Doxyfile.global.orig 2008-08-20 05:28:39.000000000 +0900 ++++ admin/Doxyfile.global 2012-07-08 08:46:26.000000000 +0900 +@@ -1,5 +1,4 @@ + OUTPUT_LANGUAGE = English +-USE_WINDOWS_ENCODING = NO + BRIEF_MEMBER_DESC = NO + REPEAT_BRIEF = YES + ABBREVIATE_BRIEF = +@@ -82,7 +81,6 @@ + HTML_HEADER = ../apidocs/common/header.html + HTML_FOOTER = ../apidocs/common/footer.html + HTML_STYLESHEET = ../apidocs/common/doxygen.css +-HTML_ALIGN_MEMBERS = YES + GENERATE_HTMLHELP = NO + CHM_FILE = + HHC_LOCATION = +@@ -151,8 +149,6 @@ + DOT_IMAGE_FORMAT = png + DOT_PATH = + DOTFILE_DIRS = +-MAX_DOT_GRAPH_WIDTH = 800 +-MAX_DOT_GRAPH_HEIGHT = 1024 + MAX_DOT_GRAPH_DEPTH = 0 + GENERATE_LEGEND = YES + DOT_CLEANUP = YES +@@ -171,14 +167,12 @@ + "authors=\xrefitem authors \"Author(s)\" \"Authors\"" \ + "FIXME=\xrefitem fixme \"Fixme\" \"Fixme\"" + +-HTML_ALIGN_MEMBERS = YES + REFERENCED_BY_RELATION = NO + REFERENCES_RELATION = NO + VERBATIM_HEADERS = NO + GENERATE_HTML = YES + SOURCE_BROWSER = YES + GENERATE_AUTOGEN_DEF = NO +-DETAILS_AT_TOP = YES + SORT_MEMBER_DOCS = YES + GENERATE_TODOLIST = YES + IGNORE_PREFIX = K |