Attachment 162983 Details for Bug 204444 – graphics_GraphicsMagick.diff

[patch] graphics_GraphicsMagick.diff

graphics_GraphicsMagick.diff (text/plain), 5.13 KB, created by tkato432 on 2015-11-10 18:33:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-11-10 18:33:36 UTC

Size: 5.13 KB

patch

obsolete

>diff -urN /usr/ports/graphics/GraphicsMagick/Makefile graphics/GraphicsMagick/Makefile
>--- /usr/ports/graphics/GraphicsMagick/Makefile	2015-10-12 16:56:23.254441000 +0900
>+++ graphics/GraphicsMagick/Makefile	2015-11-11 00:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/graphics/GraphicsMagick/Makefile 399093 2015-10-11 16:20:41Z marino $
> 
> PORTNAME=	GraphicsMagick
>-PORTVERSION=	1.3.22
>+PORTVERSION=	1.3.23
> PORTEPOCH=	1
> CATEGORIES=	graphics
> MASTER_SITES=	SF \
>@@ -17,6 +17,7 @@
> 		libpng.so:${PORTSDIR}/graphics/png		\
> 		libtiff.so:${PORTSDIR}/graphics/tiff		\
> 		libfreetype.so:${PORTSDIR}/print/freetype2
>+TEST_DEPENDS=	webfonts>0:${PORTSDIR}/x11-fonts/webfonts
> 
> PORTSCOUT=	limit:^1\.3\.
> 
>@@ -27,6 +28,7 @@
> CONFIGURE_ARGS=	--without-perl --enable-shared --enable-static \
> 		--with-quantum-depth="${QD}" \
> 		--with-windows-font-dir="${WINDOWS_FONT_DIR}"
>+TEST_TARGET=	check
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> 
>@@ -35,41 +37,31 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE=		DOCS DPS FPX OPENMP Q8BIT SSE TESTS WEBP X11
>+OPTIONS_DEFINE=		DOCS DPS FPX OPENMP Q8BIT SSE WEBP X11
> OPTIONS_DEFAULT=	OPENMP WEBP X11
> 
> DPS_DESC=		Display Ghostscript support (must also select X11)
>-FPX_LIB_DEPENDS+=	libfpx.so.[2-9]:${PORTSDIR}/graphics/libfpx
>+DPS_LIB_DEPENDS=	libdps.so:${PORTSDIR}/x11/dgs
>+DPS_USE=		XORG=xt
>+DPS_CONFIGURE_WITH=	dps
>+DPS_IMPLIES=		X11
>+FPX_LIB_DEPENDS=	libfpx.so.[2-9]:${PORTSDIR}/graphics/libfpx
> FPX_CONFIGURE_WITH=	fpx
> OPENMP_USES=		compiler:openmp
> OPENMP_CONFIGURE_ON=	--with-threads --enable-openmp --disable-openmp-slow
> OPENMP_CONFIGURE_OFF=	--without-threads --disable-openmp
> Q8BIT_DESC=		Use 8-bit pixels (speed) instead of 16 (quality)
>-TESTS_DESC=		Run bundled self-tests after build
>-TESTS_BUILD_DEPENDS=	webfonts>0:${PORTSDIR}/x11-fonts/webfonts
>-TESTS_RUN_DEPENDS=	webfonts>0:${PORTSDIR}/x11-fonts/webfonts
>+Q8BIT_VARS=		QD=8
>+Q8BIT_VARS_OFF=		QD=16
> WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
> WEBP_CONFIGURE_WITH=	webp
>-X11_LIB_DEPENDS=	libwmflite.so:${PORTSDIR}/graphics/${LIBWMF_PORT}
>+X11_LIB_DEPENDS=	libwmflite.so:${PORTSDIR}/graphics/libwmf
>+X11_LIB_DEPENDS_OFF=	libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11
> X11_USE=		XORG=xext
> X11_CONFIGURE_WITH=	x
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MDPS}
>-LIB_DEPENDS+=	libdps.so:${PORTSDIR}/x11/dgs
>-USE_XORG=	xt
>-CONFIGURE_ARGS+=--with-dps
>-.else
>-CONFIGURE_ARGS+=--without-dps
>-.endif
>-
>-.if ${PORT_OPTIONS:MQ8BIT}
>-QD=		8
>-.else
>-QD=		16
>-.endif
>-
> .if ${PORT_OPTIONS:MSSE}
> .if ${MACHINE_CPU:Msse}
> CFLAGS+=	-msse
>@@ -82,12 +74,6 @@
> .endif
> .endif
> 
>-.if ${PORT_OPTIONS:MX11}
>-LIBWMF_PORT=	libwmf
>-.else
>-LIBWMF_PORT=	libwmf-nox11
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> .if !defined(WINDOWS_FONT_DIR)
>@@ -95,25 +81,11 @@
> WINDOWS_FONT_DIR=${LOCALBASE}/share/fonts/webfonts
> .endif
> 
>-.if ${PORT_OPTIONS:MTESTS}
>-post-build:: regression-test
>-.else
>-post-build::
>-	#
>-	# You are strongly advised to run ``make test'' now
>-	# and report any failures to ${MAINTAINER}.
>-	#
>-.endif
>-
> post-install:
> .for i in coders filters
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q${QD}/${i}
> .endfor
> 
>-regression-test: do-build
>-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
>-		${MAKEFILE} ${MAKE_ARGS} check)
>-
> .include <bsd.port.post.mk>
> # The OPENMP option may select gcc as compiler but on architectures
> # that have switched to libc++ clang should be used for C++ code.
>diff -urN /usr/ports/graphics/GraphicsMagick/distinfo graphics/GraphicsMagick/distinfo
>--- /usr/ports/graphics/GraphicsMagick/distinfo	2015-10-12 16:56:23.254981000 +0900
>+++ graphics/GraphicsMagick/distinfo	2015-11-11 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (GraphicsMagick-1.3.22.tar.bz2) = eccde8534de936e23a32466c08ae6ebab559f29ad553262ed648de8012c7b23f
>-SIZE (GraphicsMagick-1.3.22.tar.bz2) = 7611948
>+SHA256 (GraphicsMagick-1.3.23.tar.bz2) = 6e14a9e9e42ec074239b2de4db37ebebb8268b0361332d5bc86d7c3fbfe5aabf
>+SIZE (GraphicsMagick-1.3.23.tar.bz2) = 7620906
>diff -urN /usr/ports/graphics/GraphicsMagick/pkg-plist graphics/GraphicsMagick/pkg-plist
>--- /usr/ports/graphics/GraphicsMagick/pkg-plist	2015-10-12 16:56:23.241027000 +0900
>+++ graphics/GraphicsMagick/pkg-plist	2015-11-11 00:00:00.000000000 +0900
>@@ -92,15 +92,15 @@
> lib/libGraphicsMagick++.a
> lib/libGraphicsMagick++.so
> lib/libGraphicsMagick++.so.12
>-lib/libGraphicsMagick++.so.12.0.0
>+lib/libGraphicsMagick++.so.12.0.1
> lib/libGraphicsMagick.a
> lib/libGraphicsMagick.so
> lib/libGraphicsMagick.so.3
>-lib/libGraphicsMagick.so.3.14.0
>+lib/libGraphicsMagick.so.3.14.1
> lib/libGraphicsMagickWand.a
> lib/libGraphicsMagickWand.so
> lib/libGraphicsMagickWand.so.2
>-lib/libGraphicsMagickWand.so.2.7.2
>+lib/libGraphicsMagickWand.so.2.7.3
> libdata/pkgconfig/GraphicsMagick++.pc
> libdata/pkgconfig/GraphicsMagick.pc
> libdata/pkgconfig/GraphicsMagickWand.pc
>@@ -285,5 +285,5 @@
> %%PORTDOCS%%%%DOCSDIR%%/www/wand/magick_wand.html
> %%PORTDOCS%%%%DOCSDIR%%/www/wand/pixel_wand.html
> %%PORTDOCS%%%%DOCSDIR%%/www/wand/wand.html
>-@dir lib/GraphicsMagick/modules-Q%%Q%%/coders
> @dir lib/GraphicsMagick/modules-Q%%Q%%/filters
>+@dir lib/GraphicsMagick/modules-Q%%Q%%/coders

Actions: View | Diff

Attachments on bug 204444: 162983