Update to 4.1.43 [1]

Utilize DOCSDIR and EXAMPLESDIR macros [2]
Fix pkg-plist, when port installs with NOPORTDOCS macro [2]
Sort pkg-plist [2]

Submitted by:	AMAKAWA Shuhei <sa264@cam.ac.uk> [1],
		osa [2]
Approved by:	maintainer (timeout > 2 months)
PR:		56289

4 files changed, 61 insertions, 74 deletions

diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index 0af9e37775a8..55ee5bdad215 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tgif
-PORTVERSION=	4.1.42
-PORTREVISION=	1
+PORTVERSION=	4.1.43
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -22,11 +21,10 @@ LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
 
 USE_IMAKE=	yes
+USE_REINPLACE=	yes
 MAN1=		tgif.1
 
 .if !defined(NOPORTDOCS)
-TGIFDOC=	${PREFIX}/share/doc/tgif
-TGIFDEMO=	${PREFIX}/share/examples/tgif
 DEMO_FILES=	an-sr-flip-flop.obj launch-demo-1.obj \
 		fonts.obj launch-demo.obj keys.obj slide-demo.obj example.tex
 READMES=	Copyright HISTORY LICENSE.QPL README
@@ -42,24 +40,23 @@ post-extract:
 		${CP} ${WRKDIR}/${DISTNAME}/Tgif.tmpl-freebsd \
 		      ${WRKDIR}/${DISTNAME}/Tgif.tmpl
 
-pre-install:
-		(cd ${WRKSRC} ;\
-		  ${MV} tgif.Xdefaults tgif.Xdefaults.org; \
-		  ${SED} -e "s#/usr/local#${PREFIX}#" \
-		         -e "s#/usr/share/lib#${PREFIX}/share/locale#" \
-		         tgif.Xdefaults.org > tgif.Xdefaults \
-		)
+post-patch:
+		${REINPLACE_CMD} -e 's|.TH tgif n|.TH tgif 1L|' \
+			${WRKSRC}/tgif.man
+		${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
+			s|/usr/share/lib|${PREFIX}/share/locale|' \
+			${WRKSRC}/tgif.Xdefaults
 
 post-install:
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${TGIFDOC}; ${MKDIR} ${TGIFDEMO}
+		${MKDIR} ${DOCSDIR}; ${MKDIR} ${EXAMPLESDIR}
 		(cd ${WRKSRC} ;\
-		  ${INSTALL_DATA} ${DEMO_FILES} ${TGIFDEMO} ;\
-		  ${INSTALL_DATA} ${READMES} ${TGIFDOC} \
+		  ${INSTALL_DATA} ${DEMO_FILES} ${EXAMPLESDIR} ;\
+		  ${INSTALL_DATA} ${READMES} ${DOCSDIR} \
 		)
-		${MKDIR} ${TGIFDEMO}/spice
+		${MKDIR} ${EXAMPLESDIR}/spice
 		(cd ${WRKSRC}/spice ;\
-		  ${INSTALL_DATA} ${SPICE_FILES} ${TGIFDEMO}/spice \
+		  ${INSTALL_DATA} ${SPICE_FILES} ${EXAMPLESDIR}/spice \
 		)
 .endif
 		${LN} -fs tgif ${PREFIX}/bin/tgif-nls
diff --git a/graphics/tgif-nls/distinfo b/graphics/tgif-nls/distinfo
index 2d56bc59aeb4..94e3770e680f 100644
--- a/graphics/tgif-nls/distinfo
+++ b/graphics/tgif-nls/distinfo
@@ -1 +1 @@
-MD5 (tgif-QPL-4.1.42.tar.gz) = 83b1cd01b1570fbf71ea5994af87f42e
+MD5 (tgif-QPL-4.1.43.tar.gz) = 88ba670d90ad61f86d1c9d765e97e0d1
diff --git a/graphics/tgif-nls/files/patch-aa b/graphics/tgif-nls/files/patch-aa
deleted file mode 100644
index 43d7445e03d5..000000000000
--- a/graphics/tgif-nls/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- tgif.man.orig	Mon Sep  6 03:41:31 1999
-+++ tgif.man	Sat Sep 25 22:23:22 1999
-@@ -8,7 +8,7 @@
- .\"
- .\"
- .\"
--.TH tgif n "Version 4.1 Patchlevel 42 and Above" "Tgif"
-+.TH tgif 1L "Version 4.1 Patchlevel 42 and Above" "Tgif"
- .\"
- .SH NAME
- .\"
diff --git a/graphics/tgif-nls/pkg-plist b/graphics/tgif-nls/pkg-plist
index 6e950ab4861b..289eb60282c1 100644
--- a/graphics/tgif-nls/pkg-plist
+++ b/graphics/tgif-nls/pkg-plist
@@ -2,58 +2,59 @@ bin/tgif
 bin/tgif-nls
 lib/X11/tgif/Copyright
 lib/X11/tgif/LICENSE.QPL
-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/tangram.sym
 lib/X11/tgif/eq4.sym
 lib/X11/tgif/eq4-2x.sym
-lib/X11/tgif/eq4-ps2epsi.sym
 lib/X11/tgif/eq4-epstool.sym
+lib/X11/tgif/eq4-lyx-ps2epsi.sym
+lib/X11/tgif/eq4-ps2epsi.sym
 lib/X11/tgif/eq4xpm.sym
 lib/X11/tgif/keys.obj
-%%PORTDOCS%%share/doc/tgif/Copyright
-%%PORTDOCS%%share/doc/tgif/HISTORY
-%%PORTDOCS%%share/doc/tgif/LICENSE.QPL
-%%PORTDOCS%%share/doc/tgif/README
-share/examples/tgif/an-sr-flip-flop.obj
-share/examples/tgif/example.tex
-share/examples/tgif/fonts.obj
-share/examples/tgif/keys.obj
-share/examples/tgif/launch-demo.obj
-share/examples/tgif/launch-demo-1.obj
-share/examples/tgif/slide-demo.obj
-share/examples/tgif/spice/BZ.mod
-share/examples/tgif/spice/DN.mod
-share/examples/tgif/spice/DN.sym
-share/examples/tgif/spice/MN.mod
-share/examples/tgif/spice/MN.sym
-share/examples/tgif/spice/MP.mod
-share/examples/tgif/spice/MP.sym
-share/examples/tgif/spice/README
-share/examples/tgif/spice/SN.mod
-share/examples/tgif/spice/SN.sym
-share/examples/tgif/spice/SP.mod
-share/examples/tgif/spice/SP.sym
-share/examples/tgif/spice/capacitor.sym
-share/examples/tgif/spice/connection.sym
-share/examples/tgif/spice/demo.obj
-share/examples/tgif/spice/gauge.sym
-share/examples/tgif/spice/ground.sym
-share/examples/tgif/spice/in.sym
-share/examples/tgif/spice/out.sym
-share/examples/tgif/spice/port.sym
-share/examples/tgif/spice/resistor.0tc.sym
-share/examples/tgif/spice/resistor.2tc.sym
-share/examples/tgif/spice/resistor.h.2tc.sym
-share/examples/tgif/spice/resistor.h.sym
-share/examples/tgif/spice/resistor.sym
+lib/X11/tgif/tangram.sym
+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
+%%PORTDOCS%%%%DOCSDIR%%/Copyright
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.QPL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/an-sr-flip-flop.obj
+%%PORTDOCS%%%%EXAMPLESDIR%%/example.tex
+%%PORTDOCS%%%%EXAMPLESDIR%%/fonts.obj
+%%PORTDOCS%%%%EXAMPLESDIR%%/keys.obj
+%%PORTDOCS%%%%EXAMPLESDIR%%/launch-demo.obj
+%%PORTDOCS%%%%EXAMPLESDIR%%/launch-demo-1.obj
+%%PORTDOCS%%%%EXAMPLESDIR%%/slide-demo.obj
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/BZ.mod
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/DN.mod
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/DN.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/MN.mod
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/MN.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/MP.mod
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/MP.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/SN.mod
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/SN.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/SP.mod
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/SP.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/capacitor.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/connection.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/demo.obj
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/gauge.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/ground.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/in.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/out.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/port.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/resistor.0tc.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/resistor.2tc.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/resistor.h.2tc.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/resistor.h.sym
+%%PORTDOCS%%%%EXAMPLESDIR%%/spice/resistor.sym
 share/locale/fr/LC_MESSAGES/tgif.mo
 share/locale/ja/LC_MESSAGES/tgif.mo
 share/locale/ru/LC_MESSAGES/tgif.mo
-%%PORTDOCS%%@dirrm share/doc/tgif
-@dirrm share/examples/tgif/spice
-@dirrm share/examples/tgif
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/spice
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/X11/tgif