Ticket #39550: gd2-2.1.0.diff

Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem                  1.0
+PortGroup                   bitbucket 1.0
 PortGroup                   muniversal 1.0
 
+bitbucket.setup             libgd gd-libgd 2.1.0 libgd-
 name                        gd2
-version                     2.0.35
-revision                    14
 categories                  graphics
 maintainers                 ryandesign
 license                     gd
 homepage                    http://www.libgd.org/
 platforms                   darwin
-distname                    gd-${version}
-use_bzip2                   yes
 use_parallel_build          yes
 
 description                 GD creates PNG and JPEG images, among other formats
@@ -29 +27 @@
                             you are looking in the wrong place. If you are not \
                             a programmer, you are looking in the wrong place.
 
-#master_sites                ${homepage}releases/ \
-#                            ${homepage}releases/oldreleases/
-master_sites                macports_distfiles
+bitbucket.tarball_from      downloads
+use_xz                      yes
 
-checksums                   rmd160  f452a2c333b2ba9b7b4c143983ec2af18a335516 \
-                            sha256  bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
+checksums                   rmd160  3fcdf88e1ca653ffd40ddba607dbc317ca87bf63 \
+                            sha256  fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a
 
-depends_build               port:gettext
+depends_build               port:gettext \
+                            port:libvpx
 
 depends_lib                 port:zlib \
                             port:libpng \
@@ -46 +44 @@
                             port:libiconv \
                             port:expat
 
-patchfiles                  patch-configure.ac.diff \
-                            patch-gdft.c.diff
+patchfiles                  patch-src-gdft.c.diff
 
-post-patch {
-    if {[file exists ${prefix}/share/libtool/config/ltmain.sh]} {
-        copy -force ${prefix}/share/libtool/config/ltmain.sh ${worksrcpath}/config
-    } else {
-        copy -force ${prefix}/share/libtool/ltmain.sh ${worksrcpath}/config
-    }
-}
+configure.args-append       --without-x \
+                            --without-xpm
 
-use_autoreconf              yes
-
 configure.cflags-append     -DDEFAULT_FONTPATH=\\\"/System/Library/Fonts:/Library/Fonts\\\"
 
 post-configure {
@@ -76 +66 @@
     }
 }
 
-if {![variant_isset no_x11]} {
+variant x11 conflicts no_x11 {
     depends_lib-append      port:xpm
+    configure.args-delete   --without-x \
+                            --without-xpm
     configure.args-append   --x-includes=${prefix}/include \
                             --x-libraries=${prefix}/lib
 }
 
-variant no_x11 description {disable use of X11} {
-    configure.args-append   --without-x \
-                            --without-xpm
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
 }
 
-livecheck.type              regex
-livecheck.url               ${homepage}Downloads
-livecheck.regex             gd-(\[0-9.\]+)\\.tar
+livecheck.regex             >[join ${bitbucket.tag_prefix}](.+)${extract.suffix}<