Update to 4.2.2. Changes since 4.1.45 can be found at:

	http://bourbon.usc.edu/tgif/relnotes/v4.2.0.html
	http://bourbon.usc.edu/tgif/relnotes/v4.2.1.html
	http://bourbon.usc.edu/tgif/relnotes/v4.2.2.html

Approved by:	maintainer

7 files changed, 53 insertions, 32 deletions

diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 44f962a2ba50..26eee78a9ff9 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	tgif
-PORTVERSION=	4.1.45
-PORTREVISION=	8
+PORTVERSION=	4.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 		http://groups.yahoo.com/group/tgif4-announce/files/ \
 		SF
-
 DISTNAME=	${PORTNAME}-QPL-${PORTVERSION}
 
 MAINTAINER=	bmc@clapper.org
@@ -26,6 +24,8 @@ OPTIONS=	NLS "Enable native language support" on \
 USE_IMAKE=	yes
 PORTDOCS=	HISTORY README
 USE_XORG=	x11 xext xt sm ice
+MAKE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 MAN1=		tgif.1
 
@@ -50,9 +50,8 @@ EXAMPLES.spice=	README BZ.mod DN.mod DN.sym MN.mod MN.sym MP.mod MP.sym \
 		resistor.0tc.sym resistor.2tc.sym resistor.h.2tc.sym \
 		resistor.h.sym resistor.sym
 
-post-extract:
-		${CP} -f ${WRKDIR}/${DISTNAME}/Tgif.tmpl-freebsd \
-		      ${WRKSRC}/Tgif.tmpl
+pre-configure:
+		cd ${WRKSRC} && ${INSTALL_DATA} Tgif.tmpl-freebsd Tgif.tmpl
 		( for D in ${IMAKEDEFINES}; do \
 			${ECHO_CMD} "#define $${D}"; \
 		  done; \
diff --git a/graphics/tgif/distinfo b/graphics/tgif/distinfo
index 035143162009..3fa4dedf074d 100644
--- a/graphics/tgif/distinfo
+++ b/graphics/tgif/distinfo
@@ -1,3 +1,3 @@
-MD5 (tgif-QPL-4.1.45.tar.gz) = 5c1eba8291385c630b8099fa9b042455
-SHA256 (tgif-QPL-4.1.45.tar.gz) = f18d503cbb15917e95667f8be90d6c1966139b87bcd098431861293bfa62880c
-SIZE (tgif-QPL-4.1.45.tar.gz) = 2198909
+MD5 (tgif-QPL-4.2.2.tar.gz) = 8ec70553a1526fb6ee65cd4e81593363
+SHA256 (tgif-QPL-4.2.2.tar.gz) = 73405ce77f741e474cc7bcdf71dd556e1c48c70fb363e0a44aa6241811cd51a7
+SIZE (tgif-QPL-4.2.2.tar.gz) = 2972242
diff --git a/graphics/tgif/files/patch-Tgif.tmpl b/graphics/tgif/files/patch-Tgif.tmpl
deleted file mode 100644
index 4c15ff814036..000000000000
--- a/graphics/tgif/files/patch-Tgif.tmpl
+++ /dev/null
@@ -1,8 +0,0 @@
---- Tgif.tmpl.orig	Tue May 22 17:10:16 2007
-+++ Tgif.tmpl	Tue May 22 17:13:48 2007
-@@ -59,3 +59,5 @@
- XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
- XCOMM SYS_LIBRARIES	= -ldl -lm
- SYS_LIBRARIES	= -lm
-+
-+#include "Tgif.tmpl-freebsdports"
diff --git a/graphics/tgif/files/patch-Tgif.tmpl-freebsd b/graphics/tgif/files/patch-Tgif.tmpl-freebsd
new file mode 100644
index 000000000000..2870b41179b3
--- /dev/null
+++ b/graphics/tgif/files/patch-Tgif.tmpl-freebsd
@@ -0,0 +1,10 @@
+--- Tgif.tmpl-freebsd.orig	2009-11-17 09:57:20.000000000 +0900
++++ Tgif.tmpl-freebsd	2010-08-22 01:37:01.000000000 +0900
+@@ -54,4 +54,6 @@
+ LOCAL_LIBRARIES	= $(XLIB)
+ XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
+ XCOMM SYS_LIBRARIES	= -ldl -lm -lz
+-SYS_LIBRARIES	= -lm -lz
++SYS_LIBRARIES	= -lm -lz ${PTHREAD_LIBS}
++
++#include "Tgif.tmpl-freebsdports"
diff --git a/graphics/tgif/files/patch-tgif.man b/graphics/tgif/files/patch-tgif.man
index 6376be445bc6..1c9eb4ca61f0 100644
--- a/graphics/tgif/files/patch-tgif.man
+++ b/graphics/tgif/files/patch-tgif.man
@@ -1,11 +1,11 @@
---- tgif.man.orig	Wed Jun 14 07:30:00 2006
-+++ tgif.man	Tue May 22 17:05:48 2007
+--- tgif.man.orig	2009-11-17 09:57:19.000000000 +0900
++++ tgif.man	2010-08-22 01:12:28.000000000 +0900
 @@ -8,7 +8,7 @@
  .\"
  .\"
  .\"
--.TH tgif n "Version 4.1 Patchlevel 45 and Above" "Tgif"
-+.TH tgif 1L "Version 4.1 Patchlevel 45 and Above" "Tgif"
+-.TH tgif n "Version 4.2 Patchlevel 2 and Above" "Tgif"
++.TH tgif 1L "Version 4.2 Patchlevel 2 and Above" "Tgif"
  .\"
  .SH NAME
  .\"
diff --git a/graphics/tgif/pkg-plist b/graphics/tgif/pkg-plist
index c6efd8a93d33..e208b8a002bf 100644
--- a/graphics/tgif/pkg-plist
+++ b/graphics/tgif/pkg-plist
@@ -1,20 +1,42 @@
 @comment $FreeBSD$
 bin/tgif
-lib/X11/tgif/Copyright
-lib/X11/tgif/LICENSE.QPL
-lib/X11/tgif/eq4-2x.sym
-lib/X11/tgif/eq4-epstool.sym
-lib/X11/tgif/eq4-lyx-ps2epsi.sym
-lib/X11/tgif/eq4-ps2epsi.sym
-lib/X11/tgif/eq4.sym
-lib/X11/tgif/eq4xpm.sym
+lib/X11/tgif/hicolor/22x22/apps/tgificon.png
+@dirrm lib/X11/tgif/hicolor/22x22/apps
+@dirrm lib/X11/tgif/hicolor/22x22
+lib/X11/tgif/hicolor/32x32/apps/tgificon.png
+@dirrm lib/X11/tgif/hicolor/32x32/apps
+@dirrm lib/X11/tgif/hicolor/32x32
+lib/X11/tgif/hicolor/48x48/apps/tgificon.png
+@dirrm lib/X11/tgif/hicolor/48x48/apps
+@dirrm lib/X11/tgif/hicolor/48x48
+lib/X11/tgif/hicolor/64x64/apps/tgificon.png
+@dirrm lib/X11/tgif/hicolor/64x64/apps
+@dirrm lib/X11/tgif/hicolor/64x64
+lib/X11/tgif/hicolor/128x128/apps/tgificon.png
+@dirrm lib/X11/tgif/hicolor/128x128/apps
+@dirrm lib/X11/tgif/hicolor/128x128
+@dirrm lib/X11/tgif/hicolor
 lib/X11/tgif/tgif.Xdefaults
 lib/X11/tgif/tgificon.eps
 lib/X11/tgif/tgificon.obj
 lib/X11/tgif/tgificon.xbm
 lib/X11/tgif/tgificon.xpm
+lib/X11/tgif/tgif.gif
 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-ps2epsi.sym
+lib/X11/tgif/eq4-epstool.sym
+lib/X11/tgif/eq4xpm.sym
+lib/X11/tgif/eq4-lyx-ps2epsi.sym
+lib/X11/tgif/eq4xpm-land.sym
+lib/X11/tgif/eq4png.sym
+lib/X11/tgif/eq4jpg.sym
 lib/X11/tgif/keys.obj
+lib/X11/tgif/Copyright
+lib/X11/tgif/LICENSE.QPL
+@dirrm lib/X11/tgif
 %%EXAMPLESDIR%%/demo/an-sr-flip-flop.obj
 %%EXAMPLESDIR%%/demo/example.tex
 %%EXAMPLESDIR%%/demo/fonts.obj
@@ -53,4 +75,3 @@ lib/X11/tgif/keys.obj
 %%NLS%%share/locale/ja/LC_MESSAGES/tgif.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/tgif.mo
 @dirrm %%EXAMPLESDIR%%
-@dirrm lib/X11/tgif
diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 4f2f82601beb..0b1c58a2313a 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tgif-resource
-PORTVERSION=	4.1.45
-PORTREVISION=	8
+PORTVERSION=	4.2.2
 CATEGORIES=	japanese graphics
 MASTER_SITES=	# empty
 DISTFILES=	# empty