5 files changed, 96 insertions, 82 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index b9f9d2a29aa6..2ca7c8a73fcb 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -6,86 +6,90 @@
 #
 
 PORTNAME=	doxygen
-PORTVERSION=	1.2.16
-PORTREVISION=	1
+PORTVERSION=	1.2.18
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	kde@freebsd.org
 
-.ifndef NOPORTDOCS
-BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
-.ifdef HAVE_LATEX
-BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX \
-		dvipdfm:${PORTSDIR}/print/dvipdfm
-.endif
-.endif
+ALL_TARGET=	all
+
+.if !defined(NOPORTDOCS)
+ALL_TARGET+=	docs
+BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+.else
+.undef HAVE_LATEX
+.endif # !defined(NOPORTDOCS)
+
+.if defined(HAVE_LATEX)
+ALL_TARGET+=	pdf
+PLIST_SUB+=	HAVE_LATEX=""
+BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX
+.else # !defined(HAVE_LATEX)
+PLIST_SUB+=	HAVE_LATEX="@comment "
+.endif # !defined(HAVE_LATEX)
 
 .if defined(WITH_QT2)
 USE_QT_VER=	2
 QT_INC=		${X11BASE}/include/qt2
+QT_NAME=	qt
 QT_OPENGL=	-lqtgl
 THREADLIBS=
-.else
+PKGNAMESUFFIX=	-qt2
+.else # not QT2
 USE_QT_VER=	3
 QT_INC=		${X11BASE}/include
 QTNAME=		qt-mt
 QT_OPENGL=
 THREADLIBS=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS}
-#CXXFLAGS+=	${PTHREAD_CFLAGS}
-.endif
+.endif # not QT2
+
+# Need this in env for build
+QTDIR?=		${X11BASE}
+CONFIGURE_ENV+=	QTDIR="${QTDIR}"
+
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 QT_NONSTANDARD=	yes	# non-standard configure arguments
 CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \
-		--with-doxywizard
-
-# As of 1.2.13 the configure script bogusly checks for GNU options
-# in install so we need to override it's sillyness here.
-CONFIGURE_ARGS+=--install ${INSTALL}
-
-# XXX bsd.kde.mk fails to set QTDIR for QT_VER 2
-QTDIR?=		${X11BASE}
-CONFIGURE_ENV+=	QTDIR="${QTDIR}"
+		--with-doxywizard --install ${INSTALL}
 
-.ifndef NOPORTDOCS
-ALL_TARGET=	all docs
-.ifdef HAVE_LATEX
-ALL_TARGET+=	ps
-BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX \
-		dvipdfm:${PORTSDIR}/print/dvipdfm
-PLIST_SUB+=	HAVE_LATEX=""
-.else
-PLIST_SUB+=	HAVE_LATEX="@comment "
+.if !defined(NOPORTDOCS) && !defined(HAVE_LATEX)
 pre-everything::
 	@${ECHO_MSG}
+	@${ECHO_MSG} "================================================="
 	@${ECHO_MSG} "If you want DVI, Postscript, and PDF documentation"
 	@${ECHO_MSG} "in addition to the HTML documentation,"
 	@${ECHO_MSG} "hit Ctrl-C right now and use \"make HAVE_LATEX=yes\""
+	@${ECHO_MSG} "================================================="
 	@${ECHO_MSG}
-.endif
-.endif
+.endif # !defined(NOPORTDOCS) && !defined(HAVE_LATEX)
 
 pre-configure:
-	@${PERL} -pi -e "s:gcc:${CC}:g ; s:g\+\+:${CXX}:g ; \
-		s:%%LIBQT%%:-l${QTNAME}:g ; \
-		s:%%MOC%%:${MOC}:g ; \
-		s:%%QT_INC%%:${QT_INC}:g ; \
-		s:%%QT_LIB%%:${X11BASE}/lib:g ; \
-		s:%%QT_OPENGL%%:${QT_OPENGL}:g ; \
-		s:%%THREADLIBS%%:${THREADLIBS}:g ; \
-		s:%%CFLAGS%%:${CFLAGS}:g ; \
-		s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
+	@${PERL} -pi -e "s:gcc:${CC}:g;		\
+		s:g\+\+:${CXX}:g;		\
+		s:%%LIBQT%%:-l${QTNAME}:g;	\
+		s:%%MOC%%:${MOC}:g;		\
+		s:%%QT_INC%%:${QT_INC}:g;	\
+		s:%%QT_LIB%%:${X11BASE}/lib:g;	\
+		s:%%QT_OPENGL%%:${QT_OPENGL}:g;	\
+		s:%%THREADLIBS%%:${THREADLIBS}:g;\
+		s:%%CFLAGS%%:${CFLAGS}:g;	\
+		s:%%CXXFLAGS%%:${CXXFLAGS}:g"	\
+	    ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
 
 post-patch:
-	@${PERL} -pi.fbsd -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/libpng/pngconf.h \
-	${WRKSRC}/libpng/zutil.h ${WRKSRC}/src/pngenc.cpp
+	@${PERL} -pi.fbsd -e 's|<malloc.h>|<stdlib.h>|g' \
+		${WRKSRC}/libpng/pngconf.h \
+		${WRKSRC}/libpng/zutil.h ${WRKSRC}/src/pngenc.cpp
 
 post-build:
-	cd ${BUILD_WRKSRC}/examples; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
+	cd ${BUILD_WRKSRC}/examples; \
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin
@@ -94,10 +98,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${PREFIX}/bin
 .ifndef NOPORTDOCS
 	${MKDIR} ${PREFIX}/share/doc/doxygen/html
-	${TAR} -C ${WRKSRC} --exclude '*/_*' -cf - html | \
-		${TAR} -C ${PREFIX}/share/doc/doxygen --unlink -xf -
-	${TAR} -C ${WRKSRC} --exclude '*/Makefile*' --exclude '*.dot' -cf - examples | \
-		${TAR} -C ${PREFIX}/share/doc/doxygen --unlink -xf -
+	${TAR} -C ${WRKSRC} --exclude '*/_*' -cf - html \
+		| ${TAR} -C ${PREFIX}/share/doc/doxygen --unlink -xf -
+	${TAR} -C ${WRKSRC} --exclude '*/Makefile*' --exclude '*.dot' \
+		-cf - examples \
+	    | ${TAR} -C ${PREFIX}/share/doc/doxygen --unlink -xf -
 .ifdef HAVE_LATEX
 	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.dvi \
 			${WRKSRC}/latex/doxygen_manual.pdf \
@@ -105,7 +110,7 @@ do-install:
 			${WRKSRC}/latex/archoverview.eps \
 			${WRKSRC}/latex/doxygen_logo.eps \
 			${PREFIX}/share/doc/doxygen
-.endif
-.endif
+.endif # HAVE_LATEXT
+.endif # ! NOPORTDOCS
 
 .include <bsd.port.mk>
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 68b9c803de60..bd9d91775c06 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1 +1 @@
-MD5 (doxygen-1.2.16.src.tar.gz) = c0d2abbac723d2a9d020083a8e2f3e92
+MD5 (doxygen-1.2.18.src.tar.gz) = 5caf5a0db2075d1b96cd7e3c3fbe0441
diff --git a/devel/doxygen/files/patch-ag b/devel/doxygen/files/patch-ag
deleted file mode 100644
index fae427e281ae..000000000000
--- a/devel/doxygen/files/patch-ag
+++ /dev/null
@@ -1,30 +0,0 @@
---- doc/Makefile.latex.orig	Mon May 20 05:58:08 2002
-+++ doc/Makefile.latex	Sat May 25 09:12:31 2002
-@@ -12,20 +12,20 @@
- # Documents produced by Doxygen are derivative works derived from the
- # input used in their production; they are not affected by this license.
- 
--all: doxygen_manual.pdf
-+all: doxygen_manual.ps doxygen_manual.pdf
- 
--#doxygen_manual.pdf: doxygen_manual.ps
--#	ps2pdf doxygen_manual.ps doxygen_manual.pdf
-+doxygen_manual.pdf: doxygen_manual.ps
-+	dvipdfm -o doxygen_manual.pdf doxygen_manual.dvi
- 
--#doxygen_manual.ps: doxygen_manual.dvi
--#	dvips -o doxygen_manual.ps doxygen_manual.dvi
-+doxygen_manual.ps: doxygen_manual.dvi
-+	dvips -o doxygen_manual.ps doxygen_manual.dvi
- 
--doxygen_manual.pdf: doxygen_manual.tex doxygen.sty
-+doxygen_manual.dvi: doxygen_manual.tex doxygen.sty
- 	echo "Running latex..."
- 	pdflatex doxygen_manual.tex 
- 	echo "Running makeindex..."
- 	makeindex doxygen_manual.idx
- 	echo "Rerunning latex...."
--	pdflatex doxygen_manual.tex
-+	latex doxygen_manual.tex
- clean:
- 	rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log *.pdf
diff --git a/devel/doxygen/files/patch-doc-Makefile.latex b/devel/doxygen/files/patch-doc-Makefile.latex
new file mode 100644
index 000000000000..17a65aa2c05e
--- /dev/null
+++ b/devel/doxygen/files/patch-doc-Makefile.latex
@@ -0,0 +1,40 @@
+--- doc/Makefile.latex.orig	Thu Jun 20 14:06:16 2002
++++ doc/Makefile.latex	Tue Oct 15 16:50:30 2002
+@@ -12,20 +12,31 @@
+ # Documents produced by Doxygen are derivative works derived from the
+ # input used in their production; they are not affected by this license.
+ 
+-all: doxygen_manual.pdf
++all: doxygen_manual.pdf doxygen_manual.ps
+ 
+ #doxygen_manual.pdf: doxygen_manual.ps
+ #	ps2pdf doxygen_manual.ps doxygen_manual.pdf
+ 
+-#doxygen_manual.ps: doxygen_manual.dvi
+-#	dvips -o doxygen_manual.ps doxygen_manual.dvi
++graphics:
++	cp ../doc/doxygen_logo.eps .
++	cp ../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
+ 
+ doxygen_manual.pdf: doxygen_manual.tex doxygen.sty
+-	echo "Running latex..."
++	@echo "Running latex..."
+ 	pdflatex doxygen_manual.tex 
+-	echo "Running makeindex..."
++	@echo "Running makeindex..."
+ 	makeindex doxygen_manual.idx
+-	echo "Rerunning latex...."
++	@echo "Rerunning latex...."
+ 	pdflatex doxygen_manual.tex
++
+ clean:
+ 	rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log doxygen_manual.pdf
++
++.PHONY:	graphics
diff --git a/devel/doxygen/pkg-plist b/devel/doxygen/pkg-plist
index bea41840fc2a..59855b73eb26 100644
--- a/devel/doxygen/pkg-plist
+++ b/devel/doxygen/pkg-plist
@@ -68,7 +68,6 @@ bin/doxywizard
 %%PORTDOCS%%share/doc/doxygen/examples/diagrams/html/annotated.html
 %%PORTDOCS%%share/doc/doxygen/examples/diagrams/html/class_a-members.html
 %%PORTDOCS%%share/doc/doxygen/examples/diagrams/html/class_a.html
-%%PORTDOCS%%share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.png
 %%PORTDOCS%%share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.png
 %%PORTDOCS%%share/doc/doxygen/examples/diagrams/html/class_b-members.html
 %%PORTDOCS%%share/doc/doxygen/examples/diagrams/html/class_b.html