4 files changed, 69 insertions, 7 deletions

diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 94e9a8159d00..ce46ee44ec97 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	vips
-PORTVERSION=	7.10.10
-PORTREVISION=	2
+PORTVERSION=	7.10.21
+PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/vips-7.10/
 
@@ -21,6 +21,7 @@ LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3 \
 		lcms.1:${PORTSDIR}/graphics/lcms
 
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	gnomehack glib20 pkgconfig pango
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
@@ -162,6 +163,7 @@ MAN3=	IM_ARRAY.3 IM_IMAGE_ADDR.3 IM_IMAGE_N_ELEMENTS.3 \
 	im_writeline.3 im_zerox.3 im_zone.3 im_zoom.3
 
 post-patch:
+	@${RM} ${WRKSRC}/po/malkovich.po
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} '217D' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} '682,684s/^/#/' ${WRKSRC}/Makefile.in
diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index 13f4ac5f8398..afc29c9a3313 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,3 +1,3 @@
-MD5 (vips-7.10.10.tar.gz) = 5fa724406ff4e9ca9839d5f51bd391ad
-SHA256 (vips-7.10.10.tar.gz) = 2efdcaa83f1b80a85b2bf981a996caef502c8baf9c16fa762da6231220bd6cb2
-SIZE (vips-7.10.10.tar.gz) = 3320069
+MD5 (vips-7.10.21.tar.gz) = e7279f1982dcf4c7d9f89d6ac4320c98
+SHA256 (vips-7.10.21.tar.gz) = 966e7a176389260bd207811cf8c22eb583b06dc4d941b5ff74ddc6bcdad84180
+SIZE (vips-7.10.21.tar.gz) = 4541326
diff --git a/graphics/vips/files/patch-po-Makefile.in.in b/graphics/vips/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..dd02c40e802d
--- /dev/null
+++ b/graphics/vips/files/patch-po-Makefile.in.in
@@ -0,0 +1,29 @@
+--- po/Makefile.in.in.orig	Thu Dec 14 16:41:02 2006
++++ po/Makefile.in.in	Thu Dec 14 16:56:02 2006
+@@ -34,7 +34,7 @@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = ${datadir}/locale
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+@@ -44,15 +44,15 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+-GMSGFMT = @GMSGFMT@
+-MSGFMT = @MSGFMT@
++GMSGFMT = @INTLTOOL_MSGFMT@
++MSGFMT = @INTLTOOL_MSGFMT@
+ XGETTEXT = @XGETTEXT@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+ GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+ 
+ ALL_LINGUAS = @ALL_LINGUAS@
+ 
+ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+ 
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index f368e8d6c8cc..be056ff34d90 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -344,16 +344,17 @@ include/vips/vipscpp.h
 lib/libvips.a
 lib/libvips.la
 lib/libvips.so
-lib/libvips.so.14
+lib/libvips.so.18
 lib/libvipsCC.a
 lib/libvipsCC.la
 lib/libvipsCC.so
-lib/libvipsCC.so.14
+lib/libvipsCC.so.18
 libdata/pkgconfig/vips-7.10.pc
 libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/WARNINGS
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/appguide.css
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/appguide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/appguide/contents.png
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/images.aux
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/images.log
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/images.pl
@@ -373,6 +374,8 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/internals.pl
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/html/appguide/next.png
+%%PORTDOCS%%%%DOCSDIR%%/html/appguide/next_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/node10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/node11.html
@@ -408,7 +411,12 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/node7.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/node8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appguide/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/appguide/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/html/appguide/prev_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/appguide/up.png
+%%PORTDOCS%%%%DOCSDIR%%/html/appguide/up_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/WARNINGS
+%%PORTDOCS%%%%DOCSDIR%%/html/cppguide/contents.png
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/cppguide.css
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/cppguide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/images.aux
@@ -428,6 +436,8 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/internals.pl
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/html/cppguide/next.png
+%%PORTDOCS%%%%DOCSDIR%%/html/cppguide/next_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/node10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/node11.html
@@ -479,7 +489,12 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/node7.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/node8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cppguide/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cppguide/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/html/cppguide/prev_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/cppguide/up.png
+%%PORTDOCS%%%%DOCSDIR%%/html/cppguide/up_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/WARNINGS
+%%PORTDOCS%%%%DOCSDIR%%/html/libguide/contents.png
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/images.aux
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/images.log
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/images.pl
@@ -501,6 +516,8 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/labels.pl
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/libguide.css
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/libguide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/libguide/next.png
+%%PORTDOCS%%%%DOCSDIR%%/html/libguide/next_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/node10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/node11.html
@@ -525,6 +542,10 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/node7.html
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/node8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/libguide/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/libguide/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/html/libguide/prev_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/libguide/up.png
+%%PORTDOCS%%%%DOCSDIR%%/html/libguide/up_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/man/batch_crop.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/batch_image_convert.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/batch_rubber_sheet.1.html
@@ -924,6 +945,7 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/man/im_remainderconst.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/im_remosaic.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/im_render.3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/man/im_render_fade.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/im_replicate.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/im_ri2c.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/im_rint.3.html
@@ -1020,6 +1042,7 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/man/squares.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/vdump.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/vips.1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refguide/contents.png
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/img21.png
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/WARNINGS
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/images.aux
@@ -1049,6 +1072,8 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/internals.pl
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/html/refguide/next.png
+%%PORTDOCS%%%%DOCSDIR%%/html/refguide/next_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/node10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/node11.html
@@ -1068,12 +1093,18 @@ libdata/pkgconfig/vipsCC-7.10.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/node7.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/node8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refguide/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/html/refguide/prev_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/refguide.css
 %%PORTDOCS%%%%DOCSDIR%%/html/refguide/refguide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refguide/up.png
+%%PORTDOCS%%%%DOCSDIR%%/html/refguide/up_g.png
 %%PORTDOCS%%%%DOCSDIR%%/ps/appguide.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/cppguide.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/libguide.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/refguide.ps
+share/locale/en_GB/LC_MESSAGES/vips7.mo
+share/locale/malkovich/LC_MESSAGES/vips7.mo
 share/vips/vdump.pro
 share/vips/vips2dj/cmyk/head1
 share/vips/vips2dj/cmyk/head2