Date: Thu, 20 Feb 2014 13:23:50 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345224 - in head: devel/qca security/qca-cyrus-sasl security/qca-gnupg security/qca-ossl Message-ID: <201402201323.s1KDNood064931@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Thu Feb 20 13:23:50 2014 New Revision: 345224 URL: http://svnweb.freebsd.org/changeset/ports/345224 QAT: https://qat.redports.org/buildarchive/r345224/ Log: devel/qca: - Add stage support - Convert WITH_DEBUG to option - Remove MAINTAINER_MODE - Remove now needless stripping in post-install security/qca-*: - Convert LIB_DEPENDS to new style - Add stage support - Convert WITH_DEBUG to option - Remove now needless stripping in post-install Modified: head/devel/qca/Makefile head/devel/qca/pkg-plist head/security/qca-cyrus-sasl/Makefile head/security/qca-gnupg/Makefile head/security/qca-ossl/Makefile Modified: head/devel/qca/Makefile ============================================================================== --- head/devel/qca/Makefile Thu Feb 20 13:03:00 2014 (r345223) +++ head/devel/qca/Makefile Thu Feb 20 13:23:50 2014 (r345224) @@ -9,43 +9,31 @@ MASTER_SITES= http://delta.affinix.com/d DISTNAME= qca-${PORTVERSION} MAINTAINER= kde@FreeBSD.org -COMMENT= Cross-platform crypto API for QT +COMMENT= Cross-platform crypto API for Qt USE_BZIP2= yes USE_QT4= corelib qmake_build moc_build HAS_CONFIGURE= yes QT_NONSTANDARD= yes -CONFIGURE_ARGS+=--prefix=${PREFIX} +CONFIGURE_ARGS+=--prefix=${PREFIX} \ + --disable-tests CONFIGURE_ENV+= QMAKESPEC=${QMAKESPEC} USE_OPENSSL= yes USE_LDCONFIG= yes - -MAN1= qcatool2.1 +DESTDIRNAME= INSTALL_ROOT .if defined(PACKAGE_BUILDING) CONFIGURE_ENV+= QC_VERBOSE=Y .endif -.if defined(MAINTAINER_MODE) -USE_QT4+= qtestlib -.else -CONFIGURE_ARGS+=--disable-tests -.endif +OPTIONS_DEFINE= DEBUG +OPTIONS_SUB= yes -.if !defined(WITH_DEBUG) -CONFIGURE_ARGS+=--release --no-separate-debug-info -PLIST_SUB+= DEBUG="@comment " -.else -CONFIGURE_ARGS+=--debug -PLIST_SUB+= DEBUG="" -.endif +DEBUG_CONFIGURE_ON= --debug +DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info -NO_STAGE= yes pre-configure: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/configure ${MKDIR} ${WRKSRC}/libdata/pkgconfig -post-install: - ${STRIP_CMD} ${PREFIX}/bin/qcatool2 ${PREFIX}/lib/libqca.so.${PORTVERSION} - .include <bsd.port.mk> Modified: head/devel/qca/pkg-plist ============================================================================== --- head/devel/qca/pkg-plist Thu Feb 20 13:03:00 2014 (r345223) +++ head/devel/qca/pkg-plist Thu Feb 20 13:23:50 2014 (r345224) @@ -22,6 +22,7 @@ lib/libqca.so.2.0 lib/libqca.so.2.0.3 %%DEBUG%%lib/libqca.so.2.0.3.debug libdata/pkgconfig/qca2.pc +man/man1/qcatool2.1.gz share/qca/certs/README share/qca/certs/rootcerts.pem share/qt4/mkspecs/features/crypto.prf Modified: head/security/qca-cyrus-sasl/Makefile ============================================================================== --- head/security/qca-cyrus-sasl/Makefile Thu Feb 20 13:03:00 2014 (r345223) +++ head/security/qca-cyrus-sasl/Makefile Thu Feb 20 13:23:50 2014 (r345224) @@ -9,8 +9,8 @@ MASTER_SITES= http://delta.affinix.com/d MAINTAINER= kde@FreeBSD.org COMMENT= QCA Cyrus SASL plugin -LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca \ - sasl2:${PORTSDIR}/security/cyrus-sasl2 +LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca \ + libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 USE_BZIP2= yes USE_QT4= corelib qmake_build moc_build @@ -19,17 +19,12 @@ QT_NONSTANDARD= yes CONFIGURE_ARGS+=--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL} \ --with-sasl-inc=${LOCALBASE}/include \ --with-sasl-lib=${LOCALBASE}/lib +DESTDIRNAME= INSTALL_ROOT -.if !defined(WITH_DEBUG) -CONFIGURE_ARGS+=--release --no-separate-debug-info -PLIST_SUB+= DEBUG="@comment " -.else -CONFIGURE_ARGS+=--debug -PLIST_SUB+= DEBUG="" -.endif +OPTIONS_DEFINE= DEBUG +OPTIONS_SUB= yes -NO_STAGE= yes -post-install: - ${STRIP_CMD} ${PREFIX}/${QT_PLUGINDIR_REL}/crypto/libqca-cyrus-sasl.so +DEBUG_CONFIGURE_ON= --debug +DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info .include <bsd.port.mk> Modified: head/security/qca-gnupg/Makefile ============================================================================== --- head/security/qca-gnupg/Makefile Thu Feb 20 13:03:00 2014 (r345223) +++ head/security/qca-gnupg/Makefile Thu Feb 20 13:23:50 2014 (r345224) @@ -9,24 +9,19 @@ MASTER_SITES= http://delta.affinix.com/d MAINTAINER= kde@FreeBSD.org COMMENT= QCA GnuPG plugin -LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca +LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca USE_BZIP2= yes USE_QT4= corelib qmake_build moc_build HAS_CONFIGURE= yes QT_NONSTANDARD= yes CONFIGURE_ARGS+=--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL} +DESTDIRNAME= INSTALL_ROOT -.if !defined(WITH_DEBUG) -CONFIGURE_ARGS+=--release --no-separate-debug-info -PLIST_SUB+= DEBUG="@comment " -.else -CONFIGURE_ARGS+=--debug -PLIST_SUB+= DEBUG="" -.endif +OPTIONS_DEFINE= DEBUG +OPTIONS_SUB= yes -NO_STAGE= yes -post-install: - ${STRIP_CMD} ${PREFIX}/${QT_PLUGINDIR_REL}/crypto/libqca-gnupg.so +DEBUG_CONFIGURE_ON= --debug +DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info .include <bsd.port.mk> Modified: head/security/qca-ossl/Makefile ============================================================================== --- head/security/qca-ossl/Makefile Thu Feb 20 13:03:00 2014 (r345223) +++ head/security/qca-ossl/Makefile Thu Feb 20 13:23:50 2014 (r345224) @@ -10,28 +10,22 @@ MASTER_SITES= http://delta.affinix.com/d MAINTAINER= kde@FreeBSD.org COMMENT= QCA OpenSLL plugin -LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca +LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca USE_BZIP2= yes USE_QT4= corelib qmake_build moc_build HAS_CONFIGURE= yes QT_NONSTANDARD= yes USE_OPENSSL= yes - CONFIGURE_ARGS= --plugins-path=${PREFIX}/${QT_PLUGINDIR_REL} \ --with-openssl-inc=${OPENSSLINC} \ --with-openssl-lib=${OPENSSLLIB} +DESTDIRNAME= INSTALL_ROOT -.if !defined(WITH_DEBUG) -CONFIGURE_ARGS+=--release --no-separate-debug-info -PLIST_SUB+= DEBUG="@comment " -.else -CONFIGURE_ARGS+=--debug -PLIST_SUB+= DEBUG="" -.endif +OPTIONS_DEFINE= DEBUG +OPTIONS_SUB= yes -NO_STAGE= yes -post-install: - ${STRIP_CMD} ${PREFIX}/${QT_PLUGINDIR_REL}/crypto/libqca-ossl.so +DEBUG_CONFIGURE_ON= --debug +DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402201323.s1KDNood064931>