Ticket #26032: psi.diff

psi/files/patch-configure.diff

@@ -1 @@
-diff --git a/configure b/configure
-index a5bdd58..d56acea 100755
---- a/configure
-+++ b/configure
-@@ -48,6 +48,9 @@ Dependency options:
-   --with-aspell-inc=[path]     Path to Aspell include files
-   --with-aspell-lib=[path]     Path to Aspell library files
-   --disable-enchant            Disable use of enchant
-+  --disable-plugins            Disable use of Plugins
-+  --enable-plugins             Enable Psi Plugin support
-+
- 
- EOT
- }
-@@ -274,6 +277,16 @@ while [ $# -gt 0 ]; do
-                        shift
-                        ;;
- 
-+        --disable-plugins)
-+            QC_DISABLE_plugins="Y"
-+            shift
-+            ;;
-+
-+        --enable-plugins)
-+            QC_ENABLE_PLUGINS="Y"
-+            shift
-+            ;;
-+
-                --verbose)
-                        QC_VERBOSE="Y"
-                        shift
-@@ -318,6 +331,8 @@ echo QC_DISABLE_aspell=$QC_DISABLE_aspell
- echo QC_WITH_ASPELL_INC=$QC_WITH_ASPELL_INC
- echo QC_WITH_ASPELL_LIB=$QC_WITH_ASPELL_LIB
- echo QC_DISABLE_enchant=$QC_DISABLE_enchant
-+echo QC_DISABLE_plugins=$QC_DISABLE_plugins
-+echo QC_ENABLE_PLUGINS=$QC_ENABLE_PLUGINS
- echo
- fi
- 
-@@ -1614,6 +1629,48 @@ public:
- #endif
-        }
- };
-+#line 1 "plugins.qcm"
-+/*
-+-----BEGIN QCMOD-----
-+name: Plugins
-+arg: enable-plugins,Enable Psi Plugin support
-+
-+-----END QCMOD-----
-+*/
-+
-+//----------------------------------------------------------------------------
-+// qc_plugins
-+//----------------------------------------------------------------------------
-+class qc_plugins : public ConfObj
-+{
-+public:
-+   qc_plugins(Conf *c) : ConfObj(c) {}
-+   QString name() const { return "Plugins"; }
-+   QString shortname() const { return "Plugins"; }
-+   bool exec()
-+   {
-+       QString s;
-+      
-+       // Check if Jingle was enabled explicitly
-+       s = conf->getenv("QC_ENABLE_PLUGINS");
-+       if(s.isEmpty())
-+           return false;
-+       
-+       conf->addDefine("PSI_PLUGINS");
-+       
-+       // Finish
-+       conf->addExtra("CONFIG += psi_plugins");                              
-+
-+       qWarning("");
-+       qWarning("");
-+       qWarning("        !!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!");
-+       qWarning("        PLUGIN SUPPORT IS STILL UNFINISHED !!!");
-+       qWarning("        THE PLUGIN INTERFACE /WILL/ CHANGE !!!");
-+       qWarning("        USE AT YOUR OWN RISK !!!");
-+            
-+       return true;
-+   }
-+};
- 
- EOT
- cat >$1/modules_new.cpp <<EOT
-@@ -1665,6 +1722,10 @@ cat >$1/modules_new.cpp <<EOT
-     o = new qc_conf(conf);
-     o->required = true;
-     o->disabled = false;
-+       o = new qc_plugins(conf);
-+       o->required = false;
-+       o->disabled = false;
-+
- 
- EOT
- cat >$1/conf4.h <<EOT
-@@ -2710,6 +2771,9 @@ export QC_WITH_ASPELL_INC
- export QC_WITH_ASPELL_LIB
- export QC_DISABLE_enchant
- export QC_VERBOSE
-+export QC_DISABLE_plugins
-+export QC_ENABLE_PLUGINS
-+
- rm -rf .qconftemp
- (
-        mkdir .qconftemp

psi/files/patch-configure_externalqca.diff

@@ +1 @@
+--- a/configure 2010-08-04 21:13:48.000000000 -0400
++++ b/configure 2010-08-04 21:14:44.000000000 -0400
+@@ -652,38 +652,7 @@
+ // based on crypto.prf. any changes made to that file need to be tracked here.
+ static QString internal_crypto_prf(const QString &incdir, const QString &libdir)
+ {
+-       QString out = QString(
+-"QCA_INCDIR = %1\n"
+-"QCA_LIBDIR = %2\n"
+-"\n"
+-"CONFIG *= qt\n"
+-"\n"
+-"LINKAGE =\n"
+-"\n"
+-"# on mac, if qca was built as a framework, link against it\n"
+-"mac: {\n"
+-"      framework_dir = \$\$QCA_LIBDIR\n"
+-"      exists(\$\$framework_dir/qca.framework) {\n"
+-"              #QMAKE_FRAMEWORKPATH *= \$\$framework_dir\n"
+-"              LIBS += -F\$\$framework_dir\n"
+-"              INCLUDEPATH += \$\$framework_dir/qca.framework/Headers\n"
+-"              LINKAGE = -framework qca\n"
+-"      }\n"
+-"}\n"
+-"\n"
+-"# else, link normally\n"
+-"isEmpty(LINKAGE) {\n"
+-"      INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\n"
+-"      LIBS += -L\$\$QCA_LIBDIR\n"
+-"      LINKAGE = -lqca\n"
+-"      CONFIG(debug, debug|release) {\n"
+-"              windows:LINKAGE = -lqcad\n"
+-"              mac:LINKAGE = -lqca_debug\n"
+-"      }\n"
+-"}\n"
+-"\n"
+-"LIBS += \$\$LINKAGE\n"
+-       ).arg(incdir, libdir);
++       QString out = QString("CONFIG *= crypto\n");
+        return out;
+ }
+ 

psi/Portfile

@@ -5 +5 @@
 
 name                psi
 version             0.14
-revision            1
+revision            2
 categories          net chat
 maintainers         rowue
 description         jabber-based instant messaging client
@@ -26 +26 @@
 depends_lib         lib:libz:zlib \
                     port:qt4-mac
 
+patch.pre_args      -p1
+ 
+configure.args      --release --verbose --disable-xss \
+                    --qtdir=${prefix}/libexec/qt4-mac \
+                    --bindir=${applications_dir}
 
-configure.args      --qtdir=${prefix}/libexec/qt4-mac
+variant externalqca description {Use external qca} {
 
-destroot {
-    xinstall -m 755 -d ${destroot}${applications_dir}
-    file copy ${worksrcpath}/src/psi.app ${destroot}${applications_dir}
-    system "strip \
-        ${destroot}${applications_dir}/psi.app/Contents/MacOS/psi"
-}
+patchfiles-append       patch-configure_externalqca.diff
 
-variant externalqca description {Use external qca} {
-
 configure.args-append   --disable-bundled-qca
 depends_lib-append      port:qca-ossl \
                         port:qca-gnupg \
                         port:qca
 }
 
+if {![variant_isset externalqca]} {
+    patchfiles-append patch_third-parth_qca_qca-ossl_qca-ossl.cpp.diff
+}
 
+destroot.destdir        INSTALL_ROOT="${destroot}"
+
 # variant ipv6 description {Add ipv6 support} { 
 # 
 # patchfiles-append      patch-src-src.pro.diff 
@@ -53 +56 @@
 
 variant plugins description {Build with experimental Plugin Support} {
 
-patch.pre_args          -p1
- 
-patchfiles-append       patch-configure.diff \
+patchfiles-append       patch-configure_plugins.diff \
                         patch-src-applicationinfo.cpp.diff \
                         patch-src-pluginhost.cpp.diff \
                         patch-src-pluginhost.h.diff \