Thu Aug 5 15:49:31 2010 UTC ()
fix an off-by-one which made that manpage links had an underscore
prepended, fix PKGREVISION


(drochner)
diff -r1.76 -r1.77 pkgsrc/devel/doxygen/Makefile
diff -r1.40 -r1.41 pkgsrc/devel/doxygen/distinfo
diff -r0 -r1.3 pkgsrc/devel/doxygen/patches/patch-ai
cvs diff -r1.76 -r1.77 pkgsrc/devel/doxygen/Makefile (switch to unified diff)

--- pkgsrc/devel/doxygen/Makefile 2010/06/02 04:17:02 1.76
+++ pkgsrc/devel/doxygen/Makefile 2010/08/05 15:49:30 1.77
@@ -1,79 +1,80 @@ @@ -1,79 +1,80 @@
1# $NetBSD: Makefile,v 1.76 2010/06/02 04:17:02 adam Exp $ 1# $NetBSD: Makefile,v 1.77 2010/08/05 15:49:30 drochner Exp $
2 2
3DISTNAME= doxygen-1.6.3.src 3DISTNAME= doxygen-1.6.3.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ 7MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
7 http://ftp.stack.nl/pub/users/dimitri/ 8 http://ftp.stack.nl/pub/users/dimitri/
8 9
9MAINTAINER= recht@NetBSD.org 10MAINTAINER= recht@NetBSD.org
10HOMEPAGE= http://www.doxygen.org/ 11HOMEPAGE= http://www.doxygen.org/
11COMMENT= Documentation system for C++, Java, IDL and C 12COMMENT= Documentation system for C++, Java, IDL and C
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk 15DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
15DEPENDS+= texlive-pdftools-[0-9]*:../../print/texlive-pdftools 16DEPENDS+= texlive-pdftools-[0-9]*:../../print/texlive-pdftools
16 17
17PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
18 19
19TEX_ACCEPTED= teTeX3 20TEX_ACCEPTED= teTeX3
20WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 21WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
21UNLIMIT_RESOURCES+= datasize 22UNLIMIT_RESOURCES+= datasize
22USE_TOOLS+= gmake gs:run perl:run bison flex 23USE_TOOLS+= gmake gs:run perl:run bison flex
23USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
24HAS_CONFIGURE= yes 25HAS_CONFIGURE= yes
25CONFIGURE_ARGS+= --make ${GMAKE} 26CONFIGURE_ARGS+= --make ${GMAKE}
26CONFIGURE_ARGS+= --perl ${PERL5} 27CONFIGURE_ARGS+= --perl ${PERL5}
27CONFIGURE_ARGS+= --install ${INSTALL} 28CONFIGURE_ARGS+= --install ${INSTALL}
28CONFIGURE_ARGS+= --dot ${PREFIX}/bin/dot 29CONFIGURE_ARGS+= --dot ${PREFIX}/bin/dot
29CONFIGURE_ARGS+= --prefix ${PREFIX} 30CONFIGURE_ARGS+= --prefix ${PREFIX}
30CONFIGURE_ARGS+= --docdir ${PREFIX}/share/doc/doxygen 31CONFIGURE_ARGS+= --docdir ${PREFIX}/share/doc/doxygen
31MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q} 32MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q}
32MAKE_FLAGS+= MAN1DIR=${PKGMANDIR}/man1 33MAKE_FLAGS+= MAN1DIR=${PKGMANDIR}/man1
33 34
34PLIST_VARS+= ci cs 35PLIST_VARS+= ci cs
35 36
36SUBST_CLASSES+= path 37SUBST_CLASSES+= path
37SUBST_STAGE.path= pre-configure 38SUBST_STAGE.path= pre-configure
38SUBST_FILES.path= doc/Makefile.in 39SUBST_FILES.path= doc/Makefile.in
39SUBST_SED.path= -e "s|@EPSTOPDF@|${LOCALBASE}/bin/epstopdf|g" \ 40SUBST_SED.path= -e "s|@EPSTOPDF@|${LOCALBASE}/bin/epstopdf|g" \
40 -e "s|@PYTHONBIN@|${PYTHONBIN}|g" 41 -e "s|@PYTHONBIN@|${PYTHONBIN}|g"
41 42
42SUBST_CLASSES+= perlbin 43SUBST_CLASSES+= perlbin
43SUBST_STAGE.perlbin= pre-configure 44SUBST_STAGE.perlbin= pre-configure
44SUBST_MESSAGE.perlbin= Fixing hardcoded path to the Perl interpreter 45SUBST_MESSAGE.perlbin= Fixing hardcoded path to the Perl interpreter
45SUBST_FILES.perlbin= examples/tag.cfg 46SUBST_FILES.perlbin= examples/tag.cfg
46SUBST_SED.perlbin= -e 's,^PERL_PATH.*,PERL_PATH = ${PERL5},' 47SUBST_SED.perlbin= -e 's,^PERL_PATH.*,PERL_PATH = ${PERL5},'
47 48
48SUBST_CLASSES+= epstopdf 49SUBST_CLASSES+= epstopdf
49SUBST_STAGE.epstopdf= pre-configure 50SUBST_STAGE.epstopdf= pre-configure
50SUBST_MESSAGE.epstopdf= Fixing path to epstopdf 51SUBST_MESSAGE.epstopdf= Fixing path to epstopdf
51SUBST_FILES.epstopdf= src/diagram.cpp src/docparser.cpp src/dot.cpp \ 52SUBST_FILES.epstopdf= src/diagram.cpp src/docparser.cpp src/dot.cpp \
52 src/msc.cpp 53 src/msc.cpp
53SUBST_SED.epstopdf= -e 's,"epstopdf","${LOCALBASE}/bin/epstopdf",g' 54SUBST_SED.epstopdf= -e 's,"epstopdf","${LOCALBASE}/bin/epstopdf",g'
54 55
55PRIVILEGED_STAGES+= clean 56PRIVILEGED_STAGES+= clean
56 57
57INSTALL_TARGET= install install_docs 58INSTALL_TARGET= install install_docs
58 59
59.include "../../mk/bsd.prefs.mk" 60.include "../../mk/bsd.prefs.mk"
60 61
61.if ${OPSYS} == "Darwin" 62.if ${OPSYS} == "Darwin"
62PLIST.ci= yes # case-insensitive 63PLIST.ci= yes # case-insensitive
63.else 64.else
64PLIST.cs= yes # case-sensitive 65PLIST.cs= yes # case-sensitive
65.endif 66.endif
66 67
67.if ${OPSYS} == "DragonFly" 68.if ${OPSYS} == "DragonFly"
68CONFIGURE_ARGS+= -platform freebsd-g++ 69CONFIGURE_ARGS+= -platform freebsd-g++
69.endif 70.endif
70 71
71post-patch: 72post-patch:
72 touch ${WRKSRC}/src/doxytag.l 73 touch ${WRKSRC}/src/doxytag.l
73 74
74BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.12nb1 75BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.12nb1
75 76
76.include "../../graphics/graphviz/buildlink3.mk" 77.include "../../graphics/graphviz/buildlink3.mk"
77.include "../../lang/python/application.mk" 78.include "../../lang/python/application.mk"
78.include "../../mk/tex.buildlink3.mk" 79.include "../../mk/tex.buildlink3.mk"
79.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.40 -r1.41 pkgsrc/devel/doxygen/distinfo (switch to unified diff)

--- pkgsrc/devel/doxygen/distinfo 2010/06/02 04:17:02 1.40
+++ pkgsrc/devel/doxygen/distinfo 2010/08/05 15:49:30 1.41
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.40 2010/06/02 04:17:02 adam Exp $ 1$NetBSD: distinfo,v 1.41 2010/08/05 15:49:30 drochner Exp $
2 2
3SHA1 (doxygen-1.6.3.src.tar.gz) = 36e4f479a136a439307456e539a4bd6c2fefa8b7 3SHA1 (doxygen-1.6.3.src.tar.gz) = 36e4f479a136a439307456e539a4bd6c2fefa8b7
4RMD160 (doxygen-1.6.3.src.tar.gz) = 3c205185316675a78dba390ef83942d5abda0815 4RMD160 (doxygen-1.6.3.src.tar.gz) = 3c205185316675a78dba390ef83942d5abda0815
5Size (doxygen-1.6.3.src.tar.gz) = 3986440 bytes 5Size (doxygen-1.6.3.src.tar.gz) = 3986440 bytes
6SHA1 (patch-aa) = 74aa6e068c150d2e40c5a73723afd24d510f4538 6SHA1 (patch-aa) = 74aa6e068c150d2e40c5a73723afd24d510f4538
7SHA1 (patch-ab) = 951ad787ec32cf5dd3915d91df1fb45bc199ec79 7SHA1 (patch-ab) = 951ad787ec32cf5dd3915d91df1fb45bc199ec79
8SHA1 (patch-ac) = 5523e5b146436a50b008f963a0b809379a9e4974 8SHA1 (patch-ac) = 5523e5b146436a50b008f963a0b809379a9e4974
9SHA1 (patch-af) = 0942cc0fdcb49e74ce018d7e790dba36b21b4d08 9SHA1 (patch-af) = 0942cc0fdcb49e74ce018d7e790dba36b21b4d08
10SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15 10SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15
11SHA1 (patch-ah) = 8ec4502a6324cbdb4821887bcfe808f086aaa78b 11SHA1 (patch-ah) = 8ec4502a6324cbdb4821887bcfe808f086aaa78b
 12SHA1 (patch-ai) = 5c2d68e4755fa2e5cedfc9fdbf09d528e565bf7f
File Added: pkgsrc/devel/doxygen/patches/Attic/patch-ai
$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 );