From owner-svn-ports-head@FreeBSD.ORG Wed Feb 5 15:29:05 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 27192133; Wed, 5 Feb 2014 15:29:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 11AD31583; Wed, 5 Feb 2014 15:29:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15FT4HJ098392; Wed, 5 Feb 2014 15:29:04 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15FT4pv098389; Wed, 5 Feb 2014 15:29:04 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201402051529.s15FT4pv098389@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 5 Feb 2014 15:29:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342717 - in head/devel/libqxt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 05 Feb 2014 15:29:05 -0000 Author: gahr Date: Wed Feb 5 15:29:04 2014 New Revision: 342717 URL: http://svnweb.freebsd.org/changeset/ports/342717 QAT: https://qat.redports.org/buildarchive/r342717/ Log: - Several enhancements Submitted by: makc Deleted: head/devel/libqxt/files/ Modified: head/devel/libqxt/Makefile head/devel/libqxt/pkg-plist Modified: head/devel/libqxt/Makefile ============================================================================== --- head/devel/libqxt/Makefile Wed Feb 5 15:10:39 2014 (r342716) +++ head/devel/libqxt/Makefile Wed Feb 5 15:29:04 2014 (r342717) @@ -10,7 +10,6 @@ DISTNAME= v${PORTVERSION} MAINTAINER= gahr@FreeBSD.org COMMENT= Extension library for Qt -LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/avahi-libdns BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash USE_BDB= 44+ @@ -21,14 +20,15 @@ USE_LDCONFIG= ${PREFIX}/lib/qxt QT_NONSTANDARD= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -prefix ${STAGEDIR}${PREFIX} \ - -libdir ${STAGEDIR}${PREFIX}/lib/qxt \ +CONFIGURE_ARGS= -prefix ${PREFIX} \ + -libdir ${PREFIX}/lib/qxt \ -qmake-bin ${QMAKE} \ - -featuredir ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/features \ + -featuredir ${PREFIX}/${QT_MKSPECDIR_REL}/features \ -I ${BDB_INCLUDE_DIR} \ -I ${LOCALBASE}/include/avahi-compat-libdns_sd \ -L ${BDB_LIB_DIR} \ -verbose +DESTDIRNAME= INSTALL_ROOT COMMIT= dadc327c2a6a WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-${COMMIT} @@ -37,26 +37,34 @@ PLIST_SUB+= SHVER_1=${PORTVERSION} \ SHVER_2=${PORTVERSION:R} \ SHVER_3=${PORTVERSION:R:R} +OPTIONS_DEFAULT= AVAHI +OPTIONS_SINGLE= ZEROCONF +OPTIONS_SINGLE_ZEROCONF= AVAHI MDNSRESPONDER +AVAHI_LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/avahi-libdns +MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/mDNSResponder + +STRIP_FILES= lib/qxt/lib*.so.${PORTVERSION} \ + ${QT_PLUGINDIR_REL}/designer/libQxtDesignerPlugins.so + 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 \ + ${WRKSRC}/configure + ${REINPLACE_CMD} -e \ + 's,$$$$\[QT_INSTALL_PLUGINS\],${PREFIX}/${QT_PLUGINDIR_REL},' \ ${WRKSRC}/src/designer/designer.pro ${REINPLACE_CMD} -e '\ s|ldb|l${BDB_LIB_NAME} -L${BDB_LIB_DIR}|g; \ /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} && \ ${FIND} unit -type f -perm -0755 -exec {} \; +post-install: + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} + .include Modified: head/devel/libqxt/pkg-plist ============================================================================== --- head/devel/libqxt/pkg-plist Wed Feb 5 15:10:39 2014 (r342716) +++ head/devel/libqxt/pkg-plist Wed Feb 5 15:29:04 2014 (r342717) @@ -348,8 +348,8 @@ lib/qxt/libQxtZeroconf.so lib/qxt/libQxtZeroconf.so.%%SHVER_1%% lib/qxt/libQxtZeroconf.so.%%SHVER_2%% lib/qxt/libQxtZeroconf.so.%%SHVER_3%% -share/qt4/mkspecs/features/qxt.prf -share/qt4/mkspecs/features/qxtvars.prf +%%QT_MKSPECDIR%%/features/qxt.prf +%%QT_MKSPECDIR%%/features/qxtvars.prf @dirrm include/QxtBerkeley @dirrm include/QxtCore @dirrm include/QxtGui @@ -359,8 +359,8 @@ share/qt4/mkspecs/features/qxtvars.prf @dirrm include/QxtWeb @dirrm lib/qxt @dirrmtry %%QT_PLUGINDIR%%/designer -@dirrmtry share/qt4/mkspecs/features -@dirrmtry share/qt4/mkspecs +@dirrmtry %%QT_MKSPECDIR%%/features +@dirrmtry %%QT_MKSPECDIR%% @dirrmtry share/qt4 @dirrmtry %%QT_PLUGINDIR%% @dirrmtry %%QT_LIBDIR%%