Revision: 139801 https://trac.macports.org/changeset/139801 Author: devans@macports.org Date: 2015-08-27 17:40:03 -0700 (Thu, 27 Aug 2015) Log Message: ----------- pidgin: replace +finch +finch_only with finch subport, update dependencies, configuration, remove conflicts, increment revision to rebuild all (#48707). Modified Paths: -------------- trunk/dports/net/pidgin/Portfile Added Paths: ----------- trunk/dports/net/pidgin/files/patch-finch_libgnt_Makefile.am.diff trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c.diff Removed Paths: ------------- trunk/dports/net/pidgin/files/patch-finch_libgnt_Makefile.in.diff trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c Modified: trunk/dports/net/pidgin/Portfile =================================================================== --- trunk/dports/net/pidgin/Portfile 2015-08-27 23:22:17 UTC (rev 139800) +++ trunk/dports/net/pidgin/Portfile 2015-08-28 00:40:03 UTC (rev 139801) @@ -5,7 +5,7 @@ name pidgin version 2.10.11 -revision 3 +revision 4 categories net platforms darwin license GPL-2+ @@ -50,31 +50,11 @@ port:gnutls \ port:perl${pbranch} -if {${subport} ne "libpurple"} { - depends_lib-append \ - port:libpurple \ - port:audiofile \ - port:gtk2 \ - port:libao - - post-destroot { - foreach file [glob -nocomplain -directory ${destroot}${prefix}/bin purple-*] { - delete $file - } - foreach file [glob -nocomplain -directory ${destroot}${prefix}/lib pkgconfig/purple.pc libpurple* purple-2] { - delete $file - } - delete ${destroot}${prefix}/include/libpurple \ - ${destroot}${prefix}/share/aclocal \ - ${destroot}${prefix}/share/man/man3/Purple.3pm \ - ${destroot}${prefix}/share/purple \ - ${destroot}${prefix}/share/sounds/purple \ - } -} - patchfiles patch-configure.ac.diff \ patch-libpurple-internal.h.diff \ - patch-pidgin-gtkdocklet-gtk.c.diff + patch-pidgin-gtkdocklet-gtk.c.diff \ + patch-finch_libgnt_Makefile.am.diff \ + patch-finch_libgnt_gntwm.c.diff # reconfigure using upstream autogen.sh for intltool 0.51 compatibility @@ -125,16 +105,24 @@ } } -if {${subport} eq $name} { +subport finch { + depends_lib-append port:libpurple \ + port:ncurses - variant finch_only requires finch description {Build without pidgin} { - configure.args-append --disable-gtkui - } + configure.args-delete --disable-consoleui + configure.args-append --disable-gtkui \ + --disable-pixmaps-install \ + --disable-nls \ + --disable-gestures \ + --enable-consoleui \ + --with-ncurses-headers=${prefix}/include +} - variant finch description {Build with finch} { - configure.args-delete --disable-consoleui - patchfiles-append patch-finch_libgnt_Makefile.in.diff patch-finch_libgnt_gntwm.c - } +if {${subport} eq $name} { + depends_lib-append port:libpurple \ + port:audiofile \ + port:gtk2 \ + port:libao variant x11 conflicts no_x11 quartz { depends_lib-append port:xorg-libX11 \ @@ -180,6 +168,22 @@ } } +if {${subport} ne "libpurple"} { + post-destroot { + foreach file [glob -nocomplain -directory ${destroot}${prefix}/bin purple-*] { + delete $file + } + foreach file [glob -nocomplain -directory ${destroot}${prefix}/lib pkgconfig/purple.pc libpurple* purple-2] { + delete $file + } + delete ${destroot}${prefix}/include/libpurple \ + ${destroot}${prefix}/share/aclocal \ + ${destroot}${prefix}/share/man/man3/Purple.3pm \ + ${destroot}${prefix}/share/purple \ + ${destroot}${prefix}/share/sounds/purple \ + } +} + post-destroot { fs-traverse file ${destroot}${prefix}/lib/perl5 { if {[file tail ${file}] == "perllocal.pod"} { Added: trunk/dports/net/pidgin/files/patch-finch_libgnt_Makefile.am.diff =================================================================== --- trunk/dports/net/pidgin/files/patch-finch_libgnt_Makefile.am.diff (rev 0) +++ trunk/dports/net/pidgin/files/patch-finch_libgnt_Makefile.am.diff 2015-08-28 00:40:03 UTC (rev 139801) @@ -0,0 +1,10 @@ +--- finch/libgnt/Makefile.am.orig 2014-11-23 08:41:25.000000000 -0800 ++++ finch/libgnt/Makefile.am 2015-08-27 13:32:37.000000000 -0700 +@@ -93,6 +93,7 @@ + + AM_CPPFLAGS = \ + $(GLIB_CFLAGS) \ ++ -D_XOPEN_SOURCE_EXTENDED \ + $(GNT_CFLAGS) \ + $(DEBUG_CFLAGS) \ + $(LIBXML_CFLAGS) \ Deleted: trunk/dports/net/pidgin/files/patch-finch_libgnt_Makefile.in.diff =================================================================== --- trunk/dports/net/pidgin/files/patch-finch_libgnt_Makefile.in.diff 2015-08-27 23:22:17 UTC (rev 139800) +++ trunk/dports/net/pidgin/files/patch-finch_libgnt_Makefile.in.diff 2015-08-28 00:40:03 UTC (rev 139801) @@ -1,11 +0,0 @@ ---- finch/libgnt/Makefile.in.orig 2012-07-06 10:27:40.000000000 -0500 -+++ finch/libgnt/Makefile.in 2012-07-25 14:34:58.000000000 -0500 -@@ -217,7 +217,7 @@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --GLIB_CFLAGS = @GLIB_CFLAGS@ -+GLIB_CFLAGS = @GLIB_CFLAGS@ -D_XOPEN_SOURCE_EXTENDED - GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ - GLIB_LIBS = @GLIB_LIBS@ - GMOFILES = @GMOFILES@ Deleted: trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c =================================================================== --- trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c 2015-08-27 23:22:17 UTC (rev 139800) +++ trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c 2015-08-28 00:40:03 UTC (rev 139801) @@ -1,11 +0,0 @@ ---- finch/libgnt/gntwm.c.orig 2012-06-30 18:54:47.000000000 -0500 -+++ finch/libgnt/gntwm.c 2012-07-25 14:34:58.000000000 -0500 -@@ -22,6 +22,8 @@ - - #include "config.h" - -+#define NO_WIDECHAR -+ - #ifdef USE_PYTHON - #include <Python.h> - #endif Copied: trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c.diff (from rev 139800, trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c) =================================================================== --- trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c.diff (rev 0) +++ trunk/dports/net/pidgin/files/patch-finch_libgnt_gntwm.c.diff 2015-08-28 00:40:03 UTC (rev 139801) @@ -0,0 +1,11 @@ +--- finch/libgnt/gntwm.c.orig 2012-06-30 18:54:47.000000000 -0500 ++++ finch/libgnt/gntwm.c 2012-07-25 14:34:58.000000000 -0500 +@@ -22,6 +22,8 @@ + + #include "config.h" + ++#define NO_WIDECHAR ++ + #ifdef USE_PYTHON + #include <Python.h> + #endif
participants (1)
-
devans@macports.org