libwmf: update to 0.2.15

- revbump abiword-x11

editors/abiword-x11/Portfile

@@ -13,7 +13,7 @@ name                abiword-x11
 set dname           abiword
 gitlab.instance     https://gitlab.gnome.org
 gitlab.setup        World AbiWord 3.0.6 release-
-revision            1
+revision            2
 
 license             GPL-2+
 description         A word processor with Gnome support.

graphics/libwmf/Portfile

@@ -1,10 +1,10 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
+PortGroup           github 1.0
 
-name                libwmf
-version             0.2.8.4
-revision            9
+github.setup        caolanm libwmf 0.2.15 v
+revision            0
 categories          graphics fonts
 license             LGPL
 maintainers         nomaintainer
@@ -15,16 +15,15 @@ long_description \
     e.g., an X window, or (b) converting them to more standard/open file \
     formats.
 
-platforms           darwin
-
 homepage            http://wvware.sourceforge.net/libwmf.html
-master_sites        sourceforge:wvware
 
-checksums           rmd160  98cd631adb5bb332d9224d04bc8a265c105435f2 \
-                    sha256  5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
+github.tarball_from releases
+checksums           rmd160  e3c3ae693afd3ac0a4b43b4c8c9c5bdaf151873f \
+                    sha256  bbc90f22b9e86d5f1890d7da11cf7a8e61f429d4c220d900c285021deabe7a52 \
+                    size    2766626
 
 depends_build \
-    port:pkgconfig
+    path:bin/pkg-config:pkgconfig
 
 depends_lib \
     port:zlib \
@@ -33,10 +32,6 @@ depends_lib \
     port:freetype \
     port:expat
 
-patchfiles          configure.ac.diff
-
-use_autoreconf      yes
-autoreconf.args     -fvi
 
 configure.args      --with-jpeg \
                     --with-expat \
@@ -44,17 +39,16 @@ configure.args      --with-jpeg \
                     --with-fontdir=${prefix}/share/fonts/${name}
 
 post-destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-    xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING CREDITS ChangeLog \
+    xinstall -m 0755 -d ${destroot}${prefix}/share/doc/${name}
+    xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING CREDITS ChangeLog \
         NEWS README TODO ${destroot}${prefix}/share/doc/${name}
 }
 
 variant x11 {
-    depends_lib-append  port:xorg-libX11
+    depends_lib-append      port:xorg-libX11
     depends_build-append    port:mkfontscale
 
-    configure.args-delete   --without-x
-    configure.args-append   --with-x
+    configure.args-replace  --without-x --with-x
 
     post-destroot {
         system "mkfontscale ${destroot}${prefix}/share/fonts/${name} && mkfontdir ${destroot}${prefix}/share/fonts/${name}"
@@ -62,11 +56,6 @@ variant x11 {
 }
 
 variant xml2 description {Use libxml2 not expat} {
-    depends_lib-delete  port:expat
-    depends_lib-append  port:libxml2
-    configure.args-delete   --with-expat
-    configure.args-append   --with-libxml2
+    depends_lib-replace     port:expat port:libxml2
+    configure.args-replace  --with-expat --with-libxml2
 }
-
-livecheck.url   http://sourceforge.net/projects/wvware/files/libwmf/
-livecheck.regex "${name}\/(\\d+(?:\\.\\d+)*)"

graphics/libwmf/files/configure.ac.diff

@@ -1,26 +0,0 @@
---- configure.ac.orig	2005-07-28 06:48:39.000000000 +1000
-+++ configure.ac	2010-01-09 05:46:40.000000000 +1100
-@@ -56,7 +56,7 @@ dnl Initialize automake stuff
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
- 
- # Specify a configuration file
--AM_CONFIG_HEADER(wmfconfig.h)
-+AC_CONFIG_HEADERS([wmfconfig.h])
- 
- AH_TOP([
- #ifndef LIBWMF_CONFIG_H
-@@ -742,14 +742,6 @@
- GDK_PIXBUF_LIBS=""
- GDK_PIXBUF_DIR=""
- 
--if test $LIBWMF_BUILDSTYLE != lite; then
--	PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[
--		GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
--		GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
--		wmf_gdk_pixbuf=yes
--	],[	wmf_gdk_pixbuf=no
--	])
--fi
- AM_CONDITIONAL(LIBWMF_GDK_PIXBUF,[test $wmf_gdk_pixbuf = yes])
- 
- AC_SUBST(GDK_PIXBUF_CFLAGS)