Rename x11-*/ patch-xy patches to reflect the files they modify.

Finally, this is the last of it.

8 files changed, 11 insertions, 19 deletions

diff --git a/x11-fonts/bdfresize/files/patch-aa b/x11-fonts/bdfresize/files/patch-charresize.c
index 779f112a7426..779f112a7426 100644
--- a/x11-fonts/bdfresize/files/patch-aa
+++ b/x11-fonts/bdfresize/files/patch-charresize.c
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 9ae683b66a79..435ae80da9a6 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	http://www.brama.com/compute/unix/
 PKGNAMEPREFIX=	koi8-u-
 PKGNAMESUFFIX=	-x11
 DISTNAME=	x-koi8u
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Ukrainian KOI8 fonts for X11R6 (koi8-u)
@@ -18,7 +17,7 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USES=		perl5
+USES=		perl5 tar:tgz
 USE_PERL5=	build
 USE_XORG=	x11
 NO_WRKSUBDIR=	yes
@@ -30,9 +29,6 @@ post-patch:
 	    -e 's|DESTDIR =.*|MDESTDIR=${STAGEDIR}${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \
 	${WRKSRC}/Makefile
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 # This will  allow one to  use just this  fonts for both,  the Ukrainian
 # koi8-u and the Russian koi8-r encodings. Since koi8-u is a superset of
 # koi8-r, there  is not need to  load both sets into  X-server, but some
diff --git a/x11-fonts/geminifonts/files/patch-gz b/x11-fonts/geminifonts/files/patch-Makefile
index a5589cd13926..a5589cd13926 100644
--- a/x11-fonts/geminifonts/files/patch-gz
+++ b/x11-fonts/geminifonts/files/patch-Makefile
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 467d33fc9b9c..5cbc83a05f12 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -59,16 +59,14 @@ do-build:
 
 
 do-install:
-	(cd ${WRKSRC}; \
-	  ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}; \
-	  for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
-	  	${INSTALL_DATA} $$dir/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTSDIR} ; \
-	  done; \
-	  ${MKDIR} ${STAGEDIR}${PREFIX}/${T1_FONTSDIR}; \
-	  ${INSTALL_DATA} Type1/*.* ${STAGEDIR}${PREFIX}/${T1_FONTSDIR} ; \
-	  ${MKDIR} ${STAGEDIR}${PREFIX}/${TT_FONTSDIR}; \
-	  ${INSTALL_DATA} TrueType/*.ttf ${STAGEDIR}${PREFIX}/${TT_FONTSDIR} ; \
-	)
+.for d in ${FONTSDIR} ${T1_FONTSDIR} ${TT_FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/$d
+.endfor
+	for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$dir/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTSDIR}; \
+	done
+	${INSTALL_DATA} Type1/*.* ${STAGEDIR}${PREFIX}/${T1_FONTSDIR}
+	${INSTALL_DATA} TrueType/*.ttf ${STAGEDIR}${PREFIX}/${TT_FONTSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/Emacs.ap ${WRKSRC}/NEWS \
 		${STAGEDIR}${DOCSDIR}
diff --git a/x11-fonts/intlfonts/files/patch-aa b/x11-fonts/intlfonts/files/patch-Chinese__taipei16.bdf
index 396f53b7b1c3..396f53b7b1c3 100644
--- a/x11-fonts/intlfonts/files/patch-aa
+++ b/x11-fonts/intlfonts/files/patch-Chinese__taipei16.bdf
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index cf919d516064..66633c9c1e15 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -25,11 +25,9 @@ OPTIONS_DEFAULT=X11
 X11_RUN_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 			${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-.include <bsd.port.options.mk>
-
 do-install:
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed \
-		${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed \
+		${STAGEDIR}${PREFIX}/bin)
 	${INSTALL_MAN} ${WRKSRC}/type1inst.man \
 		${STAGEDIR}${PREFIX}/man/man1/type1inst.1
 
diff --git a/x11-fonts/p5-type1inst/files/patch-aa b/x11-fonts/p5-type1inst/files/patch-type1inst.man
index fb08866d78aa..fb08866d78aa 100644
--- a/x11-fonts/p5-type1inst/files/patch-aa
+++ b/x11-fonts/p5-type1inst/files/patch-type1inst.man
diff --git a/x11-fonts/tkfont/files/patch-aa b/x11-fonts/tkfont/files/patch-tkfont
index 7ba658346e40..7ba658346e40 100644
--- a/x11-fonts/tkfont/files/patch-aa
+++ b/x11-fonts/tkfont/files/patch-tkfont