[pkgsrc/trunk]: pkgsrc/devel/doxygen - Explicitly depend on texlive-pdftools ...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e967a5cb87a9
branches:  trunk
changeset: 399717:e967a5cb87a9
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Sep 27 01:30:38 2009 +0000

description:
- Explicitly depend on texlive-pdftools to use epstopdf.
- Invoke epstopdf using the absolute path.

diffstat:

 devel/doxygen/Makefile         |  20 +++++++++++++++-----
 devel/doxygen/distinfo         |   4 ++--
 devel/doxygen/patches/patch-af |  13 +++++++++++--
 3 files changed, 28 insertions(+), 9 deletions(-)

diffs (90 lines):

diff -r 5a80d504e2c9 -r e967a5cb87a9 devel/doxygen/Makefile
--- a/devel/doxygen/Makefile    Sat Sep 26 22:44:42 2009 +0000
+++ b/devel/doxygen/Makefile    Sun Sep 27 01:30:38 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2009/09/22 20:11:45 snj Exp $
+# $NetBSD: Makefile,v 1.73 2009/09/27 01:30:38 minskim Exp $
 
 DISTNAME=      doxygen-1.6.1.src
 PKGNAME=       ${DISTNAME:S/.src//}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ftp://ftp.stack.nl/pub/users/dimitri/ \
                http://ftp.stack.nl/pub/users/dimitri/
@@ -12,6 +13,7 @@
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      dvipsk-[0-9]*:../../print/dvipsk
+DEPENDS+=      texlive-pdftools-[0-9]*:../../print/texlive-pdftools
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -32,10 +34,11 @@
 
 PLIST_VARS+=           ci cs
 
-SUBST_CLASSES+=                pybin
-SUBST_STAGE.pybin=     pre-configure
-SUBST_FILES.pybin=     doc/Makefile.in
-SUBST_SED.pybin=       -e "s|@PYTHONBIN@|${PYTHONBIN}|g"
+SUBST_CLASSES+=                path
+SUBST_STAGE.path=      pre-configure
+SUBST_FILES.path=      doc/Makefile.in
+SUBST_SED.path=                -e "s|@EPSTOPDF@|${LOCALBASE}/bin/epstopdf|g" \
+                       -e "s|@PYTHONBIN@|${PYTHONBIN}|g"
 
 SUBST_CLASSES+=                perlbin
 SUBST_STAGE.perlbin=   pre-configure
@@ -43,6 +46,13 @@
 SUBST_FILES.perlbin=   examples/tag.cfg
 SUBST_SED.perlbin=     -e 's,^PERL_PATH.*,PERL_PATH = ${PERL5},'
 
+SUBST_CLASSES+=                epstopdf
+SUBST_STAGE.epstopdf=  pre-configure
+SUBST_MESSAGE.epstopdf=        Fixing path to epstopdf
+SUBST_FILES.epstopdf=  src/diagram.cpp src/docparser.cpp src/dot.cpp \
+                       src/msc.cpp
+SUBST_SED.epstopdf=    -e 's,"epstopdf","${LOCALBASE}/bin/epstopdf",g'
+
 PRIVILEGED_STAGES+=    clean
 
 INSTALL_TARGET=                install install_docs
diff -r 5a80d504e2c9 -r e967a5cb87a9 devel/doxygen/distinfo
--- a/devel/doxygen/distinfo    Sat Sep 26 22:44:42 2009 +0000
+++ b/devel/doxygen/distinfo    Sun Sep 27 01:30:38 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2009/08/26 11:48:24 wiz Exp $
+$NetBSD: distinfo,v 1.38 2009/09/27 01:30:38 minskim Exp $
 
 SHA1 (doxygen-1.6.1.src.tar.gz) = 31f861841eba1ebdded1b4bf70bdecb42441dafd
 RMD160 (doxygen-1.6.1.src.tar.gz) = 0a9c5962dbd076bac418b85b72a4874576c9da4d
@@ -6,6 +6,6 @@
 SHA1 (patch-aa) = 74aa6e068c150d2e40c5a73723afd24d510f4538
 SHA1 (patch-ab) = 951ad787ec32cf5dd3915d91df1fb45bc199ec79
 SHA1 (patch-ac) = 5523e5b146436a50b008f963a0b809379a9e4974
-SHA1 (patch-af) = 5911fcc07b4165bb78b1618545e15c6da8d379f7
+SHA1 (patch-af) = 0942cc0fdcb49e74ce018d7e790dba36b21b4d08
 SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15
 SHA1 (patch-ah) = 8ec4502a6324cbdb4821887bcfe808f086aaa78b
diff -r 5a80d504e2c9 -r e967a5cb87a9 devel/doxygen/patches/patch-af
--- a/devel/doxygen/patches/patch-af    Sat Sep 26 22:44:42 2009 +0000
+++ b/devel/doxygen/patches/patch-af    Sun Sep 27 01:30:38 2009 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-af,v 1.3 2008/11/11 00:44:12 wiz Exp $
+$NetBSD: patch-af,v 1.4 2009/09/27 01:30:38 minskim Exp $
 
---- doc/Makefile.in.orig       2008-01-01 10:39:53.000000000 +0000
+--- doc/Makefile.in.orig       2008-12-06 13:16:23.000000000 +0000
 +++ doc/Makefile.in
+@@ -23,7 +23,7 @@ all: language FORCE
+       @cp Makefile.latex ../latex/Makefile
+       @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >../latex/doxygen_manual.tex
+       @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >../latex/doxygen.sty 
+-      @epstopdf doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf
++      @@EPSTOPDF@ doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf
+ 
+ clean: 
+       rm -rf ../html ../latex *.bak 
 @@ -31,6 +31,6 @@ clean: 
  language: language.doc