Use new GIMP master sites macro.

Drop :keepla from USES=libtool.
Switch logic in the SIMD option in babl.

4 files changed, 8 insertions, 149 deletions

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 91c6fc5b47fc..aa6890f33ee9 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	gegl
 PORTVERSION=	0.2.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gegl/0.2/
+MASTER_SITES=	GIMP
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Graph based image processing framework
@@ -22,7 +22,7 @@ ENSCRIPT_DESC=	Enscript support
 SPIRO_DESC=	Spiro support
 #UMFPACK_DESC=	UMFpack support
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig shebangfix tar:bzip2
+USES=		gettext gmake libtool pathfix pkgconfig shebangfix tar:bzip2
 USE_GNOME=	glib20 intltool
 USE_LDCONFIG=	${PREFIX}/lib/gegl-0.2
 GNU_CONFIGURE=	yes
diff --git a/graphics/gegl/pkg-plist b/graphics/gegl/pkg-plist
index 38e632661d69..5a96a13e79d3 100644
--- a/graphics/gegl/pkg-plist
+++ b/graphics/gegl/pkg-plist
@@ -42,253 +42,129 @@ include/gegl-%%GEGL_VER%%/operation/gegl-operation-sink.h
 include/gegl-%%GEGL_VER%%/operation/gegl-operation-source.h
 include/gegl-%%GEGL_VER%%/operation/gegl-operation-temporal.h
 include/gegl-%%GEGL_VER%%/operation/gegl-operation.h
-%%CAIRO%%lib/gegl-%%GEGL_VER%%/vector-fill.la
 %%CAIRO%%lib/gegl-%%GEGL_VER%%/vector-fill.so
-%%CAIRO%%lib/gegl-%%GEGL_VER%%/vector-stroke.la
 %%CAIRO%%lib/gegl-%%GEGL_VER%%/vector-stroke.so
-%%CAIRO%%lib/gegl-%%GEGL_VER%%/path.la
 %%CAIRO%%lib/gegl-%%GEGL_VER%%/path.so
-%%FFMPEG%%lib/gegl-%%GEGL_VER%%/ff-load.la
 %%FFMPEG%%lib/gegl-%%GEGL_VER%%/ff-load.so
-%%JPEG%%lib/gegl-%%GEGL_VER%%/jpg-load.la
 %%JPEG%%lib/gegl-%%GEGL_VER%%/jpg-load.so
-%%JPEG%%lib/gegl-%%GEGL_VER%%/jpg-save.la
 %%JPEG%%lib/gegl-%%GEGL_VER%%/jpg-save.so
-%%OPENEXR%%lib/gegl-%%GEGL_VER%%/exr-load.la
 %%OPENEXR%%lib/gegl-%%GEGL_VER%%/exr-load.so
-%%OPENEXR%%lib/gegl-%%GEGL_VER%%/exr-save.la
 %%OPENEXR%%lib/gegl-%%GEGL_VER%%/exr-save.so
-%%OPENRAW%%lib/gegl-%%GEGL_VER%%/openraw.la
 %%OPENRAW%%lib/gegl-%%GEGL_VER%%/openraw.so
-%%PANGOCAIRO%%lib/gegl-%%GEGL_VER%%/text.la
 %%PANGOCAIRO%%lib/gegl-%%GEGL_VER%%/text.so
-%%PNG%%lib/gegl-%%GEGL_VER%%/png-load.la
 %%PNG%%lib/gegl-%%GEGL_VER%%/png-load.so
-%%PNG%%lib/gegl-%%GEGL_VER%%/png-save.la
 %%PNG%%lib/gegl-%%GEGL_VER%%/png-save.so
-%%RSVG%%lib/gegl-%%GEGL_VER%%/svg-load.la
 %%RSVG%%lib/gegl-%%GEGL_VER%%/svg-load.so
-%%SDL%%lib/gegl-%%GEGL_VER%%/sdl-display.la
 %%SDL%%lib/gegl-%%GEGL_VER%%/sdl-display.so
-%%V4L%%lib/gegl-%%GEGL_VER%%/v4l.la
 %%V4L%%lib/gegl-%%GEGL_VER%%/v4l.so
-lib/gegl-%%GEGL_VER%%/add.la
 lib/gegl-%%GEGL_VER%%/add.so
-lib/gegl-%%GEGL_VER%%/bilateral-filter.la
 lib/gegl-%%GEGL_VER%%/bilateral-filter.so
-lib/gegl-%%GEGL_VER%%/box-blur.la
 lib/gegl-%%GEGL_VER%%/box-blur.so
-lib/gegl-%%GEGL_VER%%/brightness-contrast.la
 lib/gegl-%%GEGL_VER%%/brightness-contrast.so
-lib/gegl-%%GEGL_VER%%/buffer-sink.la
 lib/gegl-%%GEGL_VER%%/buffer-sink.so
-lib/gegl-%%GEGL_VER%%/buffer-source.la
 lib/gegl-%%GEGL_VER%%/buffer-source.so
-lib/gegl-%%GEGL_VER%%/c2g.la
 lib/gegl-%%GEGL_VER%%/c2g.so
-lib/gegl-%%GEGL_VER%%/checkerboard.la
 lib/gegl-%%GEGL_VER%%/checkerboard.so
-lib/gegl-%%GEGL_VER%%/clear.la
 lib/gegl-%%GEGL_VER%%/clear.so
-lib/gegl-%%GEGL_VER%%/clone.la
 lib/gegl-%%GEGL_VER%%/clone.so
-lib/gegl-%%GEGL_VER%%/color-burn.la
 lib/gegl-%%GEGL_VER%%/color-burn.so
-lib/gegl-%%GEGL_VER%%/color-dodge.la
 lib/gegl-%%GEGL_VER%%/color-dodge.so
-lib/gegl-%%GEGL_VER%%/color-temperature.la
 lib/gegl-%%GEGL_VER%%/color-temperature.so
-lib/gegl-%%GEGL_VER%%/color-to-alpha.la
 lib/gegl-%%GEGL_VER%%/color-to-alpha.so
-lib/gegl-%%GEGL_VER%%/color.la
 lib/gegl-%%GEGL_VER%%/color.so
-lib/gegl-%%GEGL_VER%%/contrast-curve.la
 lib/gegl-%%GEGL_VER%%/contrast-curve.so
-lib/gegl-%%GEGL_VER%%/convert-format.la
 lib/gegl-%%GEGL_VER%%/convert-format.so
-lib/gegl-%%GEGL_VER%%/crop.la
 lib/gegl-%%GEGL_VER%%/crop.so
-lib/gegl-%%GEGL_VER%%/darken.la
 lib/gegl-%%GEGL_VER%%/darken.so
-lib/gegl-%%GEGL_VER%%/difference-of-gaussians.la
 lib/gegl-%%GEGL_VER%%/difference-of-gaussians.so
-lib/gegl-%%GEGL_VER%%/difference.la
 lib/gegl-%%GEGL_VER%%/difference.so
-lib/gegl-%%GEGL_VER%%/display.la
 lib/gegl-%%GEGL_VER%%/display.so
-lib/gegl-%%GEGL_VER%%/divide.la
 lib/gegl-%%GEGL_VER%%/divide.so
-lib/gegl-%%GEGL_VER%%/dropshadow.la
 lib/gegl-%%GEGL_VER%%/dropshadow.so
-lib/gegl-%%GEGL_VER%%/dst-atop.la
 lib/gegl-%%GEGL_VER%%/dst-atop.so
-lib/gegl-%%GEGL_VER%%/dst-in.la
 lib/gegl-%%GEGL_VER%%/dst-in.so
-lib/gegl-%%GEGL_VER%%/dst-out.la
 lib/gegl-%%GEGL_VER%%/dst-out.so
-lib/gegl-%%GEGL_VER%%/dst-over.la
 lib/gegl-%%GEGL_VER%%/dst-over.so
-lib/gegl-%%GEGL_VER%%/dst.la
 lib/gegl-%%GEGL_VER%%/dst.so
-lib/gegl-%%GEGL_VER%%/edge-laplace.la
 lib/gegl-%%GEGL_VER%%/edge-laplace.so
-lib/gegl-%%GEGL_VER%%/edge-sobel.la
 lib/gegl-%%GEGL_VER%%/edge-sobel.so
-lib/gegl-%%GEGL_VER%%/exclusion.la
 lib/gegl-%%GEGL_VER%%/exclusion.so
-lib/gegl-%%GEGL_VER%%/exp-combine.la
 lib/gegl-%%GEGL_VER%%/exp-combine.so
-lib/gegl-%%GEGL_VER%%/fattal02.la
 lib/gegl-%%GEGL_VER%%/fattal02.so
-lib/gegl-%%GEGL_VER%%/fractal-explorer.la
 lib/gegl-%%GEGL_VER%%/fractal-explorer.so
-lib/gegl-%%GEGL_VER%%/gamma.la
 lib/gegl-%%GEGL_VER%%/gamma.so
-lib/gegl-%%GEGL_VER%%/gaussian-blur.la
 lib/gegl-%%GEGL_VER%%/gaussian-blur.so
-lib/gegl-%%GEGL_VER%%/gegl-buffer-load-op.la
 lib/gegl-%%GEGL_VER%%/gegl-buffer-load-op.so
-lib/gegl-%%GEGL_VER%%/gegl-buffer-save-op.la
 lib/gegl-%%GEGL_VER%%/gegl-buffer-save-op.so
-lib/gegl-%%GEGL_VER%%/grey.la
 lib/gegl-%%GEGL_VER%%/grey.so
-lib/gegl-%%GEGL_VER%%/grid.la
 lib/gegl-%%GEGL_VER%%/grid.so
-lib/gegl-%%GEGL_VER%%/hard-light.la
 lib/gegl-%%GEGL_VER%%/hard-light.so
-lib/gegl-%%GEGL_VER%%/introspect.la
 lib/gegl-%%GEGL_VER%%/introspect.so
-lib/gegl-%%GEGL_VER%%/invert.la
 lib/gegl-%%GEGL_VER%%/invert.so
-%%JP2%%lib/gegl-%%GEGL_VER%%/jp2-load.la
 %%JP2%%lib/gegl-%%GEGL_VER%%/jp2-load.so
-lib/gegl-%%GEGL_VER%%/layer.la
 lib/gegl-%%GEGL_VER%%/layer.so
-lib/gegl-%%GEGL_VER%%/lens-distortion.la
 lib/gegl-%%GEGL_VER%%/lens-distortion.so
-lib/gegl-%%GEGL_VER%%/levels.la
 lib/gegl-%%GEGL_VER%%/levels.so
-lib/gegl-%%GEGL_VER%%/lighten.la
 lib/gegl-%%GEGL_VER%%/lighten.so
-lib/gegl-%%GEGL_VER%%/load.la
 lib/gegl-%%GEGL_VER%%/load.so
-lib/gegl-%%GEGL_VER%%/magick-load.la
 lib/gegl-%%GEGL_VER%%/magick-load.so
-lib/gegl-%%GEGL_VER%%/mantiuk06.la
 lib/gegl-%%GEGL_VER%%/mantiuk06.so
-lib/gegl-%%GEGL_VER%%/map-absolute.la
 lib/gegl-%%GEGL_VER%%/map-absolute.so
-lib/gegl-%%GEGL_VER%%/map-relative.la
 lib/gegl-%%GEGL_VER%%/map-relative.so
-lib/gegl-%%GEGL_VER%%/matting-global.la
 lib/gegl-%%GEGL_VER%%/matting-global.so
-lib/gegl-%%GEGL_VER%%/mblur.la
 lib/gegl-%%GEGL_VER%%/mblur.so
-lib/gegl-%%GEGL_VER%%/mirrors.la
 lib/gegl-%%GEGL_VER%%/mirrors.so
-lib/gegl-%%GEGL_VER%%/mono-mixer.la
 lib/gegl-%%GEGL_VER%%/mono-mixer.so
-lib/gegl-%%GEGL_VER%%/motion-blur.la
 lib/gegl-%%GEGL_VER%%/motion-blur.so
-lib/gegl-%%GEGL_VER%%/multiply.la
 lib/gegl-%%GEGL_VER%%/multiply.so
-lib/gegl-%%GEGL_VER%%/noise-reduction.la
 lib/gegl-%%GEGL_VER%%/noise-reduction.so
-lib/gegl-%%GEGL_VER%%/noise.la
 lib/gegl-%%GEGL_VER%%/noise.so
-lib/gegl-%%GEGL_VER%%/nop.la
 lib/gegl-%%GEGL_VER%%/nop.so
-lib/gegl-%%GEGL_VER%%/opacity.la
 lib/gegl-%%GEGL_VER%%/opacity.so
-lib/gegl-%%GEGL_VER%%/open-buffer.la
 lib/gegl-%%GEGL_VER%%/open-buffer.so
-lib/gegl-%%GEGL_VER%%/over.la
 lib/gegl-%%GEGL_VER%%/over.so
-lib/gegl-%%GEGL_VER%%/overlay.la
 lib/gegl-%%GEGL_VER%%/overlay.so
-%%GDK%%lib/gegl-%%GEGL_VER%%/pixbuf.la
 %%GDK%%lib/gegl-%%GEGL_VER%%/pixbuf.so
-lib/gegl-%%GEGL_VER%%/pixelize.la
 lib/gegl-%%GEGL_VER%%/pixelize.so
-lib/gegl-%%GEGL_VER%%/plus.la
 lib/gegl-%%GEGL_VER%%/plus.so
-lib/gegl-%%GEGL_VER%%/polar-coordinates.la
 lib/gegl-%%GEGL_VER%%/polar-coordinates.so
-lib/gegl-%%GEGL_VER%%/posterize.la
 lib/gegl-%%GEGL_VER%%/posterize.so
-lib/gegl-%%GEGL_VER%%/ppm-load.la
 lib/gegl-%%GEGL_VER%%/ppm-load.so
-lib/gegl-%%GEGL_VER%%/ppm-save.la
 lib/gegl-%%GEGL_VER%%/ppm-save.so
-lib/gegl-%%GEGL_VER%%/raw-load.la
 lib/gegl-%%GEGL_VER%%/raw-load.so
-lib/gegl-%%GEGL_VER%%/rectangle.la
 lib/gegl-%%GEGL_VER%%/rectangle.so
-lib/gegl-%%GEGL_VER%%/reinhard05.la
 lib/gegl-%%GEGL_VER%%/reinhard05.so
-lib/gegl-%%GEGL_VER%%/remap.la
 lib/gegl-%%GEGL_VER%%/remap.so
-lib/gegl-%%GEGL_VER%%/rgbe-load.la
 lib/gegl-%%GEGL_VER%%/rgbe-load.so
-lib/gegl-%%GEGL_VER%%/rgbe-save.la
 lib/gegl-%%GEGL_VER%%/rgbe-save.so
-lib/gegl-%%GEGL_VER%%/ripple.la
 lib/gegl-%%GEGL_VER%%/ripple.so
-%%GDK%%lib/gegl-%%GEGL_VER%%/save-pixbuf.la
 %%GDK%%lib/gegl-%%GEGL_VER%%/save-pixbuf.so
-lib/gegl-%%GEGL_VER%%/save.la
 lib/gegl-%%GEGL_VER%%/save.so
-lib/gegl-%%GEGL_VER%%/screen.la
 lib/gegl-%%GEGL_VER%%/screen.so
-lib/gegl-%%GEGL_VER%%/snn-mean.la
 lib/gegl-%%GEGL_VER%%/snn-mean.so
-lib/gegl-%%GEGL_VER%%/soft-light.la
 lib/gegl-%%GEGL_VER%%/soft-light.so
-lib/gegl-%%GEGL_VER%%/src-atop.la
 lib/gegl-%%GEGL_VER%%/src-atop.so
-lib/gegl-%%GEGL_VER%%/src-in.la
 lib/gegl-%%GEGL_VER%%/src-in.so
-lib/gegl-%%GEGL_VER%%/src-out.la
 lib/gegl-%%GEGL_VER%%/src-out.so
-lib/gegl-%%GEGL_VER%%/src-over.la
 lib/gegl-%%GEGL_VER%%/src-over.so
-lib/gegl-%%GEGL_VER%%/src.la
 lib/gegl-%%GEGL_VER%%/src.so
-lib/gegl-%%GEGL_VER%%/stress.la
 lib/gegl-%%GEGL_VER%%/stress.so
-lib/gegl-%%GEGL_VER%%/stretch-contrast.la
 lib/gegl-%%GEGL_VER%%/stretch-contrast.so
-lib/gegl-%%GEGL_VER%%/subtract.la
 lib/gegl-%%GEGL_VER%%/subtract.so
-lib/gegl-%%GEGL_VER%%/svg-huerotate.la
 lib/gegl-%%GEGL_VER%%/svg-huerotate.so
-lib/gegl-%%GEGL_VER%%/svg-luminancetoalpha.la
 lib/gegl-%%GEGL_VER%%/svg-luminancetoalpha.so
-lib/gegl-%%GEGL_VER%%/svg-matrix.la
 lib/gegl-%%GEGL_VER%%/svg-matrix.so
-lib/gegl-%%GEGL_VER%%/svg-multiply.la
 lib/gegl-%%GEGL_VER%%/svg-multiply.so
-lib/gegl-%%GEGL_VER%%/svg-saturate.la
 lib/gegl-%%GEGL_VER%%/svg-saturate.so
-lib/gegl-%%GEGL_VER%%/threshold.la
 lib/gegl-%%GEGL_VER%%/threshold.so
-lib/gegl-%%GEGL_VER%%/transformops.la
 lib/gegl-%%GEGL_VER%%/transformops.so
-lib/gegl-%%GEGL_VER%%/unsharp-mask.la
 lib/gegl-%%GEGL_VER%%/unsharp-mask.so
-lib/gegl-%%GEGL_VER%%/value-invert.la
 lib/gegl-%%GEGL_VER%%/value-invert.so
-lib/gegl-%%GEGL_VER%%/vignette.la
 lib/gegl-%%GEGL_VER%%/vignette.so
-lib/gegl-%%GEGL_VER%%/waves.la
 lib/gegl-%%GEGL_VER%%/waves.so
-lib/gegl-%%GEGL_VER%%/weighted-blend.la
 lib/gegl-%%GEGL_VER%%/weighted-blend.so
-lib/gegl-%%GEGL_VER%%/write-buffer.la
 lib/gegl-%%GEGL_VER%%/write-buffer.so
-lib/gegl-%%GEGL_VER%%/xor.la
 lib/gegl-%%GEGL_VER%%/xor.so
-lib/libgegl-%%GEGL_VER%%.la
 lib/libgegl-%%GEGL_VER%%.so
 lib/libgegl-%%GEGL_VER%%.so.0
 lib/libgegl-%%GEGL_VER%%.so.0.199.1
diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index 59062cae8926..b491db465d66 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -3,30 +3,24 @@
 
 PORTNAME=	babl
 PORTVERSION=	0.1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
-		ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \
-		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
-		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	babl/${PORTVERSION:R}
+MASTER_SITES=	GIMP
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dynamic pixel format conversion library
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-introspection
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	SIMD
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSIMD}
+.if !${PORT_OPTIONS:MSIMD}
 CONFIGURE_ARGS+=--disable-mmx \
 		--disable-sse \
 		--disable-altivec
diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist
index fc39427ca92e..82cad4b6f58d 100644
--- a/x11/babl/pkg-plist
+++ b/x11/babl/pkg-plist
@@ -2,27 +2,16 @@ include/babl-0.1/babl/babl-macros.h
 include/babl-0.1/babl/babl-types.h
 include/babl-0.1/babl/babl-version.h
 include/babl-0.1/babl/babl.h
-lib/babl-0.1/CIE.la
 lib/babl-0.1/CIE.so
-lib/babl-0.1/cairo.la
 lib/babl-0.1/cairo.so
-lib/babl-0.1/fast-float.la
 lib/babl-0.1/fast-float.so
-lib/babl-0.1/float.la
 lib/babl-0.1/float.so
-lib/babl-0.1/gegl-fixups.la
 lib/babl-0.1/gegl-fixups.so
-lib/babl-0.1/gggl-lies.la
 lib/babl-0.1/gggl-lies.so
-lib/babl-0.1/gggl.la
 lib/babl-0.1/gggl.so
-lib/babl-0.1/gimp-8bit.la
 lib/babl-0.1/gimp-8bit.so
-lib/babl-0.1/naive-CMYK.la
 lib/babl-0.1/naive-CMYK.so
-lib/babl-0.1/sse-fixups.la
 lib/babl-0.1/sse-fixups.so
-lib/libbabl-0.1.la
 lib/libbabl-0.1.so
 lib/libbabl-0.1.so.0
 lib/libbabl-0.1.so.0.109.1