pkg/46671: x11/kdelibdocs3 adaptation to doxygen-1.8.1.1

[makoto%ki.nu@localhost]

>Number:         46671
>Category:       pkg
>Synopsis:       Doxygen bump affects building kdelibdocs3
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 08 00:40:01 +0000 2012
>Originator:     Makoto Fujiwara
>Release:        NetBSD 6.0_BETA2
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD t-105.i.ki.nu 6.0_BETA2 NetBSD 6.0_BETA2 (GENERIC) amd64
Architecture: x86_64
Machine: amd64
>Description:
        Recent doxygen bump to 1.8.1.1 affected the build of this package,
        mainly because doxytag (command) dropped for now.
        Interim fix to avoid using doxytag.
        Also, some adjustment for Doxyfile setting is included.
>How-To-Repeat:
        Update devel/doxygen (as cvs update) to 1.8.1.1 and make package-install

        cd /usr/pkgsrc;
        (cd devel/doxygen; cvs update -dPA; make clean ;make package-install)
        (cd x11/kdelibdocs3; make package)
>Fix:

Index: x11/kdelibdocs3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibdocs3/Makefile,v
retrieving revision 1.66
diff -u -u -r1.66 Makefile
--- x11/kdelibdocs3/Makefile    14 Jun 2012 07:45:00 -0000      1.66
+++ x11/kdelibdocs3/Makefile    8 Jul 2012 00:29:23 -0000
@@ -4,6 +4,7 @@
 PKGNAME=       kdelibdocs-${_KDE_VERSION}
 PKGREVISION=   12
 CATEGORIES=    x11 devel
+LICENSE=       gnu-gpl-v2
 
 COMMENT=       KDE library documentation
 
@@ -14,6 +15,7 @@
 BUILD_DEPENDS+=                doxygen>=1.4.7:../../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
Index: x11/kdelibdocs3/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibdocs3/distinfo,v
retrieving revision 1.38
diff -u -u -r1.38 distinfo
--- x11/kdelibdocs3/distinfo    27 Aug 2008 12:06:11 -0000      1.38
+++ x11/kdelibdocs3/distinfo    8 Jul 2012 00:29:23 -0000
@@ -3,3 +3,6 @@
 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) = 07a9789452aca959d6c764605b4b1af68098f22b
+SHA1 (patch-Makefile.in) = e9debe7bafc0f4e94c36ee8be7496581e3fd63d4
+SHA1 (patch-admin_Doxyfile.global) = b9681d15761ed2508a5476e139a527d7628f4010
Index: x11/kdelibdocs3/patches/patch-Makefile.am
===================================================================
RCS file: x11/kdelibdocs3/patches/patch-Makefile.am
diff -N x11/kdelibdocs3/patches/patch-Makefile.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ x11/kdelibdocs3/patches/patch-Makefile.am   8 Jul 2012 00:29:23 -0000
@@ -0,0 +1,34 @@
+$NetBSD$
+
+Removing doxytag related line (Doxytag drops 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)
Index: x11/kdelibdocs3/patches/patch-Makefile.in
===================================================================
RCS file: x11/kdelibdocs3/patches/patch-Makefile.in
diff -N x11/kdelibdocs3/patches/patch-Makefile.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ x11/kdelibdocs3/patches/patch-Makefile.in   8 Jul 2012 00:29:23 -0000
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Removing doxytag related line (Doxytag drops 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
+ 
Index: x11/kdelibdocs3/patches/patch-admin_Doxyfile.global
===================================================================
RCS file: x11/kdelibdocs3/patches/patch-admin_Doxyfile.global
diff -N x11/kdelibdocs3/patches/patch-admin_Doxyfile.global
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ x11/kdelibdocs3/patches/patch-admin_Doxyfile.global 8 Jul 2012 00:29:23 
-0000
@@ -0,0 +1,50 @@
+$NetBSD$
+
+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

>Unformatted: