[147605] trunk/dports/news/pan2

[devans at macports.org]

Revision: 147605
          https://trac.macports.org/changeset/147605
Author:   devans at macports.org
Date:     2016-04-09 12:00:14 -0700 (Sat, 09 Apr 2016)
Log Message:
-----------
pan2: update to version 0.140, dependencies, update autogen.sh from upstream git master, add +gtk3 variant, post-activate registration of desktop file, now builds with either libc++ or libstdc++ (#41402).

Modified Paths:
--------------
    trunk/dports/news/pan2/Portfile
    trunk/dports/news/pan2/files/autogen.sh

Removed Paths:
-------------
    trunk/dports/news/pan2/files/patch-pan-gui-gui.cc.diff

Modified: trunk/dports/news/pan2/Portfile
===================================================================
--- trunk/dports/news/pan2/Portfile	2016-04-09 18:09:39 UTC (rev 147604)
+++ trunk/dports/news/pan2/Portfile	2016-04-09 19:00:14 UTC (rev 147605)
@@ -4,13 +4,13 @@
 PortSystem          1.0
 
 name                pan2
-version             0.139
+version             0.140
 categories          news
 license             GPL-2
 platforms           darwin
 maintainers         nomaintainer
 
-description         News reader for gtk2
+description         News reader for gtk2 (or gtk3)
 
 long_description    Pan2 is a newsreader for GTK2/GNOME2 that is based on \
                     the Agent newsreader for Windows OSes.
@@ -21,8 +21,8 @@
 distname            pan-${version}
 use_bzip2           yes
 
-checksums           rmd160  e0e2963b2d11b362201639ca755ad9ae43581c2f \
-                    sha256  bf5f320f997f582d7ac823e3e854393307161a92e7014d2135e6e2674d144bb9
+checksums           rmd160  92422d16c37a566b42520999980b3eac62b9287c \
+                    sha256  ba1c65ee75b9eca1f15f6249ea762492309731446edc8b09085b63ad34351c71
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -31,13 +31,15 @@
                     port:automake \
                     port:libtool
 
-depends_lib         port:pcre \
+depends_lib         port:desktop-file-utils \
+                    port:pcre \
                     port:gmime \
+                    port:gnutls \
                     port:gtk2 \
                     port:gtkspell2 \
                     port:libiconv
 
-patchfiles          patch-pan-gui-gui.cc.diff
+depends_run         port:gnome-themes-standard
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
@@ -45,17 +47,24 @@
     xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
 }
 
-# Build failure with libc++: https://bugzilla.gnome.org/show_bug.cgi?id=712539
-# Forcing the use of libstdc++ is acceptable because pan2 does not provide any
-# C++ libraries and does not link with any C++ libraries.
-configure.cxx_stdlib libstdc++
-
 configure.cmd       ./autogen.sh
 
-configure.args      --disable-silent-rules
+configure.args      --with-gnutls \
+                    --disable-silent-rules
 
-configure.ldflags-append    -liconv
+configure.ldflags-append \
+                    -liconv
 
+variant gtk3 description {Build using gtk3} {
+    depends_lib-replace port:gtk2 port:gtk3
+    depends_lib-replace port:gtkspell2 port:gtkspell3
+    configure.args-append --with-gtk3
+}
+
+post-activate {
+    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+}
+
 livecheck.type      regex
 livecheck.url       http://pan.rebelbase.com/download/releases/
 livecheck.regex     {>([0-9.]+)/<}

Modified: trunk/dports/news/pan2/files/autogen.sh
===================================================================
--- trunk/dports/news/pan2/files/autogen.sh	2016-04-09 18:09:39 UTC (rev 147604)
+++ trunk/dports/news/pan2/files/autogen.sh	2016-04-09 19:00:14 UTC (rev 147605)
@@ -4,11 +4,9 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="Pan"
-
 (test -f $srcdir/Makefile.am && test -d $srcdir/pan) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
+    echo " top-level Pan directory"
     exit 1
 }
 
@@ -18,6 +16,4 @@
     exit 1
 }
 
-USE_GNOME2_MACROS=1
-
 . gnome-autogen.sh

Deleted: trunk/dports/news/pan2/files/patch-pan-gui-gui.cc.diff
===================================================================
--- trunk/dports/news/pan2/files/patch-pan-gui-gui.cc.diff	2016-04-09 18:09:39 UTC (rev 147604)
+++ trunk/dports/news/pan2/files/patch-pan-gui-gui.cc.diff	2016-04-09 19:00:14 UTC (rev 147605)
@@ -1,13 +0,0 @@
---- pan/gui/gui.cc.orig	2012-06-29 17:24:54.000000000 -0500
-+++ pan/gui/gui.cc	2013-11-17 10:00:46.000000000 -0600
-@@ -2223,8 +2223,8 @@
- 
-   // build the tooltip
-   // todo : perhaps fix this for mac osx automatically....
--  gulong queued, unused, stopped;
--  guint64 KiB_remain;
-+  long unsigned int queued, unused, stopped;  //SKG MacPorts can't find function
-+  uint64_t KiB_remain;                        //SKG using gulong and guint64 types.
-   double KiBps;
-   int hr, min, sec;
-   _queue.get_stats (queued, unused, stopped,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160409/d9110e09/attachment.html>