[109413] trunk/dports/graphics/gd2
ryandesign at macports.org
ryandesign at macports.org
Wed Aug 14 23:51:34 PDT 2013
Revision: 109413
https://trac.macports.org/changeset/109413
Author: ryandesign at macports.org
Date: 2013-08-14 23:51:34 -0700 (Wed, 14 Aug 2013)
Log Message:
-----------
gd2: update to 2.1.0 (#39550); use bitbucket portgroup; add libvpx dependency; switch no_x11 variant to x11 variant (#39383)
Modified Paths:
--------------
trunk/dports/graphics/gd2/Portfile
Added Paths:
-----------
trunk/dports/graphics/gd2/files/patch-src-gdft.c.diff
Removed Paths:
-------------
trunk/dports/graphics/gd2/files/patch-configure.ac.diff
trunk/dports/graphics/gd2/files/patch-gdft.c.diff
Modified: trunk/dports/graphics/gd2/Portfile
===================================================================
--- trunk/dports/graphics/gd2/Portfile 2013-08-15 06:41:47 UTC (rev 109412)
+++ trunk/dports/graphics/gd2/Portfile 2013-08-15 06:51:34 UTC (rev 109413)
@@ -2,18 +2,16 @@
# $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,14 +27,14 @@
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,19 +44,11 @@
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,17 +66,20 @@
}
}
-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}<
Deleted: trunk/dports/graphics/gd2/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/graphics/gd2/files/patch-configure.ac.diff 2013-08-15 06:41:47 UTC (rev 109412)
+++ trunk/dports/graphics/gd2/files/patch-configure.ac.diff 2013-08-15 06:51:34 UTC (rev 109413)
@@ -1,26 +0,0 @@
---- configure.ac.orig 2007-04-25 06:48:41.000000000 -0600
-+++ configure.ac 2013-01-02 10:08:09.000000000 -0700
-@@ -41,7 +41,6 @@
- AC_SUBST([XTRA_LDFLAGS])
-
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
- AC_PROG_LN_S
-@@ -350,14 +349,8 @@
- # authors decide to do this AGAIN. Which I really hope they won't. TBB
-
- if test "$withval" != no; then
-- AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
- AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
-- if test -n "$LIBPNG12_CONFIG"; then
-- libpng_CPPFLAGS=`libpng12-config --cflags`
-- # should be --ldopts, but it's currently broken
-- libpng_LDFLAGS=`libpng12-config --ldflags`
-- libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
-- elif test -n "$LIBPNG_CONFIG"; then
-+ if test -n "$LIBPNG_CONFIG"; then
- libpng_CPPFLAGS=`libpng-config --cflags`
- # should be --ldopts, but it's currently broken
- libpng_LDFLAGS=`libpng-config --ldflags`
Deleted: trunk/dports/graphics/gd2/files/patch-gdft.c.diff
===================================================================
--- trunk/dports/graphics/gd2/files/patch-gdft.c.diff 2013-08-15 06:41:47 UTC (rev 109412)
+++ trunk/dports/graphics/gd2/files/patch-gdft.c.diff 2013-08-15 06:51:34 UTC (rev 109413)
@@ -1,20 +0,0 @@
---- gdft.c.orig
-+++ gdft.c
-@@ -1402,7 +1402,7 @@ fprintf(stderr,"dpi=%d,%d metric_res=%d ptsize=%g\n",hdpi,vdpi,METRIC_RES,ptsize
-
- #include <fontconfig/fontconfig.h>
-
--/* #define NO_POSTSCRIPT_ALIAS 1 */
-+#define NO_POSTSCRIPT_ALIAS 1
- #ifndef NO_POSTSCRIPT_ALIAS
- typedef struct _PostscriptAlias {
- char* name;
-@@ -1659,7 +1659,7 @@ static char * font_path(char **fontpath, char *name_list)
- BGD_DECLARE(int) gdFTUseFontConfig(int flag)
- {
- #ifdef HAVE_LIBFONTCONFIG
-- fontConfigFlag = 1;
-+ fontConfigFlag = flag;
- return 1;
- #else
- return 0;
Copied: trunk/dports/graphics/gd2/files/patch-src-gdft.c.diff (from rev 105824, trunk/dports/graphics/gd2/files/patch-gdft.c.diff)
===================================================================
--- trunk/dports/graphics/gd2/files/patch-src-gdft.c.diff (rev 0)
+++ trunk/dports/graphics/gd2/files/patch-src-gdft.c.diff 2013-08-15 06:51:34 UTC (rev 109413)
@@ -0,0 +1,11 @@
+--- src/gdft.c.orig 2013-04-21 08:46:52.000000000 -0500
++++ src/gdft.c 2013-05-07 02:06:21.000000000 -0500
+@@ -1327,7 +1327,7 @@
+
+ #include <fontconfig/fontconfig.h>
+
+-/* #define NO_POSTSCRIPT_ALIAS 1 */
++#define NO_POSTSCRIPT_ALIAS 1
+ #ifndef NO_POSTSCRIPT_ALIAS
+ typedef struct _PostscriptAlias {
+ char* name;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130814/f3991b1e/attachment.html>
More information about the macports-changes
mailing list