Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Aug 2001 19:48:17 +0200 (CEST)
From:      matthias.andree@web.de
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        joep@di.nl, emma@freebsd.emma.line.org
Subject:   ports/29905: Update port: devel/doxygen 1.2.6 -> 1.2.9.1, add doxywizard, .pdf docs
Message-ID:  <20010820174817.EC5E22D37D@freebsd.emma.line.org>

next in thread | raw e-mail | index | archive | help

>Number:         29905
>Category:       ports
>Synopsis:       Update port to 1.2.9.1, add doxywizard and pdf documentation.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 20 10:50:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        FreeBSD 4.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD freebsd.emma.line.org 4.3-RELEASE FreeBSD 4.3-RELEASE #0: Wed Aug 8 18:59:41 CEST 2001 root@freebsd.emma.line.org:/usr/src/sys/compile/M2A2 i386


	
>Description:
This is a non-maintainer update for the doxygen port.

I have updated the doxygen port from 1.2.6 to 1.2.9.1.

NOTE: the port update adds files/patch-aa!

NOTE: the old port depended on qt1, this one depends on qt2.

The port has received some bugfixes since 1.2.6:
- it installs .pdf documentation
- it installs the .eps logo which is needed by the .dvi file
- it depends on bison at build time
- it builds and installs doxywizard

The Makefile has been improved:

- if HAVE_LATEX is set, it now depends on teTeX' texconfig and ghostscript's 
  ps2pdf.
- added a post_configure section that echoes a hint about make -DHAVE_LATEX 


	
>How-To-Repeat:
	
>Fix:
Apply this patch:

diff -Nur /usr/ports/devel/doxygen/Makefile /tmp/devel/doxygen/Makefile
--- /usr/ports/devel/doxygen/Makefile	Tue Apr  3 10:13:59 2001
+++ /tmp/devel/doxygen/Makefile	Mon Aug 20 19:26:36 2001
@@ -6,21 +6,34 @@
 #
 
 PORTNAME=	doxygen
-PORTVERSION=	1.2.6
+PORTVERSION=	1.2.9.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	joep@di.nl
 
-USE_QT_VER=	1
+.ifdef HAVE_LATEX
+BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison/ \
+		texconfig:${PORTSDIR}/print/teTeX \
+		ps2pdf:${PORTSDIR}/print/ghostscript6
+.else
+BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison/
+.endif
+
+USE_QT_VER=	2
+QT_NONSTANDARD=	1
 USE_PERL5=	yes
-MAKE_ENV+=	QTDIR="${X11BASE}" PCFLAGS="${CFLAGS}" PCXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+=	QTDIR="${X11BASE}" PCFLAGS="${CFLAGS}" PCXXFLAGS="${CXXFLAGS}" \
+		INCLUDEPATH="${QTCPPFLAGS}" MOC="${MOC}"
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL5} --make ${GMAKE}
-CONFIGURE_ENV+=	QTDIR=${X11BASE}
+CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL5} --make ${GMAKE} \
+		--dot ${PREFIX}/bin/dot --with-doxywizard
 ALL_TARGET=	all docs
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
+		CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+
 .ifdef HAVE_LATEX
 ALL_TARGET+=	ps
 PLIST_SUB+=	HAVE_LATEX=""
@@ -28,20 +41,38 @@
 PLIST_SUB+=	HAVE_LATEX="@comment "
 .endif
 
+post-configure:
+.ifndef HAVE_LATEX
+	@${ECHO} ""
+	@${ECHO} "--------------------------------------------------------------------------"
+	@${ECHO} "HINT: use make clean ; make -DHAVE_LATEX if you have teTeX and ghostscript"
+	@${ECHO} "installed and want the .ps and .dvi documentation built."
+	@${ECHO} "--------------------------------------------------------------------------"
+	@${ECHO} ""
+.endif
+
 pre-configure:
 	@${PERL} -pi -e "s:gcc:${CC}:g ; s:g\+\+:${CXX}:g ; \
 		s:%%CFLAGS%%:${CFLAGS}:g ; \
-		s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
+		s:%%CXXFLAGS%%:${CXXFLAGS}:g ; \
+		s:(TMAKE_MOC.*=).*:\\1 ${MOC}:g ; \
+		s:-lqt$$:-lqt2:g" \
+		${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxytag ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxysearch ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${PREFIX}/bin
 .ifndef NOPORTDOCS
 	${MKDIR} ${PREFIX}/share/doc/doxygen/html
 	${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/doc/doxygen/html
 .ifdef HAVE_LATEX
+	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_logo.eps \
+			${PREFIX}/share/doc/doxygen
 	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.dvi \
+			${PREFIX}/share/doc/doxygen
+	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.pdf \
 			${PREFIX}/share/doc/doxygen
 	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.ps \
 			${PREFIX}/share/doc/doxygen
diff -Nur /usr/ports/devel/doxygen/distinfo /tmp/devel/doxygen/distinfo
--- /usr/ports/devel/doxygen/distinfo	Tue Mar 13 07:38:14 2001
+++ /tmp/devel/doxygen/distinfo	Mon Aug  6 05:15:19 2001
@@ -1 +1 @@
-MD5 (doxygen-1.2.6.src.tar.gz) = 3acf1bdb6477d62d4bc62d19f8876114
+MD5 (doxygen-1.2.9.1.src.tar.gz) = 4ce8af38c1ee29eb07aea9bbc8775a8f
diff -Nur /usr/ports/devel/doxygen/files/patch-aa /tmp/devel/doxygen/files/patch-aa
--- /usr/ports/devel/doxygen/files/patch-aa	Thu Jan  1 01:00:00 1970
+++ /tmp/devel/doxygen/files/patch-aa	Mon Aug  6 15:49:19 2001
@@ -0,0 +1,11 @@
+--- qtools/qtools.pro.in.cxxflags	Mon Aug  6 15:48:12 2001
++++ qtools/qtools.pro.in	Mon Aug  6 15:48:41 2001
+@@ -72,7 +72,7 @@
+ 		  qfileinfo_win32.cpp
+ 
+ INCLUDEPATH = .
+-TMAKE_CXXFLAGS = -DQT_NO_CODECS -DQT_LITE_UNICODE
++TMAKE_CXXFLAGS += -DQT_NO_CODECS -DQT_LITE_UNICODE
+ win32:TMAKE_CXXFLAGS += -DQT_NODLL
+ OBJECTS_DIR = ../objects
+ DESTDIR = ../lib
diff -Nur /usr/ports/devel/doxygen/files/patch-af /tmp/devel/doxygen/files/patch-af
--- /usr/ports/devel/doxygen/files/patch-af	Fri Feb 25 22:32:24 2000
+++ /tmp/devel/doxygen/files/patch-af	Mon Aug 20 11:39:06 2001
@@ -31,7 +31,7 @@
 -TMAKE_INCDIR_QT		= $(QTDIR)/include
 +TMAKE_INCDIR_X11	= $(QTDIR)/include
 +TMAKE_LIBDIR_X11	= $(QTDIR)/lib
-+TMAKE_INCDIR_QT		= $(QTDIR)/include/X11/qt
++TMAKE_INCDIR_QT		= $(QTDIR)/include/qt2
  TMAKE_LIBDIR_QT		= $(QTDIR)/lib
 -TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 -TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
diff -Nur /usr/ports/devel/doxygen/pkg-plist /tmp/devel/doxygen/pkg-plist
--- /usr/ports/devel/doxygen/pkg-plist	Tue Mar 13 07:38:14 2001
+++ /tmp/devel/doxygen/pkg-plist	Mon Aug 20 18:29:11 2001
@@ -1,8 +1,11 @@
 bin/doxygen
 bin/doxytag
 bin/doxysearch
+bin/doxywizard
 %%HAVE_LATEX%%share/doc/doxygen/doxygen_manual.dvi
+%%HAVE_LATEX%%share/doc/doxygen/doxygen_manual.pdf
 %%HAVE_LATEX%%share/doc/doxygen/doxygen_manual.ps
+%%HAVE_LATEX%%share/doc/doxygen/doxygen_logo.eps
 %%PORTDOCS%%share/doc/doxygen/html/autolink.html
 %%PORTDOCS%%share/doc/doxygen/html/commands.html
 %%PORTDOCS%%share/doc/doxygen/html/config.html
	
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010820174817.EC5E22D37D>