From owner-svn-ports-head@FreeBSD.ORG Tue Feb 4 20:11:21 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1CD9D6A3; Tue, 4 Feb 2014 20:11:21 +0000 (UTC) Received: from mail.issp.ac.ru (mail.issp.ac.ru [77.236.34.3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 75AB715E4; Tue, 4 Feb 2014 20:11:20 +0000 (UTC) Received: from [62.63.84.136] [62.63.84.136:47854] (HELO/EHLO mercury.ph.man.ac.uk, authenticated with LOGIN) by mail.issp.ac.ru with ESMTP/inet id s14KBHDX004783 (using TLSv1/SSLv3, with cipher DHE-RSA-AES256-SHA (256 bits), verified NO) Wed, 5 Feb 2014 00:11:17 +0400 (MSK) From: Max Brazhnikov To: Pietro Cerutti Subject: Re: svn commit: r342543 - in head/devel/libqxt: . files Date: Tue, 04 Feb 2014 20:11:17 +0000 Message-ID: <1607567.F0A7tkxbY2@mercury.ph.man.ac.uk> User-Agent: KMail/4.10.5 (FreeBSD/9.2-STABLE; KDE/4.10.5; amd64; ; ) In-Reply-To: <201402041452.s14EqQm7008451@svn.freebsd.org> References: <201402041452.s14EqQm7008451@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Feb 2014 20:11:21 -0000 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@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 > -@dirrmtry lib/qt4/plugins/designer > +@dirrmtry %%QT_PLUGINDIR%%/designer > @dirrmtry share/qt4/mkspecs/features > @dirrmtry share/qt4/mkspecs > @dirrmtry share/qt4 > +@dirrmtry %%QT_PLUGINDIR%% > +@dirrmtry %%QT_LIBDIR%%