svn commit: r342543 - in head/devel/libqxt: . files
Max Brazhnikov
makc at freebsd.org
Tue Feb 4 20:11:21 UTC 2014
Hi Pietro,
On Tue, 04 Feb 2014 14:52:26 +0000Tue Feb 4 14:52:26 2014 Pietro Cerutti wrote:
> Author: gahr
> Date: Tue Feb 4 14:52:26 2014
> New Revision: 342543
> URL: http://svnweb.freebsd.org/changeset/ports/342543
> QAT: https://qat.redports.org/buildarchive/r342543/
>
> Log:
> - STAGE-clean
> - Fix LIB_DEPENDS format
>
> Modified:
> head/devel/libqxt/Makefile
> head/devel/libqxt/files/patch-src-designer_designer.pro
> head/devel/libqxt/pkg-plist
>
> Modified: head/devel/libqxt/Makefile
> ==============================================================================
> --- head/devel/libqxt/Makefile Tue Feb 4 14:42:21 2014 (r342542)
> +++ head/devel/libqxt/Makefile Tue Feb 4 14:52:26 2014 (r342543)
> @@ -10,7 +10,7 @@ DISTNAME= v${PORTVERSION}
> MAINTAINER= gahr at FreeBSD.org
> COMMENT= Extension library for Qt
>
> -LIB_DEPENDS= dns_sd:${PORTSDIR}/net/avahi-libdns
> +LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/avahi-libdns
> BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
>
> USE_BDB= 44+
> @@ -21,10 +21,10 @@ USE_LDCONFIG= ${PREFIX}/lib/qxt
>
> QT_NONSTANDARD= yes
> HAS_CONFIGURE= yes
> -CONFIGURE_ARGS= -prefix ${PREFIX} \
> - -libdir ${PREFIX}/lib/qxt \
> +CONFIGURE_ARGS= -prefix ${STAGEDIR}${PREFIX} \
In qmake world the STAGEDIR is called INSTALL_ROOT. Perhaps you could avoid
this and related hacks, if you'd set DESTDIRNAME=INSTALL_ROOT.
> + -libdir ${STAGEDIR}${PREFIX}/lib/qxt \
> -qmake-bin ${QMAKE} \
> - -featuredir ${PREFIX}/share/qt4/mkspecs/features \
> + -featuredir ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/features \
In principle you could use ${PREFIX}/${QT_MKSPECDIR_REL}/features here
and %%QT_MKSPECDIR%% in plist. We unlikely to change paths for Qt4,
but they are different for Qt5.
> -I ${BDB_INCLUDE_DIR} \
> -I ${LOCALBASE}/include/avahi-compat-libdns_sd \
> -L ${BDB_LIB_DIR} \
> @@ -37,10 +37,10 @@ PLIST_SUB+= SHVER_1=${PORTVERSION} \
> SHVER_2=${PORTVERSION:R} \
> SHVER_3=${PORTVERSION:R:R}
>
> -NO_STAGE= yes
> post-patch:
> ${REINPLACE_CMD} -e '\
> s|%%PREFIX%%|${PREFIX}|g; \
> + s|%%STAGEDIR%%|${STAGEDIR}|g; \
> s|/bin/bash|${LOCALBASE}/bin/bash|g; \
> /^QXT_MODULES/s|docs||g' \
> ${WRKSRC}/configure \
> @@ -50,6 +50,10 @@ post-patch:
> /INCLUDEPATH/s|\.|${BDB_INCLUDE_DIR}|g' \
> ${WRKSRC}/config.tests/db/db.pro
>
> +post-configure:
> + ${REINPLACE_CMD} -e 's|${STAGEDIR}||g' \
> + ${WRKSRC}/features/qxtvars.prf
> +
> regression-test:
> cd ${WRKSRC}/tests && \
> ${QMAKE} tests.pro && ${MAKE} && \
>
> Modified: head/devel/libqxt/files/patch-src-designer_designer.pro
> ==============================================================================
> --- head/devel/libqxt/files/patch-src-designer_designer.pro Tue Feb 4 14:42:21 2014 (r342542)
> +++ head/devel/libqxt/files/patch-src-designer_designer.pro Tue Feb 4 14:52:26 2014 (r342543)
> @@ -5,5 +5,5 @@
>
> CONFIG += designer plugin
> -target.path = $$[QT_INSTALL_PLUGINS]/designer
> -+target.path = %%PREFIX%%/lib/qt4/plugins/designer
> ++target.path = %%STAGEDIR%%%%PREFIX%%/lib/qt4/plugins/designer
This is inconsistent with %%QT_PLUGINDIR%% which you're using in plist.
You should either use plain paths in patch and plist, or, preferably, remove
the patch and keep the substitution in plist.
> INSTALLS = target
>
> Modified: head/devel/libqxt/pkg-plist
> ==============================================================================
> --- head/devel/libqxt/pkg-plist Tue Feb 4 14:42:21 2014 (r342542)
> +++ head/devel/libqxt/pkg-plist Tue Feb 4 14:52:26 2014 (r342543)
> @@ -319,7 +319,7 @@ include/QxtZeroconf/qxtmdns_avahi.h
> include/QxtZeroconf/qxtmdns_avahi_p.h
> include/QxtZeroconf/qxtservicebrowser.h
> include/QxtZeroconf/qxtservicebrowser_p.h
> -lib/qt4/plugins/designer/libQxtDesignerPlugins.so
> +%%QT_PLUGINDIR%%/designer/libQxtDesignerPlugins.so
> lib/qxt/libQxtBerkeley.so
> lib/qxt/libQxtBerkeley.so.%%SHVER_1%%
> lib/qxt/libQxtBerkeley.so.%%SHVER_2%%
> @@ -358,7 +358,9 @@ share/qt4/mkspecs/features/qxtvars.prf
> @dirrm include/QxtZeroconf
> @dirrm include/QxtWeb
> @dirrm lib/qxt
> - at dirrmtry lib/qt4/plugins/designer
> + at dirrmtry %%QT_PLUGINDIR%%/designer
> @dirrmtry share/qt4/mkspecs/features
> @dirrmtry share/qt4/mkspecs
> @dirrmtry share/qt4
> + at dirrmtry %%QT_PLUGINDIR%%
> + at dirrmtry %%QT_LIBDIR%%
More information about the svn-ports-all
mailing list