Index: head/graphics/tiffgt/Makefile
===================================================================
--- head/graphics/tiffgt/Makefile	(revision 390280)
+++ head/graphics/tiffgt/Makefile	(revision 390281)
@@ -1,41 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	tiffgt
-DISTVERSION=	4.0.4beta
+DISTVERSION=	4.0.4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://download.osgeo.org/libtiff/
 DISTNAME=	tiff-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	X11 Tools for working with TIFF images
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libtiff.so:${PORTSDIR}/${PKGCATEGORY}/tiff
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
 USES=		cpe libtool
 CPE_PRODUCT=	libtiff
 CPE_VERSION=	${DISTVERSION:C/[a-z]+//}
 CPE_UPDATE=	${DISTVERSION:C/[0-9.]+//}
 USE_XORG=	sm ice xmu xi x11
 USE_GL=		glut glu gl
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-jpeg-include-dir=${LOCALBASE}/include \
-			--with-jpeg-lib-dir=${LOCALBASE}/lib \
-			--with-x --with-libgl
+			--with-jpeg-lib-dir=${LOCALBASE}/lib --with-x
 PLIST_FILES=	bin/tiffgt man/man1/tiffgt.1.gz
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|^docfiles|no-docfiles|' \
 		-e 's|man html|man|' ${WRKSRC}/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/.libs/tiffgt ${STAGEDIR}/${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/man/tiffgt.1 ${STAGEDIR}${PREFIX}/man/man1/
 
 .include <bsd.port.mk>
Index: head/graphics/tiffgt/distinfo
===================================================================
--- head/graphics/tiffgt/distinfo	(revision 390280)
+++ head/graphics/tiffgt/distinfo	(revision 390281)
@@ -1,2 +1,2 @@
-SHA256 (tiff-4.0.4beta.tar.gz) = 5bd6c8e9be4ec318f6beb0c3f28b9ee31bd8b615195a00e0acc3eb5d08b26c1b
-SIZE (tiff-4.0.4beta.tar.gz) = 2098962
+SHA256 (tiff-4.0.4.tar.gz) = 8cb1d90c96f61cdfc0bcf036acc251c9dbe6320334da941c7a83cfe1576ef890
+SIZE (tiff-4.0.4.tar.gz) = 2100766
Index: head/graphics/tiffgt/files/patch-Makefile.in
===================================================================
--- head/graphics/tiffgt/files/patch-Makefile.in	(revision 390280)
+++ head/graphics/tiffgt/files/patch-Makefile.in	(revision 390281)
@@ -1,31 +1,31 @@
---- Makefile.in.orig	2012-09-22 18:08:18.000000000 +0200
-+++ Makefile.in	2012-10-13 19:35:28.000000000 +0200
-@@ -375,7 +375,7 @@
+--- Makefile.in.orig	2015-06-21 19:07:53 UTC
++++ Makefile.in
+@@ -434,7 +434,7 @@ EXTRA_DIST = \
  
  dist_doc_DATA = $(docfiles)
  SUBDIRS = port libtiff tools build contrib test man html
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libtiff-4.pc
  all: all-recursive
  
-@@ -427,19 +427,6 @@
+@@ -485,19 +485,6 @@ distclean-libtool:
  	-rm -f libtool config.lt
  install-dist_docDATA: $(dist_doc_DATA)
  	@$(NORMAL_INSTALL)
 -	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
 -	if test -n "$$list"; then \
 -	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
 -	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
 -	fi; \
 -	for p in $$list; do \
 -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -	  echo "$$d$$p"; \
 -	done | $(am__base_list) | \
 -	while read files; do \
 -	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
 -	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
 -	done
  
  uninstall-dist_docDATA:
  	@$(NORMAL_UNINSTALL)