diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index b1639511ac73..cac9478f36c7 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -3,11 +3,11 @@
 # Date created:         3 May 1999
 # Whom:                 one@netlab.is.tsukuba.ac.jp
 #
-# $Id: Makefile,v 1.2 1999/05/06 09:34:40 taoka Exp $
+# $Id: Makefile,v 1.3 1999/05/29 04:39:26 steve Exp $
 #
 
-DISTNAME=	tgif-4.1.14
-PKGNAME=	tgif-nls-4.1.14
+DISTNAME=	tgif-4.1.15
+PKGNAME=	tgif-nls-4.1.15
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.cs.umd.edu/pub/tgif/ \
 		ftp://ftp.cs.ucla.edu/pub/tgif/
@@ -18,19 +18,13 @@ LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
 
 USE_IMAKE=	yes
+XMKMF=		LOCALBASE=${LOCALBASE} xmkmf -a
+
 MAN1=		tgif.1
 
-post-extract:
+pre-patch:
 		@cd ${WRKSRC}; ${RM} -f Tgif.tmpl; \
-		${SED} -e "s#/usr/share/locale#${PREFIX}/share/locale#" \
-			Tgif.tmpl-freebsd > Tgif.tmpl; \
-		${ECHO} "EXTRA_INCLUDES += -I${LOCALBASE}/include" \
-			>> Tgif.tmpl; \
-		${ECHO} "EXTRA_LIBRARIES += -L${LOCALBASE}/lib -lintl" \
-			>> Tgif.tmpl; \
-		${MV} po/Po.tmpl po/Po.tmpl.orig; \
-		${SED} -e "s#/usr/share/locale#${PREFIX}/share/locale#" \
-			po/Po.tmpl.orig > po/Po.tmpl; \
+		${CP} Tgif.tmpl-freebsd Tgif.tmpl
 
 post-patch:
 		@cd ${WRKSRC}; \
diff --git a/graphics/tgif-nls/distinfo b/graphics/tgif-nls/distinfo
index 283c81ce7db0..ce35dfeb2333 100644
--- a/graphics/tgif-nls/distinfo
+++ b/graphics/tgif-nls/distinfo
@@ -1 +1 @@
-MD5 (tgif-4.1.14.tar.gz) = aff6c3dbb7d854bd69409ffc403c6b15
+MD5 (tgif-4.1.15.tar.gz) = 3656598fe1f7963ba581fd9c821da6e5
diff --git a/graphics/tgif-nls/files/patch-aa b/graphics/tgif-nls/files/patch-aa
index e32f99ba352c..4a2d9252ae25 100644
--- a/graphics/tgif-nls/files/patch-aa
+++ b/graphics/tgif-nls/files/patch-aa
@@ -1,11 +1,11 @@
---- tgif.man.orig	Wed May 26 01:19:41 1999
-+++ tgif.man	Wed May 26 01:20:08 1999
+--- tgif.man.orig	Sun May 30 05:28:59 1999
++++ tgif.man	Sun May 30 05:29:12 1999
 @@ -8,7 +8,7 @@
  .\"
  .\"
  .\"
--.TH tgif n "Version 4.1 Patchlevel 10 and Above" "Tgif"
-+.TH tgif 1L "Version 4.1 Patchlevel 10 and Above" "Tgif"
+-.TH tgif n "Version 4.1 Patchlevel 15 and Above" "Tgif"
++.TH tgif 1L "Version 4.1 Patchlevel 15 and Above" "Tgif"
  .\"
  .SH NAME
  .\"
diff --git a/graphics/tgif-nls/files/patch-ab b/graphics/tgif-nls/files/patch-ab
index eefef3151d3c..c56dc010db3b 100644
--- a/graphics/tgif-nls/files/patch-ab
+++ b/graphics/tgif-nls/files/patch-ab
@@ -1,5 +1,5 @@
---- Tgif.tmpl.orig	Wed May 26 01:34:43 1999
-+++ Tgif.tmpl	Wed May 26 01:39:52 1999
+--- Tgif.tmpl.orig	Sun May 30 05:32:54 1999
++++ Tgif.tmpl	Sun May 30 05:33:12 1999
 @@ -41,6 +41,15 @@
  XIMPDEFINES      =
  #endif
@@ -16,7 +16,16 @@
  PROGRAMS	= tgif XCOMM prtgif frontend11.o testdrive
  XCOMM CDEBUGFLAGS= -g -Wall
  XCOMM INSTPGMFLAGS= -s
-@@ -58,16 +67,16 @@
+@@ -48,7 +57,7 @@
+ XCOMM MANPATH	= /u/halfmoon/man
+ XCOMM TGIFDIR	= /u/halfmoon/lib/X11/tgif
+ TGIFDIR		= $(LIBDIR)/tgif
+-LOCALEDIR	= /usr/share/locale
++LOCALEDIR	= $(PREFIX)/share/locale
+ DIRDEFINES	= -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\
+                   -DLOCALEDIR=\"$(LOCALEDIR)\" \@@\
+                   -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\
+@@ -58,14 +67,16 @@
                    -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
@@ -35,5 +44,15 @@
  XCOMM SYS_LIBRARIES	= -ldl -lm
 -SYS_LIBRARIES	= -lm
 +SYS_LIBRARIES	= -lm -lcompat
- EXTRA_INCLUDES += -I/usr/local/include
- EXTRA_LIBRARIES += -L/usr/local/lib -lintl
++EXTRA_INCLUDES	+= -I$(LOCALBASE)/include
++EXTRA_LIBRARIES	+= -L$(LOCALBASE)/lib -lintl
+
+--- po/Po.tmpl.orig	Sun Apr  4 03:27:53 1999
++++ po/Po.tmpl	Sun May 30 05:33:12 1999
+@@ -8,5 +8,5 @@
+ MKINSTALLDIRS	= install -d
+ 
+ DESTDIR		=
+-SYSNLSDIR	= /usr/share/locale
++SYSNLSDIR	= $(PREFIX)/share/locale
+ NLSDIR		= $(DESTDIR)$(SYSNLSDIR)