[119704] users/devans/dports/net/pidgin
devans at macports.org
devans at macports.org
Sat May 3 17:30:26 PDT 2014
Revision: 119704
https://trac.macports.org/changeset/119704
Author: devans at macports.org
Date: 2014-05-03 17:30:26 -0700 (Sat, 03 May 2014)
Log Message:
-----------
devans/dports: pidgin, merge +x11 variant changes from trunk.
Modified Paths:
--------------
users/devans/dports/net/pidgin/Portfile
Property Changed:
----------------
users/devans/dports/net/pidgin/
Property changes on: users/devans/dports/net/pidgin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/net/pidgin:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/net/pidgin:118533-119386
+ /branches/mld-qt-481/dports/net/pidgin:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/net/pidgin:118533-119701
Modified: users/devans/dports/net/pidgin/Portfile
===================================================================
--- users/devans/dports/net/pidgin/Portfile 2014-05-04 00:19:01 UTC (rev 119703)
+++ users/devans/dports/net/pidgin/Portfile 2014-05-04 00:30:26 UTC (rev 119704)
@@ -67,18 +67,19 @@
--with-nspr-libs=${prefix}/lib/nspr \
--with-nss-includes=${prefix}/include/nss \
--with-nss-libs=${prefix}/lib/nss \
- --disable-dependency-tracking
+ --disable-dependency-tracking \
+ --without-x
configure.args-append ac_cv_path_perlpath=${prefix}/bin/perl5.16
# --disable-dependency-tracking was added because a +universal perl will result in
# PERL_CFLAGS containing multiple -arch arguments... this is the easiest workaround
+
configure.ldflags-append -bind_at_load
configure.cppflags-append -no-cpp-precomp
variant finch_only requires finch description {Build without pidgin} {
- configure.args-append --disable-gtkui \
- --without-x
+ configure.args-append --disable-gtkui
}
variant finch description {Build with finch} {
@@ -94,18 +95,34 @@
}
}
-post-activate {
- system "dbus-uuidgen --ensure"
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+variant x11 conflicts no_x11 quartz {
+ depends_lib-append port:xorg-libX11 \
+ port:xorg-libXext \
+ port:xorg-libXScrnSaver \
+ port:xorg-libice \
+ port:xorg-libsm
+
+ configure.args-delete --without-x \
+ --disable-screensaver \
+ --disable-sm
+
+ configure.args-append --with-x \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --enable-screensaver \
+ --enable-sm
}
-variant no_x11 {
- configure.args-append --without-x
+# Legacy no_x11 variant to be removed after May 2015.
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+
+if {[variant_isset no_x11]} {
+ default_variants -x11
+} else {
+ default_variants +x11
}
-variant quartz requires no_x11 {
+variant quartz conflicts x11 {
configure.args-append --disable-gestures
depends_build-append port:intltool
@@ -120,6 +137,13 @@
configure.args-delete --disable-gtkspell
}
+post-activate {
+ system "dbus-uuidgen --ensure"
+ system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+ system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
+ gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+}
+
livecheck.type regex
livecheck.url http://sourceforge.net/projects/pidgin/files/Pidgin/
livecheck.regex "\/Pidgin\/(\\d+(?:\\.\\d+)*)\/"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140503/9088ad1f/attachment.html>
More information about the macports-changes
mailing list