Attachment 145952 Details for Bug 192732 – doxygen-1.8.7_1,1.patch

[patch] doxygen-1.8.7_1,1.patch

doxygen-1.8.7_1,1.patch (text/plain), 6.55 KB, created by Naram Qashat on 2014-08-18 04:53:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2014-08-18 04:53:15 UTC

Size: 6.55 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 365149)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	doxygen
> PORTVERSION=	1.8.7
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
>@@ -16,18 +17,12 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake \
>-		flex>0:${PORTSDIR}/textproc/flex \
>-		python:${PORTSDIR}/lang/python \
>-		dvips:${PORTSDIR}/print/tex-dvipsk \
>-		${LOCALBASE}/share/fonts/cm-super/README:${PORTSDIR}/print/cm-super
>-
>+		flex>0:${PORTSDIR}/textproc/flex
> LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
> 
>-USES=		bison iconv perl5 gmake
>-USE_PYTHON=	2
>+USES=		bison iconv perl5 gmake python:2
> ALL_TARGET=	all
> HAS_CONFIGURE=	yes
>-MAKE_JOBS_UNSAFE=	yes
> QT_NONSTANDARD=	yes	# non-standard configure arguments
> CONFIGURE_ARGS=	--prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \
> 		--install "${INSTALL}" --flex ${LOCALBASE}/bin/flex
>@@ -42,42 +37,47 @@
> 
> PLIST_FILES=	bin/doxygen
> 
>-OPTIONS_DEFINE=	HTMLDOCS QT4 PDFDOCS
>+OPTIONS_DEFINE=	GRAPHVIZ LATEX QT4 HTMLDOCS PDFDOCS
>+OPTIONS_DEFAULT=	GRAPHVIZ LATEX
> QT4_DESC=	Install Doxywizard GUI
> HTMLDOCS_DESC=	Install documentation in HTML format
> PDFDOCS_DESC=	Install documentation in PDF format
> 
>+GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
>+
>+LATEX_USE=	TEX=full
>+
>+QT4_USE=	QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build
>+QT4_CONFIGURE_ENV=	QTDIR="${QTDIR}"
>+QT4_CONFIGURE_ON=	--with-doxywizard
>+QT4_PLIST_FILES=	bin/doxywizard
>+
>+HTMLDOCS_ALL_TARGET=	docs
>+HTMLDOCS_BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
>+
>+PDFDOCS_ALL_TARGET=	pdf
>+PDFDOCS_MAKE_ARGS=	HAVE_LATEX=yes
>+
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MHTMLDOCS}
>-ALL_TARGET+=	docs
>-BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
>+.if ${PORT_OPTIONS:MPDFDOCS} && \
>+	(empty(PORT_OPTIONS:MHTMLDOCS) || empty(PORT_OPTIONS:MLATEX))
>+IGNORE=		the PDFDOCS option requires the HTMLDOCS and LATEX options to be set
>+.endif
> 
> .if ${PORT_OPTIONS:MPDFDOCS}
>-ALL_TARGET+=	pdf
>-USE_TEX=	latex:build
> USE_GHOSTSCRIPT_BUILD=	yes
>-MAKE_ARGS+=	HAVE_PDFDOCS=yes
>-.endif # PDFDOCS
>-.endif # HTMLDOCS
>+.endif
> 
> .if ${PORT_OPTIONS:MQT4}
>-USE_QT4=	corelib gui xml qmake_build moc_build rcc_build
>-
> # Need this in env for build
> QTDIR?=		${QT_PREFIX}
>-CONFIGURE_ENV=	QTDIR="${QTDIR}"
>-CONFIGURE_ARGS+=--with-doxywizard
>-.endif # QT4
>+.endif
> 
> .if ${MACHINE_ARCH:tl} == alpha
> CONFIGURE_ARGS+=	--enable-langs no
> .endif
> 
>-.if ${PORT_OPTIONS:MQT4}
>-PLIST_FILES+=	bin/doxywizard
>-.endif # QT4
>-
> pre-configure:
> 	@cd ${WRKSRC};for pro in src/*.pro.in addon/doxywizard/doxywizard.pro.in;do \
> 		${ECHO} "unix:LIBS += ${ICONV_LIB}" >> $$pro; done
>@@ -90,8 +90,8 @@
> 			${WRKSRC}/addon/doxywizard/Makefile
> 
> post-build:
>-	cd ${BUILD_WRKSRC}/examples; \
>-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
>+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile \
>+		-C ${BUILD_WRKSRC}/examples ${MAKE_ARGS} all
> 
> pre-install:
> 	${RM} -rf ${TMPDOCDEST} ${PLIST}
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 365149)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,5 +1,5 @@
>---- Makefile.in-orig	2014-06-14 08:30:10.000000000 +0200
>-+++ Makefile.in	2014-06-14 08:31:21.000000000 +0200
>+--- ./Makefile.in.orig	2014-02-08 08:06:14.000000000 -0500
>++++ ./Makefile.in	2014-08-16 10:48:15.000000000 -0400
> @@ -16,11 +16,10 @@
>  	cd addon/doxyapp ; $(MAKE) clean
>  
>@@ -35,12 +35,9 @@
>  	-rm -rf generated_src
>  	-rm -f addon/doxywizard/doxywizard.pro
>  	-rm -f VERSION
>-@@ -93,9 +90,9 @@
>- 	cd doc ; $(MAKE)
>- 
>+@@ -95,7 +92,7 @@
>  pdf: docs
>--	cd latex ; $(MAKE)
>-+	cd latex ; patch < ../refman-patch ; patch < ../latex-patch ; $(MAKE)
>+ 	cd latex ; $(MAKE)
>  
> -DISTFILES =  Doxyfile libmd5 addon tmake doc examples bin lib objects testing \
> +DISTFILES =  Doxyfile addon tmake doc examples bin lib objects testing \
>Index: files/patch-latex
>===================================================================
>--- files/patch-latex	(revision 365149)
>+++ files/patch-latex	(working copy)
>@@ -1,30 +0,0 @@
>---- latex-patch.orig	1970-01-01 01:00:00.000000000 +0100
>-+++ latex-patch	2014-06-13 23:18:40.000000000 +0200
>-@@ -0,0 +1,27 @@
>-+--- Makefile.orig	2014-06-13 23:14:28.000000000 +0200
>-++++ Makefile	2014-06-13 23:18:27.000000000 +0200
>-+@@ -3,19 +3,19 @@
>-+ pdf: refman.pdf
>-+ 
>-+ refman.pdf: clean refman.tex
>-+-	pdflatex refman
>-++	-pdflatex -interaction nonstopmode refman
>-+ 	makeindex refman.idx
>-+-	pdflatex refman
>-++	-pdflatex -interaction nonstopmode refman
>-+ 	latex_count=8 ; \
>-+ 	while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
>-+ 	    do \
>-+ 	      echo "Rerunning latex...." ;\
>-+-	      pdflatex refman ;\
>-++	      pdflatex -interaction nonstopmode refman ;\
>-+ 	      latex_count=`expr $$latex_count - 1` ;\
>-+ 	    done
>-+ 	makeindex refman.idx
>-+-	pdflatex refman
>-+-
>-++	-pdflatex -interaction nonstopmode refman
>-++	cp refman.pdf doxygen_manual.pdf
>-+ 
>-+ clean:
>-+ 	rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log *.out *.brf *.blg *.bbl refman.pdf
>Index: files/patch-refman
>===================================================================
>--- files/patch-refman	(revision 365149)
>+++ files/patch-refman	(working copy)
>@@ -1,42 +0,0 @@
>---- refman-patch.orig	2014-06-28 22:08:12.000000000 +0200
>-+++ refman-patch	2014-06-28 22:15:22.000000000 +0200
>-@@ -0,0 +1,39 @@
>-+--- refman.tex.orig	2014-06-28 22:09:39.000000000 +0200
>-++++ refman.tex	2014-06-28 22:14:02.000000000 +0200
>-+@@ -13,6 +13,8 @@
>-+ \usepackage{textcomp}
>-+ \usepackage[nointegrals]{wasysym}
>-+ \usepackage[table]{xcolor}
>-++\usepackage{longtable}
>-++\usepackage{enumitem}
>-+ 
>-+ % Font selection
>-+ \usepackage[T1]{fontenc}
>-+@@ -93,7 +95,7 @@
>-+ % Hyperlinks (required, but should be loaded last)
>-+ \usepackage{ifpdf}
>-+ \ifpdf
>-+-  \usepackage[pdftex,pagebackref=true]{hyperref}
>-++  \usepackage[pdftex,unicode,pagebackref=true]{hyperref}
>-+ \else
>-+   \usepackage[ps2pdf,pagebackref=true]{hyperref}
>-+ \fi
>-+@@ -118,7 +120,6 @@
>-+ \hypersetup{pageanchor=false,
>-+              bookmarks=true,
>-+              bookmarksnumbered=true,
>-+-             pdfencoding=unicode
>-+             }
>-+ \pagenumbering{roman}
>-+ \begin{titlepage}
>-+@@ -244,10 +245,6 @@
>-+ \label{perlmod}
>-+ \hypertarget{perlmod}{}
>-+ \input{perlmod}
>-+-\chapter{Perl Module Tree Nodes}
>-+-\label{perlmod_tree}
>-+-\hypertarget{perlmod_tree}{}
>-+-\input{perlmod_tree}
>-+ \chapter{Doxygen's Internals}
>-+ \label{arch}
>-+ \hypertarget{arch}{}

Actions: View | Diff

Attachments on bug 192732: 145903 | 145952