View | Details | Raw Unified | Return to bug 192732 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 192732