[68115] trunk/dports/net

ryandesign at macports.org ryandesign at macports.org
Thu May 27 00:36:16 PDT 2010


Revision: 68115
          http://trac.macports.org/changeset/68115
Author:   ryandesign at macports.org
Date:     2010-05-27 00:36:10 -0700 (Thu, 27 May 2010)
Log Message:
-----------
pidgin and finch:

 * update to 2.7.0 (#25045, #25046)
 * disable universal variant (#23485)
 * enable perl support (#22212)
 * fix livecheck
 * mark as conflicting with one another
 * share distfiles (use the same dist_subdir)

Modified Paths:
--------------
    trunk/dports/net/finch/Portfile
    trunk/dports/net/pidgin/Portfile

Added Paths:
-----------
    trunk/dports/net/finch/files/gst.diff
    trunk/dports/net/pidgin/files/gst.diff

Modified: trunk/dports/net/finch/Portfile
===================================================================
--- trunk/dports/net/finch/Portfile	2010-05-27 06:47:56 UTC (rev 68114)
+++ trunk/dports/net/finch/Portfile	2010-05-27 07:36:10 UTC (rev 68115)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 
 name                finch
-version             2.6.5
-revision            1
+conflicts           pidgin
+version             2.7.0
 categories          net
 platforms           darwin
 maintainers         nomaintainer
@@ -20,10 +20,11 @@
 
 homepage            http://www.pidgin.im/
 master_sites        sourceforge:pidgin
-checksums           md5     90847ed22ec830db5d9768748812b661 \
-                    sha1    e50edbe0fe588d7222d54154942550ef1788b89d \
-                    rmd160  ca1867476c3cae0be5f4d56cbb58391758da00a9
+checksums           md5     63a36f91d29f5ac5a402ffd2d7dbbb72 \
+                    sha1    7170aaae5e6f4039870eb5e0c5837d55285b758f \
+                    rmd160  45e4b5a9acb9c4080ce6b33cedbf9b962883ca25
 
+dist_subdir         pidgin
 distname            pidgin-${version}
 use_bzip2           yes
 
@@ -37,8 +38,11 @@
                     port:intltool \
                     port:libidn
 
-patchfiles          patch-finch_libgnt_Makefile.in.diff patch-finch_libgnt_gntwm.c
+patchfiles          patch-finch_libgnt_Makefile.in.diff patch-finch_libgnt_gntwm.c gst.diff
 
+# nss is not universal
+universal_variant   no
+
 configure.args      --disable-avahi \
                     --disable-gtkui \
                     --disable-dbus \
@@ -56,9 +60,18 @@
                     --with-nspr-libs=${prefix}/lib/nspr \
                     --with-nss-includes=${prefix}/include/nss \
                     --with-nss-libs=${prefix}/lib/nss \
-                    --disable-perl \
                     --without-x
 configure.ldflags-append    -bind_at_load
 configure.cppflags-append   -no-cpp-precomp
 
-livecheck.distname  Pidgin
+post-destroot {
+    fs-traverse file ${destroot}${prefix}/lib/perl5 {
+        if {[file tail ${file}] == "perllocal.pod"} {
+            delete ${file}
+        }
+    }
+}
+
+livecheck.type      regex
+livecheck.url       http://sourceforge.net/projects/pidgin/files/
+livecheck.regex     {/pidgin-([0-9.]+)\.tar}

Added: trunk/dports/net/finch/files/gst.diff
===================================================================
--- trunk/dports/net/finch/files/gst.diff	                        (rev 0)
+++ trunk/dports/net/finch/files/gst.diff	2010-05-27 07:36:10 UTC (rev 68115)
@@ -0,0 +1,19 @@
+Index: libpurple/media/backend-fs2.h
+===================================================================
+--- libpurple/media/backend-fs2.h
++++ libpurple/media/backend-fs2.h
+@@ -55,6 +55,7 @@
+  */
+ GType purple_media_backend_fs2_get_type(void);
+
++#ifdef USE_GSTREAMER
+ /*
+  * Temporary function in order to be able to test while
+  * integrating with PurpleMedia
+@@ -71,6 +72,7 @@
+  void purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
+  const gchar *sess_id, const gchar *who, double level);
+ /* end tmp */
++#endif /* USE_GSTREAMER */
+
+ G_END_DECLS

Modified: trunk/dports/net/pidgin/Portfile
===================================================================
--- trunk/dports/net/pidgin/Portfile	2010-05-27 06:47:56 UTC (rev 68114)
+++ trunk/dports/net/pidgin/Portfile	2010-05-27 07:36:10 UTC (rev 68115)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 
 name                pidgin
-version             2.6.6
-revision            1
+conflicts           finch
+version             2.7.0
 categories          net
 platforms           darwin
 maintainers         otherware.org:nefar
@@ -20,9 +20,9 @@
 
 homepage            http://www.pidgin.im/
 master_sites        sourceforge
-checksums           md5     b37ab6c52db8355e8c70c044c2ba17c1 \
-                    sha1    d74459152f9598139a3fd8aee385e3366722155c \
-                    rmd160  6e2ca8fb05b2575c758537d9adc154678b36cd55
+checksums           md5     63a36f91d29f5ac5a402ffd2d7dbbb72 \
+                    sha1    7170aaae5e6f4039870eb5e0c5837d55285b758f \
+                    rmd160  45e4b5a9acb9c4080ce6b33cedbf9b962883ca25
 use_bzip2           yes
 
 depends_build       port:libtool
@@ -39,6 +39,11 @@
                     port:p5-xml-parser \
                     port:intltool
 
+patchfiles          gst.diff
+
+# nss is not universal
+universal_variant   no
+
 configure.args      --disable-avahi \
                     --disable-consoleui \
                     --disable-gstreamer \
@@ -55,11 +60,18 @@
                     --with-nspr-includes=${prefix}/include/nspr \
                     --with-nspr-libs=${prefix}/lib/nspr \
                     --with-nss-includes=${prefix}/include/nss \
-                    --with-nss-libs=${prefix}/lib/nss \
-                    --disable-perl
+                    --with-nss-libs=${prefix}/lib/nss
 configure.ldflags-append    -bind_at_load
 configure.cppflags-append   -no-cpp-precomp
 
+post-destroot {
+    fs-traverse file ${destroot}${prefix}/lib/perl5 {
+        if {[file tail ${file}] == "perllocal.pod"} {
+            delete ${file}
+        }
+    }
+}
+
 post-activate {
     system "dbus-uuidgen --ensure"
 }
@@ -88,4 +100,6 @@
     configure.args-delete   --disable-gtkspell
 }
 
-livecheck.distname  Pidgin
+livecheck.type      regex
+livecheck.url       http://sourceforge.net/projects/pidgin/files/
+livecheck.regex     {/pidgin-([0-9.]+)\.tar}

Added: trunk/dports/net/pidgin/files/gst.diff
===================================================================
--- trunk/dports/net/pidgin/files/gst.diff	                        (rev 0)
+++ trunk/dports/net/pidgin/files/gst.diff	2010-05-27 07:36:10 UTC (rev 68115)
@@ -0,0 +1,19 @@
+Index: libpurple/media/backend-fs2.h
+===================================================================
+--- libpurple/media/backend-fs2.h
++++ libpurple/media/backend-fs2.h
+@@ -55,6 +55,7 @@
+  */
+ GType purple_media_backend_fs2_get_type(void);
+
++#ifdef USE_GSTREAMER
+ /*
+  * Temporary function in order to be able to test while
+  * integrating with PurpleMedia
+@@ -71,6 +72,7 @@
+  void purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
+  const gchar *sess_id, const gchar *who, double level);
+ /* end tmp */
++#endif /* USE_GSTREAMER */
+
+ G_END_DECLS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100527/4bf83530/attachment.html>


More information about the macports-changes mailing list