5 files changed, 17 insertions, 23 deletions

diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index fce7f670ed4c..bed9b01e559c 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tgif
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.5
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 		http://groups.yahoo.com/group/tgif4-announce/files/ \
@@ -11,7 +10,12 @@ MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 DISTNAME=	${PORTNAME}-QPL-${PORTVERSION}
 
 MAINTAINER=	bmc@clapper.org
-COMMENT=	An Xlib-based two-dimensional drawing tool and hyper-object browser
+COMMENT=	Xlib-based two-dimensional drawing tool and hyper-object browser
+
+LICENSE=	QPLv1
+LICENSE_NAME=	Q PUBLIC LICENSE v1.0
+LICENSE_FILE=	${WRKSRC}/LICENSE.QPL
+LICENSE_PERMS=	auto-accept
 
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
 
@@ -22,11 +26,7 @@ USES=		imake
 PORTDOCS=	HISTORY README
 USE_XORG=	x11 xext xt sm ice
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
-CFLAGS+=	${PTHREAD_CFLAGS}
-
-MAN1=		tgif.1
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -57,13 +57,11 @@ pre-configure:
 		) > ${WRKSRC}/Tgif.tmpl-freebsdports
 post-install:
 .for D in demo spice
-		${MKDIR} ${EXAMPLESDIR}/${D}
+		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${D}
 		cd ${WRKSRC}/${D:S/demo//} \
-			&& ${INSTALL_DATA} ${EXAMPLES.${D}} ${EXAMPLESDIR}/${D}
+			&& ${INSTALL_DATA} ${EXAMPLES.${D}} ${STAGEDIR}${EXAMPLESDIR}/${D}
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-		${MKDIR} ${DOCSDIR}
-		cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+		${MKDIR} ${STAGEDIR}${DOCSDIR}
+		cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/tgif/distinfo b/graphics/tgif/distinfo
index 3538883d6724..67f44d880a57 100644
--- a/graphics/tgif/distinfo
+++ b/graphics/tgif/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tgif-QPL-4.2.2.tar.gz) = 73405ce77f741e474cc7bcdf71dd556e1c48c70fb363e0a44aa6241811cd51a7
-SIZE (tgif-QPL-4.2.2.tar.gz) = 2972242
+SHA256 (tgif-QPL-4.2.5.tar.gz) = 2f24e9fecafae6e671739bd80691a06c9d032bdd1973ca164823e72ab1c567ba
+SIZE (tgif-QPL-4.2.5.tar.gz) = 3093619
diff --git a/graphics/tgif/files/patch-tgif.man b/graphics/tgif/files/patch-tgif.man
index 1c9eb4ca61f0..42ca15791645 100644
--- a/graphics/tgif/files/patch-tgif.man
+++ b/graphics/tgif/files/patch-tgif.man
@@ -4,8 +4,8 @@
  .\"
  .\"
  .\"
--.TH tgif n "Version 4.2 Patchlevel 2 and Above" "Tgif"
-+.TH tgif 1L "Version 4.2 Patchlevel 2 and Above" "Tgif"
+-.TH tgif n "Version 4.2 Patchlevel 3 and Above" "Tgif"
++.TH tgif 1L "Version 4.2 Patchlevel 3 and Above" "Tgif"
  .\"
  .SH NAME
  .\"
diff --git a/graphics/tgif/pkg-descr b/graphics/tgif/pkg-descr
index 6511fd12d18d..bb999a6dca33 100644
--- a/graphics/tgif/pkg-descr
+++ b/graphics/tgif/pkg-descr
@@ -10,10 +10,4 @@ encapsulated PostScript and XBM.
 Version 4 has a completely revamped 3-D user interface, as well as a host
 of new features.
 
-Tgif depends on the `netpbm' package, available from the `ports'
-collection.
-
-Tgif is written, maintained and enhanced by
-William Chia-Wei Cheng (bill.cheng@acm.org)
-
 WWW: http://bourbon.usc.edu:8001/tgif/
diff --git a/graphics/tgif/pkg-plist b/graphics/tgif/pkg-plist
index 0bda2a3e9a5d..895793ceafae 100644
--- a/graphics/tgif/pkg-plist
+++ b/graphics/tgif/pkg-plist
@@ -25,6 +25,7 @@ lib/X11/tgif/tangram.sym
 lib/X11/tgif/eq4.sym
 lib/X11/tgif/eq4-2x.sym
 lib/X11/tgif/eq4-2x-jpg.sym
+lib/X11/tgif/eq4-2x-nowin-jpg.sym
 lib/X11/tgif/eq4-ps2epsi.sym
 lib/X11/tgif/eq4-epstool.sym
 lib/X11/tgif/eq4xpm.sym
@@ -36,6 +37,7 @@ lib/X11/tgif/keys.obj
 lib/X11/tgif/Copyright
 lib/X11/tgif/LICENSE.QPL
 @dirrm lib/X11/tgif
+man/man1/tgif.1.gz
 %%EXAMPLESDIR%%/demo/an-sr-flip-flop.obj
 %%EXAMPLESDIR%%/demo/example.tex
 %%EXAMPLESDIR%%/demo/fonts.obj