Date: Mon, 31 Dec 2012 11:59:37 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309724 - in head/devel/doxygen: . files Message-ID: <201212311159.qBVBxbPQ025001@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Mon Dec 31 11:59:37 2012 New Revision: 309724 URL: http://svnweb.freebsd.org/changeset/ports/309724 Log: Update to version 1.8.3 PR: ports/174838 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) Modified: head/devel/doxygen/Makefile head/devel/doxygen/distinfo head/devel/doxygen/files/patch-configure head/devel/doxygen/files/patch-doc-Makefile.latex Modified: head/devel/doxygen/Makefile ============================================================================== --- head/devel/doxygen/Makefile Mon Dec 31 11:55:52 2012 (r309723) +++ head/devel/doxygen/Makefile Mon Dec 31 11:59:37 2012 (r309724) @@ -1,19 +1,15 @@ -# New ports collection makefile for: doxygen -# Date created: 20 March 1998 -# Whom: Joep Grooten <joep@di.nl> -# +# Created by: Joep Grooten <joep@di.nl> # $FreeBSD$ -# PORTNAME= doxygen -PORTVERSION= 1.8.2 +PORTVERSION= 1.8.3 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ http://ftp.stack.nl/pub/users/dimitri/ EXTRACT_SUFX= .src.tar.gz MAINTAINER= cyberbotx@cyberbotx.com -COMMENT= A documentation system for C, C++, and other languages +COMMENT= Documentation system for C, C++, and other languages LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -43,25 +39,24 @@ TMPDOCDEST= ${WRKDIR}/tmpdocdest PLIST_FILES= bin/doxygen -OPTIONS_DEFINE= DOXYWIZARD LATEX -OPTIONS_DEFAULT=DOXYWIZARD LATEX -DOXYWIZARD_DESC= Doxywizard support (requires QT4) +OPTIONS_DEFINE= DOCS DOXYWIZARD LATEX +OPTIONS_DEFAULT=DOCS DOXYWIZARD LATEX +DOXYWIZARD_DESC= Doxywizard support (requires Qt4) .include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= docs USE_PYTHON_BUILD= yes BUILD_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz .if ${PORT_OPTIONS:MLATEX} ALL_TARGET+= pdf -BUILD_DEPENDS+= dvips:${PORTSDIR}/print/dvipsk-tetex \ - latex:${PORTSDIR}/print/teTeX +BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX USE_GHOSTSCRIPT_BUILD= yes MAKE_ARGS+= HAVE_LATEX=yes .endif # LATEX -.endif # !defined(NOPORTDOCS) +.endif # DOCS .if ${PORT_OPTIONS:MDOXYWIZARD} USE_QT4= corelib gui xml qmake_build moc_build rcc_build @@ -98,7 +93,7 @@ post-build: pre-install: ${RM} -rf ${TMPDOCDEST} ${PLIST} ${TOUCH} ${PLIST} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${TMPDOCDEST}/doxygen ${RM} -f ${WRKSRC}/examples/diagrams/html/*.md5 \ ${WRKSRC}/examples/diagrams/html/*.map @@ -107,30 +102,27 @@ pre-install: ${TAR} -C ${WRKSRC} --exclude '*/Makefile*' --exclude '*.dot' \ -cf - examples \ | ${TAR} -C ${TMPDOCDEST}/doxygen --unlink -xf - -.if !defined(WITHOUT_LATEX) - ${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.dvi \ - ${WRKSRC}/latex/doxygen_manual.pdf \ - ${WRKSRC}/latex/doxygen_manual.ps \ +.if ${PORT_OPTIONS:MLATEX} + ${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.pdf \ ${WRKSRC}/latex/archoverview.eps \ - ${WRKSRC}/latex/doxygen_logo.eps \ ${TMPDOCDEST}/doxygen -.endif # !defined(WITHOUT_LATEX) +.endif # LATEX @cd ${TMPDOCDEST} \ && ${FIND} -s * -type f -o -type l \ - | ${SED} -e 's|^|share/doc/|'>> ${PLIST} \ + | ${SED} -e 's|^|share/doc/|' >> ${PLIST} \ && ${FIND} -d * -type d \ | ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST} -.endif # !defined(NOPORTDOCS) +.endif # DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin/ .if ${PORT_OPTIONS:MDOXYWIZARD} ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${PREFIX}/bin/ .endif # DOXYWIZARD -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${PREFIX}/share/doc/doxygen ${TAR} -C ${TMPDOCDEST} -cf - doxygen \ | ${TAR} -C ${PREFIX}/share/doc --unlink -xf - -.endif # !defined(NOPORTDOCS) +.endif # DOCS .include <bsd.port.mk> Modified: head/devel/doxygen/distinfo ============================================================================== --- head/devel/doxygen/distinfo Mon Dec 31 11:55:52 2012 (r309723) +++ head/devel/doxygen/distinfo Mon Dec 31 11:59:37 2012 (r309724) @@ -1,2 +1,2 @@ -SHA256 (doxygen-1.8.2.src.tar.gz) = 5258244e3e225511dbacbbc58be958f114c11e35461a893473d356182b949d54 -SIZE (doxygen-1.8.2.src.tar.gz) = 6063256 +SHA256 (doxygen-1.8.3.src.tar.gz) = 87010970dbffe769641bf212584c7cf94db1c7e82bc335b43b6c649f5f7d8273 +SIZE (doxygen-1.8.3.src.tar.gz) = 6106980 Modified: head/devel/doxygen/files/patch-configure ============================================================================== --- head/devel/doxygen/files/patch-configure Mon Dec 31 11:55:52 2012 (r309723) +++ head/devel/doxygen/files/patch-configure Mon Dec 31 11:59:37 2012 (r309724) @@ -1,6 +1,6 @@ ---- configure.orig 2012-02-24 11:46:04.000000000 -0500 -+++ configure 2012-03-04 13:58:53.000000000 -0500 -@@ -269,7 +269,7 @@ +--- configure.orig 2012-12-27 06:24:51.000000000 -0500 ++++ configure 2012-12-28 12:12:33.000000000 -0500 +@@ -281,7 +281,7 @@ echo " QTDIR environment variable not set!" echo -n " Checking for Qt..." for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do @@ -9,7 +9,7 @@ QTDIR=$d fi done -@@ -280,7 +280,7 @@ +@@ -292,7 +292,7 @@ if test -z "$QTDIR"; then echo "QTDIR not set and Qt not found at standard locations!" echo @@ -18,7 +18,7 @@ echo "check the Qt installation instructions!" exit 2 fi -@@ -576,7 +576,7 @@ +@@ -604,7 +604,7 @@ fi if test "$f_wizard" = YES; then cat >> .tmakeconfig <<EOF @@ -27,29 +27,29 @@ EOF fi -@@ -586,7 +586,7 @@ +@@ -621,7 +621,7 @@ EOF fi --f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" -+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in addon/doxyapp/Makefile.in" +-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in" ++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in" for i in $f_inmakefiles ; do SRC=$i -@@ -603,7 +603,6 @@ - echo "" >> $DST - echo "all: src/version.cpp " >> $DST +@@ -645,7 +645,6 @@ + fi + echo "all: src/version.cpp $EXTRADEPS" >> $DST echo " \$(MAKE) -C qtools" >> $DST - echo " \$(MAKE) -C libmd5" >> $DST echo " \$(MAKE) -C src" >> $DST if test $f_wizard = YES; then echo " \$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST -@@ -629,7 +628,7 @@ +@@ -678,7 +677,7 @@ cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" > src/libdoxycfg.t cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" > src/libdoxygen.t --f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" -+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in" +-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" ++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" for i in $f_inprofiles ; do SRC=$i Modified: head/devel/doxygen/files/patch-doc-Makefile.latex ============================================================================== --- head/devel/doxygen/files/patch-doc-Makefile.latex Mon Dec 31 11:55:52 2012 (r309723) +++ head/devel/doxygen/files/patch-doc-Makefile.latex Mon Dec 31 11:59:37 2012 (r309724) @@ -1,10 +1,7 @@ ---- doc/Makefile.latex Sun May 7 14:06:16 2006 -+++ doc/Makefile.latex Sun Jun 11 20:27:05 2006 -@@ -13,13 +13,27 @@ - # input used in their production; they are not affected by this license. - --all: doxygen_manual.pdf -+all: doxygen_manual.pdf doxygen_manual.ps +--- doc/Makefile.latex.old 2012-01-29 10:11:54.000000000 -0500 ++++ doc/Makefile.latex 2012-12-30 12:15:00.000000000 -0500 +@@ -15,11 +15,11 @@ + all: doxygen_manual.pdf doxygen_manual.pdf: doxygen_manual.tex doxygen.sty - echo "Running latex..." @@ -16,19 +13,5 @@ - echo "Rerunning latex...." + @echo "Rerunning latex...." pdflatex doxygen_manual.tex -+ -+graphics: -+ ln -s ../doc/doxygen_logo.eps . -+ ln -s ../doc/doxygen_logo.gif . -+ -+doxygen_manual.dvi: doxygen_manual.pdf graphics -+ @echo "Running latex again to get a .dvi file..." -+ latex doxygen_manual.tex -+ -+doxygen_manual.ps: doxygen_manual.dvi -+ dvips -o doxygen_manual.ps doxygen_manual.dvi -+ clean: rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log doxygen_manual.pdf -+ -+.PHONY: graphics
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212311159.qBVBxbPQ025001>