[72575] trunk/dports/devel
michaelld at macports.org
michaelld at macports.org
Thu Oct 21 05:18:56 PDT 2010
Revision: 72575
http://trac.macports.org/changeset/72575
Author: michaelld at macports.org
Date: 2010-10-21 05:18:53 -0700 (Thu, 21 Oct 2010)
Log Message:
-----------
Changes to use qt4 portgroup.
Redo gnupg options as variants.
Modified Paths:
--------------
trunk/dports/devel/qca/Portfile
trunk/dports/devel/qca-cyrus-sasl/Portfile
trunk/dports/devel/qca-gnupg/Portfile
trunk/dports/devel/qca-ossl/Portfile
Modified: trunk/dports/devel/qca/Portfile
===================================================================
--- trunk/dports/devel/qca/Portfile 2010-10-21 12:17:06 UTC (rev 72574)
+++ trunk/dports/devel/qca/Portfile 2010-10-21 12:18:53 UTC (rev 72575)
@@ -2,9 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
+
name qca
version 2.0.2
-revision 5
+revision 6
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel crypto security
maintainers michaelld openmaintainer
@@ -25,9 +27,6 @@
sha1 5a414c3296cd37d1ec34182be0d089c5073f55a8 \
rmd160 18b0f497709f9700227644977946735d2ec3c623
-depends_build port:pkgconfig
-depends_lib port:qt4-mac
-
# (1) correct pkgconfig file for framework install, if selected.
# (2) allow for 'debug' and 'framework' options at the same time.
# This change is needed to allow for +debug [+framework] --
@@ -36,54 +35,34 @@
# variant is requested.
patchfiles patch-configure.diff
-set qt_dir ${prefix}/libexec/qt4-mac
-set qca_dir ${prefix}/libexec/qt4-mac
+# set QCA to install into the QT4 directory
+configure.pre_args --prefix=${qt_dir}
-# set QT4 plugins to install into the QT4 directory
-configure.pre_args --prefix=${qca_dir}
-
-# defaults: release only, framework, specific build_arch.
-# use variants to change these
+# defaults: release only, no-framework, specific build_arch.
+# use variants to change everything except framework
configure.args --verbose \
--qtdir=${qt_dir} \
--release \
- --framework
+ --no-framework
-destroot.destdir INSTALL_ROOT="${destroot}"
-
post-destroot {
# alias to destroot QCA top-level directory
- set destroot_qca ${destroot}${qca_dir}
+ set destroot_qt ${destroot}${qt_dir}
- # tweak header install for framework only
- if {![variant_isset no_framework]} {
- # when installed as a framework, link headers from
- # the framework into ${destroot_qca}/include
- xinstall -d 755 ${destroot_qca}/include
- ln -s ${qca_dir}/lib/qca.framework/Headers \
- ${destroot_qca}/include/QtCrypto
- }
-
# install docs
- xinstall -d 755 ${destroot_qca}/share/doc/${name}
+ xinstall -d 755 ${destroot_qt}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} COPYING README TODO \
- ${destroot_qca}/share/doc/${name}
+ ${destroot_qt}/share/doc/${name}
# install cmake file (taken from port 'kdelibs4'). To use this
# file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
# the initial 'configure' stage (which uses CMake), to the full
# path of where the CMake files are installed.
- xinstall -d 755 ${destroot_qca}/share/cmake/modules
+ xinstall -d 755 ${destroot}${qt_cmake_module_dir}
xinstall -m 644 -W ${filespath} FindQCA2.cmake \
- ${destroot_qca}/share/cmake/modules
+ ${destroot}${qt_cmake_module_dir}
}
-variant no_framework description \
-{Build as a library, not framework} {
- configure.args-delete --framework
- configure.args-append --no-framework
-}
-
variant debug description \
{Build both release and debug library / framework} {
configure.args-delete --release
@@ -93,9 +72,9 @@
variant examples description \
{Include examples in install} {
post-destroot {
- xinstall -d 755 ${destroot}${qca_dir}/share/examples/${name}
+ xinstall -d 755 ${destroot}${qt_dir}/share/examples/${name}
eval file copy [glob ${worksrcpath}/examples/*] \
- ${destroot}${qca_dir}/share/examples/${name}
+ ${destroot}${qt_dir}/share/examples/${name}
}
}
Modified: trunk/dports/devel/qca-cyrus-sasl/Portfile
===================================================================
--- trunk/dports/devel/qca-cyrus-sasl/Portfile 2010-10-21 12:17:06 UTC (rev 72574)
+++ trunk/dports/devel/qca-cyrus-sasl/Portfile 2010-10-21 12:18:53 UTC (rev 72575)
@@ -2,10 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
name qca-cyrus-sasl
version 2.0.0-beta3
-revision 1
+revision 2
categories devel crypto security
maintainers michaelld openmaintainer
description Qt Cryptographic Architecture - cyrus-sasl plugin
@@ -34,16 +35,12 @@
# forcing patching of multiple files.
patchfiles patch-configure.diff
-set qt_dir ${prefix}/libexec/qt4-mac
-
# qca-gnupg does not use --prefix
configure.pre_args
configure.args --verbose \
--qtdir=${qt_dir} \
--with-sasl-inc=${prefix}/include
-destroot.destdir INSTALL_ROOT="${destroot}"
-
post-destroot {
# fix library path of installed library/ies
foreach fixfile [exec find ${destroot}${qt_dir} -name "*.dylib" | \
Modified: trunk/dports/devel/qca-gnupg/Portfile
===================================================================
--- trunk/dports/devel/qca-gnupg/Portfile 2010-10-21 12:17:06 UTC (rev 72574)
+++ trunk/dports/devel/qca-gnupg/Portfile 2010-10-21 12:18:53 UTC (rev 72575)
@@ -2,8 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
+
name qca-gnupg
version 2.0.0-beta3
+revision 1
categories devel crypto security
maintainers michaelld openmaintainer
description Qt Cryptographic Architecture - gnupg plugin
@@ -24,23 +27,18 @@
sha1 77e3874b9ed427e281b23b9bf41ecc95e74f7053 \
rmd160 2531d81179e0b78cc3689c7891b4c6c60d56a422
-depends_lib port:qca
-depends_run port:gnupg
+depends_lib-append port:qca
# The patch to "configure" uses QCA's 'crypto.prf' file to correctly
# include its libraries (no matter how QCA is installed), instead of
# forcing patching of multiple files.
patchfiles patch-configure.diff
-set qt_dir ${prefix}/libexec/qt4-mac
-
# qca-gnupg does not use --prefix
configure.pre_args
configure.args --verbose \
--qtdir=${qt_dir}
-destroot.destdir INSTALL_ROOT="${destroot}"
-
post-destroot {
# fix library path of installed library/ies
foreach fixfile [exec find ${destroot}${qt_dir} -name "*.dylib" | \
@@ -60,7 +58,24 @@
configure.universal_args-append --universal
}
+variant gnupg1 description {GnuPG version 1 runtime use} {
+ depends_run-append port:gnupg
+}
+
variant gnupg2 description {GnuPG version 2 runtime use} {
- depends_run-delete port:gnupg
depends_run-append port:gnupg2
}
+
+# check for setting the default variant
+if {![variant_isset gnupg1] &&
+ ![variant_isset gnupg2]} {
+ default_variants +gnupg2
+}
+
+# make sure -gnupg2 isn't set alone
+if {![variant_isset gnupg1] &&
+ ![variant_isset gnupg2]} {
+ return -code error \
+"\n\nThe variant -gnupg2 will not work alone.
+Please select one of +gnupg1 or +gnupg2 as a variant.\n"
+}
Modified: trunk/dports/devel/qca-ossl/Portfile
===================================================================
--- trunk/dports/devel/qca-ossl/Portfile 2010-10-21 12:17:06 UTC (rev 72574)
+++ trunk/dports/devel/qca-ossl/Portfile 2010-10-21 12:18:53 UTC (rev 72575)
@@ -2,9 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
+
name qca-ossl
version 2.0.0-beta3
-revision 2
+revision 3
categories devel crypto security
maintainers michaelld openmaintainer
description Qt Cryptographic Architecture - openssl plugin
@@ -25,8 +27,7 @@
sha1 dd925e8732ff76f24f9f90f4094abaf2f0ac27bf \
rmd160 c979c3c3427eb45e8866e28746f83966e8bcf3c2
-depends_build port:pkgconfig
-depends_lib port:qca \
+depends_lib-append port:qca \
port:openssl
# Without the patch to "qca-ossl.cpp", if MD2 isn't part of OpenSSL
@@ -39,15 +40,11 @@
patchfiles patch-qca-ossl.cpp.diff \
patch-configure.diff
-set qt_dir ${prefix}/libexec/qt4-mac
-
# qca-ossl does not use --prefix
configure.pre_args
configure.args --verbose \
--qtdir=${qt_dir}
-destroot.destdir INSTALL_ROOT="${destroot}"
-
post-destroot {
# fix library path of installed library/ies
foreach fixfile [exec find ${destroot}${qt_dir} -name "*.dylib" | \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101021/0374565b/attachment-0001.html>
More information about the macports-changes
mailing list