Attachment #148105 for bug #194178




# $FreeBSD$

PORTNAME=	doxygen
PORTVERSION=	1.8.8
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \

LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png

USES=		bison gmake iconv perl5 python:2
ALL_TARGET=	all
HAS_CONFIGURE=	yes
QT_NONSTANDARD=	yes	# non-standard configure arguments
CONFIGURE_ARGS=	--prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \


GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz

LATEX_USE=	TEX=base,dvipsk,pdftex

QT4_USE=	QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build
QT4_CONFIGURE_ENV=	QTDIR="${QTDIR}"

.endif
	@cd ${TMPDOCDEST} \
	&& ${FIND} -s * -type f -o -type l \
		| ${SED} -e 's|^|share/doc/|' >> ${PLIST}
	&& ${FIND} -d * -type d \
		| ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST}
.endif

do-install:

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (doxygen-1.8.7.src.tar.gz) = c6eac6b6e82148ae15ec5aecee4631547359f284af1ce94474d046ebca6ee3d9	1	SHA256 (doxygen-1.8.8.src.tar.gz) = 158e7834f05e0aeea5794b23c1e775ddfebafc709543e47f6fff9d81b190ade1
2	SIZE (doxygen-1.8.7.src.tar.gz) = 4796875	2	SIZE (doxygen-1.8.8.src.tar.gz) = 4955485




--- Makefile.in.orig	2014-08-22 08:36:24 UTC
+++ Makefile.in
@@ -2,26 +2,25 @@
 DESTDIR = 
 
 doxywizard:

+	$(MAKE) -C addon/doxmlparser/examples/metrics
 
 doxyapp:
 	cd addon/doxyapp ; $(MAKE) clean
+	$(MAKE) -C addon/doxyapp
 
 clean: FORCE
-	- cd examples ; $(MAKE) clean

-	- cd qtools ; $(MAKE) clean
-	- cd src ; $(MAKE) clean
-	- cd libmd5 ; $(MAKE) clean
-	- cd vhdlparser ; $(MAKE) clean
+	-cd examples ; $(MAKE) clean
+	-cd doc ; $(MAKE) clean
+	-cd qtools ; $(MAKE) clean
+	-cd src ; $(MAKE) clean
+	-cd vhdlparser ; $(MAKE) clean
 	-cd addon/doxywizard ; $(MAKE) clean
 	-cd addon/doxysearch ; $(MAKE) clean
 	-cd addon/doxyapp ; $(MAKE) clean
@@ -33,7 +32,6 @@
 
 distclean: clean
 	-cd src ; $(MAKE) distclean
-	-cd libmd5 ; $(MAKE) distclean
 	-cd vhdlparser ; $(MAKE) distclean
 	-cd qtools ; $(MAKE) distclean
 	-cd addon/doxywizard ; $(MAKE) distclean
@@ -54,10 +52,9 @@
 	-cd addon/doxyapp ; $(MAKE) distclean
@@ -51,9 +49,8 @@ distclean: clean
 	-rm -rf xml
 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
 	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
-	-rm -f libmd5/Makefile.libmd5
 	-rm -f vhdlparser/Makefile.vhdlparser
 	-rm -f .makeconfig .tmakeconfig
-	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro
+	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro vhdlparser/vhdlparser.pro
 	-rm -rf generated_src
 	-rm -f addon/doxywizard/doxywizard.pro
 	-rm -f VERSION
@@ -92,14 +89,14 @@
 	cp -r examples $(DESTDIR)$(DOCDIR)
 	cp -r html $(DESTDIR)$(DOCDIR)
 

-	cd latex ; $(MAKE)
+	$(MAKE) -C latex
 
-DISTFILES =  Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \
+DISTFILES =  Doxyfile vhdlparser addon tmake doc examples bin lib objects testing \
              qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
              Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \
              VERSION README.md packages winbuild jquery




--- configure.orig	2014-08-22 08:43:05 UTC
+++ configure
@@ -363,25 +363,25 @@
     echo "  QTDIR environment variable not set!"
     printf "  Checking for Qt..."

     echo "check the Qt installation instructions!"
     exit 2
   fi
@@ -857,7 +857,7 @@
 fi
 if test "$f_wizard" = YES; then
   cat >> .tmakeconfig <<EOF

 EOF
 fi
 
@@ -868,7 +868,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 addon/doxysearch/Makefile.in vhdlparser/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 vhdlparser/Makefile.in"
 
 for i in $f_inmakefiles ; do
      SRC=$i
@@ -892,7 +892,6 @@
 #       fi
        echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
        echo "	\$(MAKE) -C qtools" >> $DST
-       echo "	\$(MAKE) -C libmd5" >> $DST
        echo "	\$(MAKE) -C vhdlparser" >> $DST
        echo "	\$(MAKE) -C src" >> $DST
 
@@ -932,7 +931,7 @@
@@ -921,7 +920,7 @@
 cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t
 cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|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 addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.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 vhdlparser/vhdlparser.pro.in"
 
 for i in $f_inprofiles ; do
      SRC=$i

Lines 1-9 Link Here

(-)files/patch-doc-Makefile.in (-4 / +4 lines)
1	--- doc/Makefile.in.orig Mon Jul 8 15:59:59 2002	1	--- doc/Makefile.in.orig 2014-07-13 13:04:37 UTC
2	+++ doc/Makefile.in Tue Oct 22 23:02:24 2002	2	+++ doc/Makefile.in
3	@@ -18,12 +18,14 @@	3	@@ -18,12 +18,14 @@
4	VERSION=$(VERSION) ; \	4	VERSION=$(VERSION) ; \
5	export VERSION; \	5	export VERSION; \
6	$(DOXYGEN)/bin/doxygen	6	"$(DOXYGEN)/bin/doxygen"
7	- @rm -f ../latex/refman.tex	7	- @rm -f ../latex/refman.tex
8	@cp doxygen_logo*.gif ../html	8	@cp doxygen_logo*.gif ../html
9	+ifdef HAVE_LATEX	9	+ifdef HAVE_LATEX
Lines 15-18 Link Here
15	+endif # HAVE_LATEX	15	+endif # HAVE_LATEX
16		16
17	clean:	17	clean:
18	rm -rf ../html ../latex *.bak translator_report.txt	18	rm -rf ../html ../latex *.bak

Lines 1-10 Link Here

(-)files/patch-md5-Doxyfile (-4 / +5 lines)
1	--- Doxyfile.orig 2014-06-14 08:11:43.000000000 +0200	1	--- Doxyfile.orig 2014-08-14 17:46:42 UTC
2	+++ Doxyfile 2014-06-14 08:11:47.000000000 +0200	2	+++ Doxyfile
3	@@ -257,7 +257,7 @@	3	@@ -261,8 +261,7 @@
4	MACRO_EXPANSION = YES	4	MACRO_EXPANSION = YES
5	EXPAND_ONLY_PREDEF = YES	5	EXPAND_ONLY_PREDEF = YES
6	SEARCH_INCLUDES = YES	6	SEARCH_INCLUDES = YES
7	-INCLUDE_PATH = qtools libmd5	7	-INCLUDE_PATH = qtools \
		8	- libmd5
8	+INCLUDE_PATH = qtools	9	+INCLUDE_PATH = qtools
9	INCLUDE_FILE_PATTERNS =	10	INCLUDE_FILE_PATTERNS =
10	PREDEFINED =	11	PREDEFINED =




--- src/doxygen.pro.in.orig	2014-08-14 17:46:42 UTC
+++ src/doxygen.pro.in
@@ -18,7 +18,7 @@
 CONFIG       =	console warn_on $extraopts
 HEADERS      =	doxygen.h 
 SOURCES      =	main.cpp 
-unix:LIBS                  += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
+unix:LIBS                  += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
 win32:INCLUDEPATH          += .
 win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
 win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib
@@ -29,7 +29,7 @@
 win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32
 win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
 DEPENDPATH                 += ../generated_src/doxygen
-INCLUDEPATH                += ../qtools ../libmd5 . ../vhdlparser
+INCLUDEPATH                += ../qtools . ../vhdlparser
 DESTDIR                    =  ../bin
 TARGET                     =  doxygen
 unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a

Return to bug 194178

Lines 2-9 Link Here

(-)Makefile (-6 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doxygen	4	PORTNAME= doxygen
5	PORTVERSION= 1.8.7	5	PORTVERSION= 1.8.8
6	PORTREVISION= 1
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \	8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
Lines 21-26 Link Here
21	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png	20	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
22		21
23	USES= bison gmake iconv perl5 python:2	22	USES= bison gmake iconv perl5 python:2
		23	ALL_TARGET= all
24	HAS_CONFIGURE= yes	24	HAS_CONFIGURE= yes
25	QT_NONSTANDARD= yes # non-standard configure arguments	25	QT_NONSTANDARD= yes # non-standard configure arguments
26	CONFIGURE_ARGS= --prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \	26	CONFIGURE_ARGS= --prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \
Lines 44-50 Link Here
44		44
45	GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz	45	GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
46		46
47	LATEX_USE= TEX=full	47	LATEX_USE= TEX=base,dvipsk,pdftex
48		48
49	QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build	49	QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build
50	QT4_CONFIGURE_ENV= QTDIR="${QTDIR}"	50	QT4_CONFIGURE_ENV= QTDIR="${QTDIR}"
Lines 107-115 Link Here
107	.endif	107	.endif
108	@cd ${TMPDOCDEST} \	108	@cd ${TMPDOCDEST} \
109	&& ${FIND} -s * -type f -o -type l \	109	&& ${FIND} -s * -type f -o -type l \
110	\| ${SED} -e 's\|^\|share/doc/\|' >> ${PLIST} \	110	\| ${SED} -e 's\|^\|share/doc/\|' >> ${PLIST}
111	&& ${FIND} -d * -type d \
112	\| ${SED} -e 's\|^\|@dirrm share/doc/\|' >> ${PLIST}
113	.endif	111	.endif
114		112
115	do-install:	113	do-install:

Lines 1-6 Link Here

(-)files/patch-Makefile.in (-14 / +16 lines)
1	--- Makefile.in-orig 2014-06-14 08:30:10.000000000 +0200	1	--- Makefile.in.orig 2014-08-22 08:36:24 UTC
2	+++ Makefile.in 2014-06-14 08:31:21.000000000 +0200	2	+++ Makefile.in
3	@@ -2,25 +2,24 @@	3	@@ -2,26 +2,25 @@
4	DESTDIR =	4	DESTDIR =
5		5
6	doxywizard:	6	doxywizard:
Lines 20-27 Link Here
20	+ $(MAKE) -C addon/doxmlparser/examples/metrics	20	+ $(MAKE) -C addon/doxmlparser/examples/metrics
21		21
22	doxyapp:	22	doxyapp:
23	- cd addon/doxyapp ; $(MAKE) clean	23	cd addon/doxyapp ; $(MAKE) clean
24	+ $(MAKE) -C addon/doxyapp
25		24
26	clean: FORCE	25	clean: FORCE
27	- - cd examples ; $(MAKE) clean	26	- - cd examples ; $(MAKE) clean
Lines 29-61 Link Here
29	- - cd qtools ; $(MAKE) clean	28	- - cd qtools ; $(MAKE) clean
30	- - cd src ; $(MAKE) clean	29	- - cd src ; $(MAKE) clean
31	- - cd libmd5 ; $(MAKE) clean	30	- - cd libmd5 ; $(MAKE) clean
		31	- - cd vhdlparser ; $(MAKE) clean
32	+ -cd examples ; $(MAKE) clean	32	+ -cd examples ; $(MAKE) clean
33	+ -cd doc ; $(MAKE) clean	33	+ -cd doc ; $(MAKE) clean
34	+ -cd qtools ; $(MAKE) clean	34	+ -cd qtools ; $(MAKE) clean
35	+ -cd src ; $(MAKE) clean	35	+ -cd src ; $(MAKE) clean
		36	+ -cd vhdlparser ; $(MAKE) clean
36	-cd addon/doxywizard ; $(MAKE) clean	37	-cd addon/doxywizard ; $(MAKE) clean
37	-cd addon/doxysearch ; $(MAKE) clean	38	-cd addon/doxysearch ; $(MAKE) clean
38	-cd addon/doxyapp ; $(MAKE) clean	39	-cd addon/doxyapp ; $(MAKE) clean
39	@@ -32,7 +31,6 @@ clean: FORCE	40	@@ -33,7 +32,6 @@
40		41
41	distclean: clean	42	distclean: clean
42	-cd src ; $(MAKE) distclean	43	-cd src ; $(MAKE) distclean
43	- -cd libmd5 ; $(MAKE) distclean	44	- -cd libmd5 ; $(MAKE) distclean
		45	-cd vhdlparser ; $(MAKE) distclean
		46	-cd qtools ; $(MAKE) distclean
44	-cd addon/doxywizard ; $(MAKE) distclean	47	-cd addon/doxywizard ; $(MAKE) distclean
45	-cd addon/doxysearch ; $(MAKE) distclean	48	@@ -54,10 +52,9 @@
46	-cd addon/doxyapp ; $(MAKE) distclean
47	@@ -51,9 +49,8 @@ distclean: clean
48	-rm -rf xml	49	-rm -rf xml
49	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen	50	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen
50	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t	51	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
51	- -rm -f libmd5/Makefile.libmd5	52	- -rm -f libmd5/Makefile.libmd5
		53	-rm -f vhdlparser/Makefile.vhdlparser
52	-rm -f .makeconfig .tmakeconfig	54	-rm -f .makeconfig .tmakeconfig
53	- -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro	55	- -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro
54	+ -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro	56	+ -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro vhdlparser/vhdlparser.pro
55	-rm -rf generated_src	57	-rm -rf generated_src
56	-rm -f addon/doxywizard/doxywizard.pro	58	-rm -f addon/doxywizard/doxywizard.pro
57	-rm -f VERSION	59	-rm -f VERSION
58	@@ -88,14 +85,14 @@ install_docs:	60	@@ -92,14 +89,14 @@
59	cp -r examples $(DESTDIR)$(DOCDIR)	61	cp -r examples $(DESTDIR)$(DOCDIR)
60	cp -r html $(DESTDIR)$(DOCDIR)	62	cp -r html $(DESTDIR)$(DOCDIR)
61		63
Lines 70-77 Link Here
70	- cd latex ; $(MAKE)	72	- cd latex ; $(MAKE)
71	+ $(MAKE) -C latex	73	+ $(MAKE) -C latex
72		74
73	-DISTFILES = Doxyfile libmd5 addon tmake doc examples bin lib objects testing \	75	-DISTFILES = Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \
74	+DISTFILES = Doxyfile addon tmake doc examples bin lib objects testing \	76	+DISTFILES = Doxyfile vhdlparser addon tmake doc examples bin lib objects testing \
75	qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \	77	qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
76	Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \	78	Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \
77	VERSION README.md packages winbuild jquery	79	VERSION README.md packages winbuild jquery

Lines 1-5 Link Here

(-)files/patch-configure (-12 / +12 lines)
1	--- configure.orig 2014-04-20 17:17:29.000000000 +0200	1	--- configure.orig 2014-08-22 08:43:05 UTC
2	+++ configure 2014-06-13 23:25:23.000000000 +0200	2	+++ configure
3	@@ -363,25 +363,25 @@	3	@@ -363,25 +363,25 @@
4	echo " QTDIR environment variable not set!"	4	echo " QTDIR environment variable not set!"
5	printf " Checking for Qt..."	5	printf " Checking for Qt..."
Lines 31-37 Link Here
31	echo "check the Qt installation instructions!"	31	echo "check the Qt installation instructions!"
32	exit 2	32	exit 2
33	fi	33	fi
34	@@ -848,7 +848,7 @@	34	@@ -857,7 +857,7 @@
35	fi	35	fi
36	if test "$f_wizard" = YES; then	36	if test "$f_wizard" = YES; then
37	cat >> .tmakeconfig <<EOF	37	cat >> .tmakeconfig <<EOF
Lines 40-68 Link Here
40	EOF	40	EOF
41	fi	41	fi
42		42
43	@@ -859,7 +859,7 @@	43	@@ -868,7 +868,7 @@
44	EOF	44	EOF
45	fi	45	fi
46		46
47	-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"	47	-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 vhdlparser/Makefile.in"
48	+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"	48	+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 vhdlparser/Makefile.in"
49		49
50	for i in $f_inmakefiles ; do	50	for i in $f_inmakefiles ; do
51	SRC=$i	51	SRC=$i
52	@@ -883,7 +883,6 @@	52	@@ -892,7 +892,6 @@
53	# fi	53	# fi
54	echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST	54	echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
55	echo " \$(MAKE) -C qtools" >> $DST	55	echo " \$(MAKE) -C qtools" >> $DST
56	- echo " \$(MAKE) -C libmd5" >> $DST	56	- echo " \$(MAKE) -C libmd5" >> $DST
		57	echo " \$(MAKE) -C vhdlparser" >> $DST
57	echo " \$(MAKE) -C src" >> $DST	58	echo " \$(MAKE) -C src" >> $DST
58	if test $f_wizard = YES; then	59
59	echo " \$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST	60	@@ -932,7 +931,7 @@
60	@@ -921,7 +920,7 @@
61	cat src/libdoxycfg.t.in \| sed -e "s\|%%FLEX%%\|$f_flex\|g" -e "s\|%%BISON%%\|$f_bison\|g" -e "s\|%%PYTHON%%\|$f_python\|g" > src/libdoxycfg.t	61	cat src/libdoxycfg.t.in \| sed -e "s\|%%FLEX%%\|$f_flex\|g" -e "s\|%%BISON%%\|$f_bison\|g" -e "s\|%%PYTHON%%\|$f_python\|g" > src/libdoxycfg.t
62	cat src/libdoxygen.t.in \| sed -e "s\|%%FLEX%%\|$f_flex\|g" -e "s\|%%BISON%%\|$f_bison\|g" -e "s\|%%PYTHON%%\|$f_python\|g" > src/libdoxygen.t	62	cat src/libdoxygen.t.in \| sed -e "s\|%%FLEX%%\|$f_flex\|g" -e "s\|%%BISON%%\|$f_bison\|g" -e "s\|%%PYTHON%%\|$f_python\|g" > src/libdoxygen.t
63		63
64	-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"	64	-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 vhdlparser/vhdlparser.pro.in"
65	+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"	65	+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 vhdlparser/vhdlparser.pro.in"
66		66
67	for i in $f_inprofiles ; do	67	for i in $f_inprofiles ; do
68	SRC=$i	68	SRC=$i

Lines 1-20 Link Here

(-)files/patch-md5-doxygen.pro.in (-9 / +9 lines)
1	--- src/doxygen.pro.in-orig 2014-06-11 20:16:21.000000000 +0200	1	--- src/doxygen.pro.in.orig 2014-08-14 17:46:42 UTC
2	+++ src/doxygen.pro.in 2014-06-11 20:16:59.000000000 +0200	2	+++ src/doxygen.pro.in
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@
4	CONFIG = console warn_on $extraopts	4	CONFIG = console warn_on $extraopts
5	HEADERS = doxygen.h	5	HEADERS = doxygen.h
6	SOURCES = main.cpp	6	SOURCES = main.cpp
7	-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%	7	-unix:LIBS += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
8	+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%	8	+unix:LIBS += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
9	win32:INCLUDEPATH += .	9	win32:INCLUDEPATH += .
10	win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%	10	win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
11	win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib	11	win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib
12	@@ -29,7 +29,7 @@	12	@@ -29,7 +29,7 @@
13	win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32	13	win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32
14	win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti	14	win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
15	DEPENDPATH += ../generated_src/doxygen	15	DEPENDPATH += ../generated_src/doxygen
16	-INCLUDEPATH += ../qtools ../libmd5 .	16	-INCLUDEPATH += ../qtools ../libmd5 . ../vhdlparser
17	+INCLUDEPATH += ../qtools .	17	+INCLUDEPATH += ../qtools . ../vhdlparser
18	DESTDIR = ../bin	18	DESTDIR = ../bin
19	TARGET = doxygen	19	TARGET = doxygen
20	unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a	20	unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a