diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 3b51e2c79d5..df85c5ffe7c 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,24 +1,23 @@
-# $OpenBSD: Makefile,v 1.10 2000/06/02 18:30:45 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2000/09/10 14:10:41 jakob Exp $
 
-BROKEN=	"All sorts of mktemp warnings, most of them genuine"
-
-DISTNAME=	tgif-4.1.27
+DISTNAME=	tgif-4.1.39
 CATEGORIES=	graphics
-NEED_VERSION=	 1.230
+NEED_VERSION=	1.310
 MASTER_SITES=	ftp://bourbon.cs.umd.edu/pub/tgif/ \
 		ftp://ftp.cs.ucla.edu/pub/tgif/
 
+HOMEPAGE=	http://bourbon.cs.umd.edu:8001/tgif/
+
+MAINTAINER=	jakob@openbsd.org
+
 PERMIT_PACKAGE_CDROM=	no
 PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	no
 PERMIT_DISTFILES_FTP=	yes
 
-MAINTAINER=	jakob@openbsd.org
-HOMEPAGE=	http://bourbon.cs.umd.edu:8001/tgif/
-
 RUN_DEPENDS=	giftopnm::graphics/netpbm
 
-USE_IMAKE=	Yes
+CONFIGURE_STYLE=	imake
 
 TGIFDOC=	${PREFIX}/share/doc/tgif
 DEMO_FILES=	an-sr-flip-flop.obj launch-demo-1.obj \
@@ -27,7 +26,7 @@ READMES=	Copyright HISTORY README
 
 post-extract:
 	@rm -f ${WRKDIR}/${DISTNAME}/Tgif.tmpl
-	@cp ${WRKDIR}/${DISTNAME}/Tgif.tmpl-freebsd \
+	@cp ${WRKDIR}/${DISTNAME}/Tgif.tmpl-openbsd \
 		${WRKDIR}/${DISTNAME}/Tgif.tmpl
 
 post-install:
diff --git a/graphics/tgif/files/md5 b/graphics/tgif/files/md5
index b7ff016fc36..3ab075a2ccd 100644
--- a/graphics/tgif/files/md5
+++ b/graphics/tgif/files/md5
@@ -1,3 +1,3 @@
-MD5 (tgif-4.1.27.tar.gz) = a1f11d3c250e5cff876e71afe42db03f
-RMD160 (tgif-4.1.27.tar.gz) = 1f5cabe98533f0c0aceb40944cf0342f1c748741
-SHA1 (tgif-4.1.27.tar.gz) = 256dd75e10181b744f6bf86d506b49abd0e40b88
+MD5 (tgif-4.1.39.tar.gz) = 46dbdc5c189a8a644d34158b2c92e627
+RMD160 (tgif-4.1.39.tar.gz) = 154f0bc874331a677d175929fb7ec13704b89b57
+SHA1 (tgif-4.1.39.tar.gz) = 79138a1aa29067fd48257594c7f38e2a70aefba6
diff --git a/graphics/tgif/patches/patch-Tgif.tmpl b/graphics/tgif/patches/patch-Tgif.tmpl
new file mode 100644
index 00000000000..a5c2e15db98
--- /dev/null
+++ b/graphics/tgif/patches/patch-Tgif.tmpl
@@ -0,0 +1,13 @@
+--- Tgif.tmpl.orig	Mon Aug 21 18:44:44 2000
++++ Tgif.tmpl	Mon Aug 21 18:48:11 2000
+@@ -59,7 +59,9 @@
+                   -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\" \@@\
+                   -DNETLIST_FILE_EXT=\"net\" -DCOMP_FILE_EXT=\"cmp\"
+ MISCDEFINES	= -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT \@@\
+-                  -D_USE_PS_ADOBE_STRING=\"3.0/3.0\" -D_DONT_USE_MKTEMP
++                  -D_USE_PS_ADOBE_STRING=\"3.0/3.0\" -D_DONT_USE_MKTEMP \@@\
++		  -DUSE_XAPPLRESDIR \@@\
++		  -DXAPPLOADDIR_DEF=\"$(LIBDIR)/app-defaults\"
+ MOREDEFINES	=
+ 
+ XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/graphics/tgif/patches/patch-ab b/graphics/tgif/patches/patch-ab
deleted file mode 100644
index 81976d008cd..00000000000
--- a/graphics/tgif/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
---- Tgif.tmpl.orig	Wed Nov 10 13:02:37 1999
-+++ Tgif.tmpl	Wed Nov 10 13:04:28 1999
-@@ -58,9 +58,11 @@
-                   -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \@@\
-                   -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\"
- MISCDEFINES	= -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT \@@\
--                  -D_USE_PS_ADOBE_STRING=\"3.0/3.0\"
--MOREDEFINES	=
--
-+                  -D_USE_PS_ADOBE_STRING=\"3.0/3.0\" \@@\
-+                  -DUSE_XAPPLRESDIR \@@\
-+                  -DXAPPLOADDIR_DEF=\"$(LIBDIR)/app-defaults\"
-+MOREDEFINES	= -D_NO_DL_SUPPORT
-+ 
- XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- XCOMM Please see Imakefile for more defines to be added to MOREDEFINES above
- XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/graphics/tgif/patches/patch-aa b/graphics/tgif/patches/patch-tgif.man
similarity index 53%
rename from graphics/tgif/patches/patch-aa
rename to graphics/tgif/patches/patch-tgif.man
index ec5bbdcefab..21cf666e5d0 100644
--- a/graphics/tgif/patches/patch-aa
+++ b/graphics/tgif/patches/patch-tgif.man
@@ -4,8 +4,8 @@
  .\"
  .\"
  .\"
--.TH tgif n "Version 4.1 Patchlevel 27 and Above" "Tgif"
-+.TH tgif 1L "Version 4.1 Patchlevel 27 and Above" "Tgif"
+-.TH tgif n "Version 4.1 Patchlevel 39 and Above" "Tgif"
++.TH tgif 1L "Version 4.1 Patchlevel 39 and Above" "Tgif"
  .\"
  .SH NAME
  .\"