[Midnightbsd-cvs] mports [23690] trunk/graphics/gd/pkg-plist: update gd

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jul 25 19:19:34 EDT 2018 

Revision: 23690
          http://svnweb.midnightbsd.org/mports/?rev=23690
Author:   laffer1
Date:     2018-07-25 19:19:33 -0400 (Wed, 25 Jul 2018)
Log Message:
-----------
update gd

Modified Paths:
--------------
    trunk/graphics/gd/Makefile
    trunk/graphics/gd/distinfo
    trunk/graphics/gd/files/patch-bdftogd
    trunk/graphics/gd/files/patch-gd_png.c
    trunk/graphics/gd/files/patch-gdtest.c
    trunk/graphics/gd/pkg-descr
    trunk/graphics/gd/pkg-plist

Property Changed:
----------------
    trunk/graphics/gd/pkg-descr

Modified: trunk/graphics/gd/Makefile
===================================================================
--- trunk/graphics/gd/Makefile	2018-07-25 23:18:44 UTC (rev 23689)
+++ trunk/graphics/gd/Makefile	2018-07-25 23:19:33 UTC (rev 23690)
@@ -1,26 +1,25 @@
 # $MidnightBSD$
 
 PORTNAME=	libgd
-PORTVERSION=	2.1.0
-PORTREVISION?=	5
+PORTVERSION=	2.2.4
+PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES+=	graphics
-MASTER_SITES=	https://bitbucket.org/libgd/gd-libgd/downloads/ \
-		http://cdn.bitbucket.org/libgd/gd-libgd/downloads/
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	Graphics library for fast creation of images
 
-LICENSE=	agg
+LICENSE=	mit
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 CONFLICTS=	bazaar-1.*
 
-USES=		tar:xz pkgconfig pathfix libtool:keepla shebangfix
+USES=		tar:xz pkgconfig pathfix libtool:keepla shebangfix jpeg
 SHEBANG_FILES=	${WRKSRC}/src/bdftogd
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -27,18 +26,18 @@
 FAKE_OPTS=	trueprefix
 WANT_PERL=	yes
 
-OPTIONS_DEFINE=	FONTCONFIG ICONV VPX XPM
-OPTIONS_DEFAULT=FONTCONFIG
+OPTIONS_DEFINE=	FONTCONFIG ICONV XPM WEBP
+OPTIONS_DEFAULT=FONTCONFIG WEBP
 NO_OPTIONS_SORT=yes
-FONTCONFIG_LIB_DEPENDS+=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_OFF=	--with-fontconfig=no
 ICONV_USES=	iconv
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
-VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
-VPX_CONFIGURE_OFF=	--without-vpx
 XPM_USE=	xorg=xpm,x11
 XPM_CONFIGURE_ON=	--with-x
 XPM_CONFIGURE_OFF=	--with-xpm=no
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
+WEBP_CONFIGURE_OFF=	--without-webp
 
 .include <bsd.mport.options.mk>
 
@@ -76,7 +75,7 @@
 .endif
 	# bump shlib version
 	${REINPLACE_CMD} \
-		-e 's|GDLIB_CURRENT=.*|GDLIB_CURRENT=5|' \
+		-e 's|^GDLIB_LT_CURRENT=3|GDLIB_LT_CURRENT=6|' \
 		${WRKSRC}/configure
 	# workaround for broken configure
 .if ! ${PORT_OPTIONS:MICONV}
@@ -103,6 +102,6 @@
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \
 		${STAGEDIR}${PREFIX}/include/
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.5
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.4
 
 .include <bsd.port.mk>

Modified: trunk/graphics/gd/distinfo
===================================================================
--- trunk/graphics/gd/distinfo	2018-07-25 23:18:44 UTC (rev 23689)
+++ trunk/graphics/gd/distinfo	2018-07-25 23:19:33 UTC (rev 23690)
@@ -1,2 +1,3 @@
-SHA256 (libgd-2.1.0.tar.xz) = fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a
-SIZE (libgd-2.1.0.tar.xz) = 2004304
+TIMESTAMP = 1485463341
+SHA256 (libgd-2.2.4.tar.xz) = 137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6
+SIZE (libgd-2.2.4.tar.xz) = 2478528

Modified: trunk/graphics/gd/files/patch-bdftogd
===================================================================
--- trunk/graphics/gd/files/patch-bdftogd	2018-07-25 23:18:44 UTC (rev 23689)
+++ trunk/graphics/gd/files/patch-bdftogd	2018-07-25 23:19:33 UTC (rev 23690)
@@ -1,6 +1,6 @@
---- src/bdftogd.orig	2013-06-25 11:58:23.000000000 +0200
-+++ src/bdftogd	2013-08-15 21:03:29.000000000 +0200
-@@ -24,6 +24,9 @@
+--- src/bdftogd.orig	2017-01-29 09:45:57 UTC
++++ src/bdftogd
+@@ -24,6 +24,9 @@ $gdname = 'gd' . $gdname unless $gdname 
  my $filename = shift;
  $filename = 'gd' . $filename unless $filename =~ /^gd/i;
  
@@ -10,7 +10,7 @@
  if (-f "$filename.c") { die "File $filename.c already exists, won't overwrite\n"; }
  if (-f "$filename.h") { die "File $filename.h already exists, won't overwrite\n"; }
  
-@@ -139,6 +142,10 @@
+@@ -139,6 +142,10 @@ print FILEC <<"EOF";
  
  $info
  
@@ -21,7 +21,7 @@
  #include "$filename.h"
  
  char ${gdname}Data[] = {
-@@ -177,28 +184,40 @@
+@@ -177,28 +184,40 @@ gdFont ${gdname}Rep = {
  	${gdname}Data
  };
  

Modified: trunk/graphics/gd/files/patch-gd_png.c
===================================================================
--- trunk/graphics/gd/files/patch-gd_png.c	2018-07-25 23:18:44 UTC (rev 23689)
+++ trunk/graphics/gd/files/patch-gd_png.c	2018-07-25 23:19:33 UTC (rev 23690)
@@ -1,6 +1,6 @@
---- src/gd_png.c.orig	2013-06-25 11:58:23.000000000 +0200
-+++ src/gd_png.c	2013-08-01 07:08:18.000000000 +0200
-@@ -196,6 +196,14 @@
+--- src/gd_png.c.orig	2016-10-12 08:13:44 UTC
++++ src/gd_png.c
+@@ -277,6 +277,14 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro
  	png_read_info (png_ptr, info_ptr);	/* read all PNG info up to image data */
  
  	png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL);

Modified: trunk/graphics/gd/files/patch-gdtest.c
===================================================================
--- trunk/graphics/gd/files/patch-gdtest.c	2018-07-25 23:18:44 UTC (rev 23689)
+++ trunk/graphics/gd/files/patch-gdtest.c	2018-07-25 23:19:33 UTC (rev 23690)
@@ -1,6 +1,6 @@
---- src/gdtest.c.orig	2013-06-25 11:58:23.000000000 +0200
-+++ src/gdtest.c	2013-08-01 07:12:08.000000000 +0200
-@@ -35,6 +35,8 @@
+--- src/gdtest.c.orig	2015-09-16 11:34:29 UTC
++++ src/gdtest.c
+@@ -35,6 +35,8 @@ main (int argc, char **argv)
  	gdSink imgsnk;
  	int foreground;
  	int i;
@@ -9,7 +9,7 @@
  	if (argc != 2) {
  		fprintf(stderr, "Usage: gdtest filename.png\n");
  		exit (1);
-@@ -55,6 +57,35 @@
+@@ -63,6 +65,35 @@ main (int argc, char **argv)
  
  	CompareImages ("Initial Versions", ref, im);
  
@@ -45,7 +45,7 @@
  
  	/* */
  	/* Send to PNG File then Ptr */
-@@ -268,6 +299,10 @@
+@@ -334,6 +365,10 @@ main (int argc, char **argv)
  	printf ("[Merged Image has %d colours]\n", im2->colorsTotal);
  	CompareImages ("Merged (gdtest.png, gdtest_merge.png)", im2, im3);
  

Modified: trunk/graphics/gd/pkg-descr
===================================================================
--- trunk/graphics/gd/pkg-descr	2018-07-25 23:18:44 UTC (rev 23689)
+++ trunk/graphics/gd/pkg-descr	2018-07-25 23:19:33 UTC (rev 23690)
@@ -10,4 +10,4 @@
 including both truecolor and palette images, resampling (smooth
 resizing of truecolor images) and so forth.
 
-WWW: http://www.libgd.org/
+WWW: https://libgd.github.io/


Property changes on: trunk/graphics/gd/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/graphics/gd/pkg-plist
===================================================================
--- trunk/graphics/gd/pkg-plist	2018-07-25 23:18:44 UTC (rev 23689)
+++ trunk/graphics/gd/pkg-plist	2018-07-25 23:19:33 UTC (rev 23690)
@@ -28,6 +28,6 @@
 lib/libgd.a
 lib/libgd.la
 lib/libgd.so
-lib/libgd.so.5
-lib/libgd.so.5.0.0
+lib/libgd.so.6
+lib/libgd.so.6.0.4
 libdata/pkgconfig/gdlib.pc

More information about the Midnightbsd-cvs mailing list