1 files changed, 45 insertions, 24 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 9b2f41015fde..6511e642d00e 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -6,23 +6,27 @@
 #
 
 PORTNAME=	doxygen
-PORTVERSION=	1.4.7
+PORTVERSION=	1.5.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	mwisnicki+freebsd@gmail.com
-COMMENT=	A documentation system for C and C++
+COMMENT=	A documentation system for C, C++ and other languages
 
 BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
 
 ALL_TARGET=	all
 
-EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude '*/libmd5'	\
-	--exclude '*/libpng' --exclude '*/tmake'
+EXTRACT_AFTER_ARGS=|${TAR} -xpf - \
+		--exclude '*/libmd5'	\
+		--exclude '*/libpng'	\
+		--exclude '*/tmake'	\
+		--exclude '*/.gdb_history' # XXX: remove this when no longer needed
 
 CONFIGURE_ENV+=	CXX="${CXX}"
+
 .if !defined(NOPORTDOCS)
 ALL_TARGET+=	docs
 BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python # XXX: Replace with USE_PYTHON_BUILD
@@ -30,14 +34,10 @@ BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
 
 .if !defined(WITHOUT_LATEX)
 ALL_TARGET+=	pdf
-PLIST_SUB+=	HAVE_LATEX=""
-GSPORT?=	print/ghostscript-gnu
 BUILD_DEPENDS+=	dvips:${PORTSDIR}/print/dvipsk-tetex \
-		latex:${PORTSDIR}/print/teTeX \
-		gs:${PORTSDIR}/${GHOSTSCRIPT_PORT}
+		latex:${PORTSDIR}/print/teTeX
+USE_GHOSTSCRIPT_BUILD=	yes
 MAKE_ARGS+=	HAVE_LATEX=yes
-.else # !defined(WITHOUT_LATEX)
-PLIST_SUB+=	HAVE_LATEX="@comment "
 .endif # !defined(WITHOUT_LATEX)
 .endif # !defined(NOPORTDOCS)
 
@@ -53,9 +53,6 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 QTDIR?=		${QT_PREFIX}
 CONFIGURE_ENV+=	QTDIR="${QTDIR}"
 CONFIGURE_ARGS+=--with-doxywizard
-PLIST_SUB+=	HAVE_DOXYWIZARD=""
-.else # !WITHOUT_DOXYWIZARD
-PLIST_SUB+=	HAVE_DOXYWIZARD="@comment "
 .endif # !WITHOUT_DOXYWIZARD
 
 USE_PERL5=	yes
@@ -69,6 +66,16 @@ CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \
 CONFIGURE_ARGS+=	--enable-langs no
 .endif
 
+PLIST=		${WRKDIR}/plist
+TMPDOCDEST=	${WRKDIR}/tmpdocdest
+
+PLIST_FILES=	bin/doxygen \
+		bin/doxytag
+
+.ifndef WITHOUT_DOXYWIZARD
+PLIST_FILES+=	bin/doxywizard
+.endif
+
 post-configure:
 	@${REINPLACE_CMD} -e 's|TMAKE *=.*|TMAKE=${LOCALBASE}/bin/tmake|' \
 		-e 's|TMAKEPATH *=.*|TMAKEPATH=${LOCALBASE}/share/tmake/freebsd-g++|' \
@@ -79,29 +86,43 @@ post-build:
 	cd ${BUILD_WRKSRC}/examples; \
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxytag ${PREFIX}/bin
-.ifndef WITHOUT_DOXYWIZARD
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${PREFIX}/bin
-.endif
+pre-install:
+	${RM} -rf ${TMPDOCDEST} ${PLIST}
+	${TOUCH} ${PLIST}
 .ifndef NOPORTDOCS
-	${MKDIR} ${PREFIX}/share/doc/doxygen/html
+	${MKDIR} ${TMPDOCDEST}/doxygen
 	${RM} -f ${WRKSRC}/examples/diagrams/html/*.md5 \
 		 ${WRKSRC}/examples/diagrams/html/*.map
 	${TAR} -C ${WRKSRC} --exclude '*/_*' -cf - html \
-		| ${TAR} -C ${PREFIX}/share/doc/doxygen --unlink -xf -
+		| ${TAR} -C ${TMPDOCDEST}/doxygen --unlink -xf -
 	${TAR} -C ${WRKSRC} --exclude '*/Makefile*' --exclude '*.dot' \
 		-cf - examples \
-	    | ${TAR} -C ${PREFIX}/share/doc/doxygen --unlink -xf -
+	    | ${TAR} -C ${TMPDOCDEST}/doxygen --unlink -xf -
 .ifndef WITHOUT_LATEX
 	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.dvi \
 			${WRKSRC}/latex/doxygen_manual.pdf \
 			${WRKSRC}/latex/doxygen_manual.ps \
 			${WRKSRC}/latex/archoverview.eps \
 			${WRKSRC}/latex/doxygen_logo.eps \
-			${PREFIX}/share/doc/doxygen
-.endif # WITHOUT_LATEXT
+			${TMPDOCDEST}/doxygen
+.endif # WITHOUT_LATEX
+	@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 # ! NOPORTDOCS
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxytag ${PREFIX}/bin
+.ifndef WITHOUT_DOXYWIZARD
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${PREFIX}/bin
+.endif
+.ifndef NOPORTDOCS
+	${MKDIR} ${PREFIX}/share/doc/doxygen
+	${TAR} -C ${TMPDOCDEST} -cf - doxygen \
+		| ${TAR} -C ${PREFIX}/share/doc --unlink -xf -
 .endif # ! NOPORTDOCS
 
 .include <bsd.port.mk>