Bump version 1.6.3 to 1.8.1.1 based on PR pkg/46650

Only the most recent Changes and New features are included.
 Others are listed date only, please refer following URL.
   http://www.stack.nl/~dimitri/doxygen/changelog.html

 Release 1.8.1.1 (2012/06/10)
  Changes
   - Integrated the root navigation tree in navtree.js for faster loading.
   - When the navigation tree is enabled, clicking jump to a line in
   - the source code view will now highlight the line.
  New features
   - VHDL code now has a new Design Overview page (thanks for Martin Kreis
     for the patch). Requires HAVE_DOT=YES, and DOT_IMAGE_FORMAT=svg.
   - id 677678: Added support for strong and weak attributes in Objective-C
      properties.

 Release 1.8.1   (2012/05/19)
 Release 1.8.0   (2012/02/25)

 Release 1.7.6.1 (2011/12/10)
 Release 1.7.6   (2011/12/03)

 Release 1.7.5.1 (2011/08/21)
 Release 1.7.5   (2011/08/14)
 Release 1.7.4   (2011/03/28)
 Release 1.7.3   (2011/01/03)
 Release 1.7.2   (2010/10/09)
 Release 1.7.1   (2010/06/25)
 Release 1.7.0   (2010/06/15)

(Following patches are deleted, for upstream took the changes)
 patch-ai
 patch-ak
 patch-qtools-qvaluestack.h
This commit is contained in:
mef 2012-07-03 11:31:35 +00:00
parent fbe46a6c2f
commit 56994576b5
11 changed files with 927 additions and 590 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.87 2012/03/15 11:53:23 obache Exp $
# $NetBSD: Makefile,v 1.88 2012/07/03 11:31:35 mef Exp $
DISTNAME= doxygen-1.6.3.src
DISTNAME= doxygen-1.8.1.1.src
PKGNAME= ${DISTNAME:S/.src//}
PKGREVISION= 8
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
http://ftp.stack.nl/pub/users/dimitri/

File diff suppressed because it is too large Load diff

View file

@ -1,15 +1,12 @@
$NetBSD: distinfo,v 1.44 2011/12/04 00:43:29 minskim Exp $
$NetBSD: distinfo,v 1.45 2012/07/03 11:31:35 mef Exp $
SHA1 (doxygen-1.6.3.src.tar.gz) = 36e4f479a136a439307456e539a4bd6c2fefa8b7
RMD160 (doxygen-1.6.3.src.tar.gz) = 3c205185316675a78dba390ef83942d5abda0815
Size (doxygen-1.6.3.src.tar.gz) = 3986440 bytes
SHA1 (doxygen-1.8.1.1.src.tar.gz) = 51184af9f27d6572826581de0da5b6b044e34d94
RMD160 (doxygen-1.8.1.1.src.tar.gz) = 3ee96c608d075268f735e2dc72595b054f794e2c
Size (doxygen-1.8.1.1.src.tar.gz) = 6011089 bytes
SHA1 (patch-aa) = 74aa6e068c150d2e40c5a73723afd24d510f4538
SHA1 (patch-ab) = 951ad787ec32cf5dd3915d91df1fb45bc199ec79
SHA1 (patch-ac) = 872608c4f2ca74179ce807616646148a2a6ddcd5
SHA1 (patch-ab) = 52b932d05f049b454d06fa08c9a219f55829161a
SHA1 (patch-ac) = 87c68a2ce598c10d90d775764f4c05739eb51435
SHA1 (patch-af) = 0942cc0fdcb49e74ce018d7e790dba36b21b4d08
SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15
SHA1 (patch-ah) = 8ec4502a6324cbdb4821887bcfe808f086aaa78b
SHA1 (patch-ai) = 5c2d68e4755fa2e5cedfc9fdbf09d528e565bf7f
SHA1 (patch-aj) = 13e3e441fb47e02e83097145c8e7dfa76a4eb6f9
SHA1 (patch-ak) = 2090eb6cd3146374993f352cbf82744db0c1bb60
SHA1 (patch-qtools-qvaluestack.h) = decb0cbb297f09010d1c03eb6caf235520e5dd5f
SHA1 (patch-ah) = db6f117bf1faa3a1ed0b2ca9af81fc4f8d0913f9
SHA1 (patch-aj) = c022f1fb0b9ad631c62076d29bc47718697a9a8a

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.4 2011/10/26 21:44:55 minskim Exp $
# $NetBSD: options.mk,v 1.5 2012/07/03 11:31:35 mef Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.doxygen
PKG_SUPPORTED_OPTIONS= latex
@ -21,18 +21,24 @@ BUILD_DEPENDS+= tex-tocloft-[0-9]*:../../print/tex-tocloft
DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk
DEPENDS+= tex-a4wide>=2010nb1:../../print/tex-a4wide
DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl
DEPENDS+= tex-ec-[0-9]*:../../fonts/tex-ec
DEPENDS+= tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf
DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
DEPENDS+= tex-float-[0-9]*:../../print/tex-float
DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry
DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics
DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref
DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex
DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
DEPENDS+= tex-listings-[0-9]*:../../print/tex-listings
DEPENDS+= tex-natbib-[0-9]*:../../print/tex-natbib
DEPENDS+= tex-oberdiek-[0-9]*:../../print/tex-oberdiek
DEPENDS+= tex-psnfss>=9.2anb2:../../fonts/tex-psnfss
DEPENDS+= tex-pspicture-[0-9]*:../../print/tex-pspicture
DEPENDS+= tex-rsfs-[0-9]*:../../fonts/tex-rsfs
DEPENDS+= tex-sectsty-[0-9]*:../../print/tex-sectsty
DEPENDS+= tex-tools-[0-9]*:../../print/tex-tools
DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor
.endif

View file

@ -1,27 +1,23 @@
$NetBSD: patch-ab,v 1.11 2008/11/11 00:44:12 wiz Exp $
$NetBSD: patch-ab,v 1.12 2012/07/03 11:31:35 mef Exp $
--- Makefile.in.orig 2008-10-04 13:49:57.000000000 +0000
+++ Makefile.in
@@ -55,23 +55,23 @@ DATE=$(shell date "+%B %Y")
Convert $(INSTTOOL) to pkgsrc style Variables
--- Makefile.in.orig 2012-02-21 06:00:49.000000000 +0900
+++ Makefile.in 2012-06-23 11:59:42.000000000 +0900
@@ -47,19 +47,19 @@
MAN1DIR = man/man1
install: doxywizard_install
- $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
- $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
- $(INSTTOOL) -m 755 bin/doxytag $(DESTDIR)/$(INSTALL)/bin
- $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(INSTALL)/bin
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)/$(INSTALL)/bin
+ $(BSD_INSTALL_PROGRAM) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
+ $(BSD_INSTALL_PROGRAM) -m 755 bin/doxytag $(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
rm doxygen.1
cat doc/doxytag.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxytag.1
- $(INSTTOOL) -m 644 doxytag.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxytag.1
+ $(BSD_INSTALL_MAN) doxytag.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxytag.1
rm doxytag.1
install_docs:
- $(INSTTOOL) -d $(DESTDIR)/$(DOCDIR)

View file

@ -1,19 +1,9 @@
$NetBSD: patch-ac,v 1.8 2011/12/04 00:43:30 minskim Exp $
$NetBSD: patch-ac,v 1.9 2012/07/03 11:31:35 mef Exp $
Add DragonFly
--- qtools/qglobal.h.orig 2009-10-25 15:44:29.000000000 +0000
+++ qtools/qglobal.h
@@ -89,7 +89,10 @@
# if !defined(MAC_OS_X_VERSION_10_6)
# define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1
# endif
-# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6)
+# if !defined(MAC_OS_X_VERSION_10_7)
+# define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1
+# endif
+# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_7)
# error "This version of Mac OS X is unsupported"
# endif
#elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
@@ -118,7 +121,7 @@
#define _OS_RELIANTUNIX_
#elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)

View file

@ -1,13 +1,13 @@
$NetBSD: patch-ah,v 1.3 2008/11/11 00:44:12 wiz Exp $
$NetBSD: patch-ah,v 1.4 2012/07/03 11:31:35 mef Exp $
--- src/dirdef.cpp.orig 2008-08-17 15:11:27.000000000 +0000
+++ src/dirdef.cpp
@@ -104,8 +104,8 @@ static QCString encodeDirName(const QCSt
QCString DirDef::getOutputFileBase() const
--- src/dirdef.cpp.orig 2012-05-28 23:17:06.000000000 +0900
+++ src/dirdef.cpp 2012-06-23 11:52:57.000000000 +0900
@@ -108,7 +108,8 @@
{
- return "dir_"+encodeDirName(name());
- //return QCString().sprintf("dir_%06d",m_dirCount);
//printf("DirDef::getOutputFileBase() %s->dir_%s\n",
// m_diskName.data(),encodeDirName(m_diskName).data());
- return "dir_"+encodeDirName(m_diskName);
+ //return "dir_"+encodeDirName(name());
+ return QCString().sprintf("dir_%06d",m_dirCount);
}

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ai,v 1.3 2010/08/05 15:49:31 drochner Exp $
--- src/mangen.cpp.orig 2010-02-11 19:17:25.000000000 +0000
+++ src/mangen.cpp
@@ -409,7 +409,7 @@ void ManGenerator::startDoxyAnchor(const
// - truncate after an (optional) ::
QCString baseName = name;
int i=baseName.findRev("::");
- if (i!=-1) baseName=baseName.right(baseName.length()-i-1);
+ if (i!=-1) baseName=baseName.right(baseName.length()-i-2);
// - remove dangerous characters and append suffix, then add dir prefix
QCString fileName=dir+"/"+buildFileName( baseName );

View file

@ -1,14 +1,14 @@
$NetBSD: patch-aj,v 1.1 2010/11/19 19:21:38 tez Exp $
$NetBSD: patch-aj,v 1.2 2012/07/03 11:31:35 mef Exp $
make build honor LDFLAGS
--- src/doxygen.pro.in.orig 2010-11-15 15:39:11.071338100 -0600
+++ src/doxygen.pro.in 2010-11-15 15:39:52.485412900 -0600
--- src/doxygen.pro.in.orig 2012-01-30 00:12:55.000000000 +0900
+++ src/doxygen.pro.in 2012-06-23 11:56:35.000000000 +0900
@@ -19,6 +19,7 @@
HEADERS = doxygen.h
SOURCES = main.cpp
unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5
unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread
+unix:TMAKE_LFLAGS += $(LDFLAGS)
win32:INCLUDEPATH += .
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread
win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib

View file

@ -1,14 +0,0 @@
$NetBSD: patch-ak,v 1.1 2010/11/19 19:21:38 tez Exp $
make build honor LDFLAGS
--- src/doxytag.pro.in.orig 2010-11-15 15:43:22.969750700 -0600
+++ src/doxytag.pro.in 2010-11-15 15:43:56.910180400 -0600
@@ -19,6 +19,7 @@
HEADERS = logos.h version.h
SOURCES = doxytag.cpp logos.cpp version.cpp
unix:LIBS += -L../lib -lqtools
+unix:TMAKE_LFLAGS += $(LDFLAGS)
win32:INCLUDEPATH += .
win32-mingw:LIBS += -L../lib -lqtools
win32-msvc:LIBS += qtools.lib shell32.lib

View file

@ -1,13 +0,0 @@
$NetBSD: patch-qtools-qvaluestack.h,v 1.1 2011/08/20 15:29:01 joerg Exp $
--- qtools/qvaluestack.h.orig 2009-08-25 11:26:15.000000000 +0000
+++ qtools/qvaluestack.h
@@ -49,7 +49,7 @@ class Q_EXPORT QValueStack : public QVal
public:
QValueStack() {}
~QValueStack() {}
- void push( const T& d ) { append(d); }
+ void push( const T& d ) { this->append(d); }
T pop()
{
T elem( this->last() );