- Update to 1.5.8 Added file(s): - files/patch-addon-doxywizard-Makefile.in Generated with FreeBSD Port Tools 0.77
Responsible Changed From-To: freebsd-ports-bugs->amdmi3 I'll take it.
State Changed From-To: open->feedback Does not build, also doesn't seem to respect ${CXX} everywhere. http://people.freebsd.org/~amdmi3/doxygen-1.5.8.log
* Naram Qashat (cyberbotx@cyberbotx.com) wrote: > The main issue seems to be a lack of a dependancy to QT4's qmake. I > don't know what needs to be done to fix that. I also don't know how to This is done by adding corresponding QT_COMPONENTS. This also significantly cuts down dependency list, as doxygen doesn't need the whole Qt. > fix the inconsistency with CXX. It's set by certain Makefiles it seems, > even though the port's Makefile has a configure environment with CXX > being set. I've added QT_COMPONENTS, also added OPTIONS, moved some Makefile blocks around for more canonical order and removed some unused variables. What do you think? --- doxygen.patch begins here --- Index: Makefile =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/doxygen/Makefile,v retrieving revision 1.67 diff -u -r1.67 Makefile --- Makefile 9 Nov 2008 16:10:51 -0000 1.67 +++ Makefile 29 Dec 2008 14:51:19 -0000 @@ -6,7 +6,7 @@ # PORTNAME= doxygen -PORTVERSION= 1.5.7.1 +PORTVERSION= 1.5.8 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ http://ftp.stack.nl/pub/users/dimitri/ @@ -21,13 +21,29 @@ USE_BISON= build USE_ICONV= yes ALL_TARGET= all +USE_PERL5= yes +HAS_CONFIGURE= yes +USE_GMAKE= yes +QT_NONSTANDARD= yes # non-standard configure arguments +CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \ + --install "${INSTALL}" +CONFIGURE_ENV= CXX="${CXX}" EXTRACT_AFTER_ARGS=|${TAR} -xpf - \ --exclude '*/libmd5' \ --exclude '*/libpng' \ --exclude '*/tmake' -CONFIGURE_ENV+= CXX="${CXX}" +PLIST= ${WRKDIR}/plist +TMPDOCDEST= ${WRKDIR}/tmpdocdest + +PLIST_FILES= bin/doxygen \ + bin/doxytag + +OPTIONS= DOXYWIZARD "Enable doxywizard" on \ + LATEX "Enable LaTeX support" on + +.include <bsd.port.options.mk> .if !defined(NOPORTDOCS) ALL_TARGET+= docs @@ -44,12 +60,8 @@ .endif # !defined(NOPORTDOCS) .if !defined(WITHOUT_DOXYWIZARD) -USE_QT_VER= 3 -QT_INC= ${LOCALBASE}/include -QTNAME= qt-mt -QT_OPENGL= -THREADLIBS= ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} +USE_QT_VER= 4 +QT_COMPONENTS= corelib gui xml qmake_build moc_build rcc_build # Need this in env for build QTDIR?= ${QT_PREFIX} @@ -57,27 +69,16 @@ CONFIGURE_ARGS+=--with-doxywizard .endif # !WITHOUT_DOXYWIZARD -USE_PERL5= yes -HAS_CONFIGURE= yes -USE_GMAKE= yes -QT_NONSTANDARD= yes # non-standard configure arguments -CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \ - --install "${INSTALL}" - .if ${MACHINE_ARCH:L} == alpha 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 +.include <bsd.port.pre.mk> + pre-configure: @cd ${WRKSRC};for pro in src/*.pro.in addon/doxywizard/doxywizard.pro.in;do \ ${ECHO} "unix:LIBS += -liconv" >> $$pro; done @@ -132,4 +133,4 @@ | ${TAR} -C ${PREFIX}/share/doc --unlink -xf - .endif # ! NOPORTDOCS -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/doxygen/distinfo,v retrieving revision 1.27 diff -u -r1.27 distinfo --- distinfo 9 Nov 2008 16:10:51 -0000 1.27 +++ distinfo 28 Dec 2008 22:55:16 -0000 @@ -1,3 +1,3 @@ -MD5 (doxygen-1.5.7.1.src.tar.gz) = bc35dfd52bdae0247b862e67e0cbe7d7 -SHA256 (doxygen-1.5.7.1.src.tar.gz) = 7ce9cf96731121aa22365d2aef3dde841a3c4622d4d70282398438275ad26d29 -SIZE (doxygen-1.5.7.1.src.tar.gz) = 4096168 +MD5 (doxygen-1.5.8.src.tar.gz) = 7438b7ff875d522f02860eea39261953 +SHA256 (doxygen-1.5.8.src.tar.gz) = 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8 +SIZE (doxygen-1.5.8.src.tar.gz) = 4125837 Index: files/patch-addon-doxywizard-Makefile.in =================================================================== RCS file: files/patch-addon-doxywizard-Makefile.in diff -N files/patch-addon-doxywizard-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-addon-doxywizard-Makefile.in 28 Dec 2008 22:55:16 -0000 @@ -0,0 +1,22 @@ +--- addon/doxywizard/Makefile.in.orig 2008-12-06 08:14:58.000000000 -0500 ++++ addon/doxywizard/Makefile.in 2008-12-28 15:32:07.000000000 -0500 +@@ -10,16 +10,16 @@ + # See the GNU General Public License for more details. + # + +-QMAKE = qmake ++QMAKE = qmake-qt4 + + all: Makefile.doxywizard + $(MAKE) -f Makefile.doxywizard + + Makefile.doxywizard: doxywizard.pro +- $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard ++ $(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard + + qmake: +- $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard ++ $(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard + + clean: Makefile.doxywizard + $(MAKE) -f Makefile.doxywizard clean Index: files/patch-configure =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/doxygen/files/patch-configure,v retrieving revision 1.3 diff -u -r1.3 patch-configure --- files/patch-configure 26 Feb 2007 07:24:17 -0000 1.3 +++ files/patch-configure 28 Dec 2008 22:55:16 -0000 @@ -1,6 +1,33 @@ ---- configure.orig Sat Oct 28 18:20:11 2006 -+++ configure Sun Feb 25 15:23:52 2007 -@@ -525,7 +525,7 @@ +--- configure.orig 2008-12-26 14:22:39.000000000 -0500 ++++ configure 2008-12-28 16:27:43.000000000 -0500 +@@ -269,7 +269,7 @@ + echo " QTDIR environment variable not set!" + echo -n " Checking for Qt..." + for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do +- if test -x "$d/bin/qmake"; then ++ if test -x "$d/bin/qmake-qt4"; then + QTDIR=$d + fi + done +@@ -280,7 +280,7 @@ + if test -z "$QTDIR"; then + echo "QTDIR not set and Qt not found at standard locations!" + echo +- echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists." ++ echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists." + echo "check the Qt installation instructions!" + exit 2 + fi +@@ -565,7 +565,7 @@ + fi + if test "$f_wizard" = YES; then + cat >> .tmakeconfig <<EOF +-TMAKE_MOC = $QTDIR/bin/moc ++TMAKE_MOC = $QTDIR/bin/moc-qt4 + EOF + fi + +@@ -575,7 +575,7 @@ EOF fi @@ -9,7 +36,7 @@ for i in $f_inmakefiles ; do SRC=$i -@@ -541,10 +541,8 @@ +@@ -591,10 +591,8 @@ if test $i = Makefile.in; then echo "" >> $DST echo "all: src/version.cpp " >> $DST @@ -22,7 +49,7 @@ if test $f_wizard = YES; then echo " \$(MAKE) -C addon/doxywizard" >> $DST fi -@@ -562,7 +560,7 @@ +@@ -616,7 +614,7 @@ echo " Created $DST from $SRC..." done --- doxygen.patch ends here --- -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
Dmitry Marakasov wrote: > * Naram Qashat (cyberbotx@cyberbotx.com) wrote: > >> The main issue seems to be a lack of a dependancy to QT4's qmake. I >> don't know what needs to be done to fix that. I also don't know how to > > This is done by adding corresponding QT_COMPONENTS. This also > significantly cuts down dependency list, as doxygen doesn't need the > whole Qt. > >> fix the inconsistency with CXX. It's set by certain Makefiles it seems, >> even though the port's Makefile has a configure environment with CXX >> being set. > > I've added QT_COMPONENTS, also added OPTIONS, moved some Makefile > blocks around for more canonical order and removed some unused > variables. What do you think? > > --- doxygen.patch begins here --- > Index: Makefile > =================================================================== > RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/doxygen/Makefile,v > retrieving revision 1.67 > diff -u -r1.67 Makefile > --- Makefile 9 Nov 2008 16:10:51 -0000 1.67 > +++ Makefile 29 Dec 2008 14:51:19 -0000 > @@ -6,7 +6,7 @@ > # > > PORTNAME= doxygen > -PORTVERSION= 1.5.7.1 > +PORTVERSION= 1.5.8 > CATEGORIES= devel > MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ > http://ftp.stack.nl/pub/users/dimitri/ > @@ -21,13 +21,29 @@ > USE_BISON= build > USE_ICONV= yes > ALL_TARGET= all > +USE_PERL5= yes > +HAS_CONFIGURE= yes > +USE_GMAKE= yes > +QT_NONSTANDARD= yes # non-standard configure arguments > +CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \ > + --install "${INSTALL}" > +CONFIGURE_ENV= CXX="${CXX}" > > EXTRACT_AFTER_ARGS=|${TAR} -xpf - \ > --exclude '*/libmd5' \ > --exclude '*/libpng' \ > --exclude '*/tmake' > > -CONFIGURE_ENV+= CXX="${CXX}" > +PLIST= ${WRKDIR}/plist > +TMPDOCDEST= ${WRKDIR}/tmpdocdest > + > +PLIST_FILES= bin/doxygen \ > + bin/doxytag > + > +OPTIONS= DOXYWIZARD "Enable doxywizard" on \ > + LATEX "Enable LaTeX support" on > + > +.include <bsd.port.options.mk> > > .if !defined(NOPORTDOCS) > ALL_TARGET+= docs > @@ -44,12 +60,8 @@ > .endif # !defined(NOPORTDOCS) > > .if !defined(WITHOUT_DOXYWIZARD) > -USE_QT_VER= 3 > -QT_INC= ${LOCALBASE}/include > -QTNAME= qt-mt > -QT_OPENGL= > -THREADLIBS= ${PTHREAD_LIBS} > -CFLAGS+= ${PTHREAD_CFLAGS} > +USE_QT_VER= 4 > +QT_COMPONENTS= corelib gui xml qmake_build moc_build rcc_build > > # Need this in env for build > QTDIR?= ${QT_PREFIX} > @@ -57,27 +69,16 @@ > CONFIGURE_ARGS+=--with-doxywizard > .endif # !WITHOUT_DOXYWIZARD > > -USE_PERL5= yes > -HAS_CONFIGURE= yes > -USE_GMAKE= yes > -QT_NONSTANDARD= yes # non-standard configure arguments > -CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \ > - --install "${INSTALL}" > - > .if ${MACHINE_ARCH:L} == alpha > 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 > > +.include <bsd.port.pre.mk> > + > pre-configure: > @cd ${WRKSRC};for pro in src/*.pro.in addon/doxywizard/doxywizard.pro.in;do \ > ${ECHO} "unix:LIBS += -liconv" >> $$pro; done > @@ -132,4 +133,4 @@ > | ${TAR} -C ${PREFIX}/share/doc --unlink -xf - > .endif # ! NOPORTDOCS > > -.include <bsd.port.mk> > +.include <bsd.port.post.mk> > Index: distinfo > =================================================================== > RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/doxygen/distinfo,v > retrieving revision 1.27 > diff -u -r1.27 distinfo > --- distinfo 9 Nov 2008 16:10:51 -0000 1.27 > +++ distinfo 28 Dec 2008 22:55:16 -0000 > @@ -1,3 +1,3 @@ > -MD5 (doxygen-1.5.7.1.src.tar.gz) = bc35dfd52bdae0247b862e67e0cbe7d7 > -SHA256 (doxygen-1.5.7.1.src.tar.gz) = 7ce9cf96731121aa22365d2aef3dde841a3c4622d4d70282398438275ad26d29 > -SIZE (doxygen-1.5.7.1.src.tar.gz) = 4096168 > +MD5 (doxygen-1.5.8.src.tar.gz) = 7438b7ff875d522f02860eea39261953 > +SHA256 (doxygen-1.5.8.src.tar.gz) = 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8 > +SIZE (doxygen-1.5.8.src.tar.gz) = 4125837 > Index: files/patch-addon-doxywizard-Makefile.in > =================================================================== > RCS file: files/patch-addon-doxywizard-Makefile.in > diff -N files/patch-addon-doxywizard-Makefile.in > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ files/patch-addon-doxywizard-Makefile.in 28 Dec 2008 22:55:16 -0000 > @@ -0,0 +1,22 @@ > +--- addon/doxywizard/Makefile.in.orig 2008-12-06 08:14:58.000000000 -0500 > ++++ addon/doxywizard/Makefile.in 2008-12-28 15:32:07.000000000 -0500 > +@@ -10,16 +10,16 @@ > + # See the GNU General Public License for more details. > + # > + > +-QMAKE = qmake > ++QMAKE = qmake-qt4 > + > + all: Makefile.doxywizard > + $(MAKE) -f Makefile.doxywizard > + > + Makefile.doxywizard: doxywizard.pro > +- $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard > ++ $(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard > + > + qmake: > +- $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard > ++ $(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard > + > + clean: Makefile.doxywizard > + $(MAKE) -f Makefile.doxywizard clean > Index: files/patch-configure > =================================================================== > RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/doxygen/files/patch-configure,v > retrieving revision 1.3 > diff -u -r1.3 patch-configure > --- files/patch-configure 26 Feb 2007 07:24:17 -0000 1.3 > +++ files/patch-configure 28 Dec 2008 22:55:16 -0000 > @@ -1,6 +1,33 @@ > ---- configure.orig Sat Oct 28 18:20:11 2006 > -+++ configure Sun Feb 25 15:23:52 2007 > -@@ -525,7 +525,7 @@ > +--- configure.orig 2008-12-26 14:22:39.000000000 -0500 > ++++ configure 2008-12-28 16:27:43.000000000 -0500 > +@@ -269,7 +269,7 @@ > + echo " QTDIR environment variable not set!" > + echo -n " Checking for Qt..." > + for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do > +- if test -x "$d/bin/qmake"; then > ++ if test -x "$d/bin/qmake-qt4"; then > + QTDIR=$d > + fi > + done > +@@ -280,7 +280,7 @@ > + if test -z "$QTDIR"; then > + echo "QTDIR not set and Qt not found at standard locations!" > + echo > +- echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists." > ++ echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists." > + echo "check the Qt installation instructions!" > + exit 2 > + fi > +@@ -565,7 +565,7 @@ > + fi > + if test "$f_wizard" = YES; then > + cat >> .tmakeconfig <<EOF > +-TMAKE_MOC = $QTDIR/bin/moc > ++TMAKE_MOC = $QTDIR/bin/moc-qt4 > + EOF > + fi > + > +@@ -575,7 +575,7 @@ > EOF > fi > > @@ -9,7 +36,7 @@ > > for i in $f_inmakefiles ; do > SRC=$i > -@@ -541,10 +541,8 @@ > +@@ -591,10 +591,8 @@ > if test $i = Makefile.in; then > echo "" >> $DST > echo "all: src/version.cpp " >> $DST > @@ -22,7 +49,7 @@ > if test $f_wizard = YES; then > echo " \$(MAKE) -C addon/doxywizard" >> $DST > fi > -@@ -562,7 +560,7 @@ > +@@ -616,7 +614,7 @@ > echo " Created $DST from $SRC..." > done > > --- doxygen.patch ends here --- > That all looks fine to me. I'll admit, I haven't done too many ports with QT4 in them yet (other than the subcommander2 port), but I will keep that in mind for future porting. Thanks, Naram Qashat
State Changed From-To: feedback->open Issues resolved
State Changed From-To: open->closed Committed, with minor changes. Thanks!
amdmi3 2008-12-30 02:26:32 UTC FreeBSD ports repository Modified files: devel/doxygen Makefile distinfo devel/doxygen/files patch-configure Added files: devel/doxygen/files patch-addon-doxywizard-Makefile.in Log: - Update to 1.5.8 - Add OPTIONS - Trim down Qt depends - Clean Makefile a bit PR: 130003 Submitted by: Naram Qashat <cyberbotx at cyberbotx dot com> (maintainer) Some tweaks by: myself Tweaks approved by: Naram Qashat <cyberbotx at cyberbotx dot com> (maintainer) Revision Changes Path 1.68 +23 -22 ports/devel/doxygen/Makefile 1.28 +3 -3 ports/devel/doxygen/distinfo 1.1 +22 -0 ports/devel/doxygen/files/patch-addon-doxywizard-Makefile.in (new) 1.4 +32 -5 ports/devel/doxygen/files/patch-configure _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"