On 11/13/16 22:54, Jeremie Courreges-Anglas wrote:
> Jeremie Courreges-Anglas <j...@wxcvbn.org> writes:
>
>> Stuart Henderson <s...@spacehopper.org> writes:
>
> [...]
>
>>> 3. split the gui off to a different port. keep the same pkgname stem,
>>> so it just needs an @pkgpath in PLIST for updates to work.
>>
>> I'd prefer this option.
>
> In the meantime, let's unbreak the current situation by going back to
> Qt4. Rafael, does the -Dforce_qt4:Bool=ON part actually works? I don't
> have Qt5 anymore on this machine...
>
> ok?
>
>
> Index: Makefile
> ===================================================================
> RCS file: /d/cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile 12 Nov 2016 20:59:18 -0000 1.37
> +++ Makefile 13 Nov 2016 22:48:32 -0000
> @@ -3,8 +3,6 @@
> # Memory hog, stuck for days on the same file (configoptions.cpp) during
> build.
> # XXX check with different optimizer level? see doc/install.doc
> NOT_FOR_ARCHS= m88k sh
> -# Qt5 doesn't build yet on powerpc
> -NOT_FOR_ARCHS-gui= m88k sh powerpc
> BROKEN-alpha= .got subsegment exceeds 64K
>
> COMMENT-main= source code documentation generator tool
> @@ -15,6 +13,9 @@ DISTNAME= doxygen-${VERSION}.src
> PKGNAME-main= doxygen-${VERSION}
> FULLPKGNAME-gui=doxygen-gui-${VERSION}
>
> +REVISION-main= 0
> +REVISION-gui= 0
> +
> CATEGORIES= devel textproc
>
> HOMEPAGE= http://www.doxygen.org/
> @@ -30,10 +31,8 @@ MASTER_SITES= http://ftp.stack.nl/pub/us
> MULTI_PACKAGES= -main -gui
> PSEUDO_FLAVORS= no_gui bootstrap
>
> -COMMON_WANTLIB= c m pthread estdc++
> -WANTLIB-main= ${COMMON_WANTLIB} iconv z xapian
> -WANTLIB-gui= Qt5Core Qt5Gui Qt5Widgets Qt5Xml \
> - ${COMMON_WANTLIB}
> +WANTLIB-main += c iconv m pthread stdc++ xapian z
> +WANTLIB-gui += QtCore QtGui QtXml c m stdc++
>
> LIB_DEPENDS-main= converters/libiconv \
> databases/xapian-core
> @@ -50,7 +49,8 @@ MODPY_RUNDEP= No
> .include <bsd.port.arch.mk>
> .if ${BUILD_PACKAGES:M-gui}
> CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
> -MODULES+= x11/qt5
> +CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
> +MODULES+= x11/qt4
> .endif
> .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
> # ld(1) fails
>
>
Thanks, I will try out, seen it gone in to CVS.
