Convert to USES=fonts

Remove useless subdirectories
Remove useless options

2 files changed, 45 insertions, 83 deletions

diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile
index 2eec1aa4a230..7ef86817c899 100644
--- a/arabic/ae_fonts_ttf/Makefile
+++ b/arabic/ae_fonts_ttf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ae_fonts1_ttf
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	arabic x11-fonts
 MASTER_SITES=	SF/arabeyes/Fonts/ae_fonts
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -13,47 +13,15 @@ COMMENT=	Collection of TrueType Arabic fonts
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
-
-USES=		tar:bzip2
+USES=		fonts tar:bzip2
 WRKSRC=		${WRKDIR}/ae_fonts1-${PORTVERSION}
 SUB_FILES=	pkg-message
+NO_BUILD=	yes
 
-OPTIONS_DEFINE=	AAHS AGA FS KASR MCS SHMOOKH
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-
-AAHS_DESC=	Install the AAHS font set
-AGA_DESC=	Install the AGA font set
-FS_DESC=	Install the FS font set
-KASR_DESC=	Install the Kasr font set
-MCS_DESC=	Install the MCS font set
-SHMOOKH_DESC=	Install the Shmookh font set
-
-.include <bsd.port.options.mk>
-
-.for font in AAHS AGA FS MCS
-.  if ${PORT_OPTIONS:M${font}}
-FONTS+=	${font}
-.  endif
-.endfor
-
-.for font in KASR SHMOOKH
-.  if ${PORT_OPTIONS:M${font}}
-FONTS+=	${font:C/(.).*/\1/}${font:tl:C/.//}
-.  endif
-.endfor
-
-do-build:
-.for font in ${FONTS}
-	cd ${WRKSRC} && ttmkfdir -c -d ${WRKSRC}/${font} > \
-		${WRKSRC}/${font}/fonts.dir
-.endfor
+FONTNAME=	ae_fonts1
 
 do-install:
-.for font in ${FONTS}
-	@${MKDIR} ${STAGEDIR}/${PREFIX}/lib/X11/fonts/ae_fonts1/${font}
-	${INSTALL_DATA} ${WRKSRC}/${font}/* \
-		${STAGEDIR}/${PREFIX}/lib/X11/fonts/ae_fonts1/${font}
-.endfor
+	@${MKDIR} ${STAGEDIR}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*/* ${STAGEDIR}/${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/arabic/ae_fonts_ttf/pkg-plist b/arabic/ae_fonts_ttf/pkg-plist
index 178eaab87b39..f9fbf79b9abd 100644
--- a/arabic/ae_fonts_ttf/pkg-plist
+++ b/arabic/ae_fonts_ttf/pkg-plist
@@ -1,45 +1,39 @@
-lib/X11/fonts/ae_fonts1/AAHS/fonts.dir
-lib/X11/fonts/ae_fonts1/AAHS/ae_Cortoba.ttf
-lib/X11/fonts/ae_fonts1/AAHS/ae_Nagham.ttf
-lib/X11/fonts/ae_fonts1/AAHS/ae_Ostorah.ttf
-lib/X11/fonts/ae_fonts1/AGA/fonts.dir
-lib/X11/fonts/ae_fonts1/AGA/ae_Dimnah.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Furat.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Granada.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Kayrawan.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Mashq.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Mashq_bold.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Nada.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Petra.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Rasheeq_bold.ttf
-lib/X11/fonts/ae_fonts1/AGA/ae_Sindibad.ttf
-lib/X11/fonts/ae_fonts1/FS/fonts.dir
-lib/X11/fonts/ae_fonts1/FS/ae_Arab.ttf
-lib/X11/fonts/ae_fonts1/FS/ae_Graph.ttf
-lib/X11/fonts/ae_fonts1/FS/ae_Japan.ttf
-lib/X11/fonts/ae_fonts1/FS/ae_Jet.ttf
-lib/X11/fonts/ae_fonts1/FS/ae_Metal.ttf
-lib/X11/fonts/ae_fonts1/FS/ae_Nice.ttf
-lib/X11/fonts/ae_fonts1/FS/ae_Salem.ttf
-lib/X11/fonts/ae_fonts1/FS/ae_Shado.ttf
-lib/X11/fonts/ae_fonts1/Kasr/fonts.dir
-lib/X11/fonts/ae_fonts1/Kasr/ae_AlArabiya.ttf
-lib/X11/fonts/ae_fonts1/Kasr/ae_AlBattar.ttf
-lib/X11/fonts/ae_fonts1/Kasr/ae_AlHor.ttf
-lib/X11/fonts/ae_fonts1/Kasr/ae_AlManzomah.ttf
-lib/X11/fonts/ae_fonts1/Kasr/ae_AlMateen.ttf
-lib/X11/fonts/ae_fonts1/Kasr/ae_AlMohanad.ttf
-lib/X11/fonts/ae_fonts1/Kasr/ae_AlMothnna_bold.ttf
-lib/X11/fonts/ae_fonts1/MCS/fonts.dir
-lib/X11/fonts/ae_fonts1/MCS/ae_Electron.ttf
-lib/X11/fonts/ae_fonts1/MCS/ae_Haramain.ttf
-lib/X11/fonts/ae_fonts1/MCS/ae_Hor.ttf
-lib/X11/fonts/ae_fonts1/MCS/ae_Tholoth.ttf
-lib/X11/fonts/ae_fonts1/Shmookh/fonts.dir
-lib/X11/fonts/ae_fonts1/Shmookh/ae_AlYermook.ttf
-lib/X11/fonts/ae_fonts1/Shmookh/ae_Hani.ttf
-lib/X11/fonts/ae_fonts1/Shmookh/ae_Khalid.ttf
-lib/X11/fonts/ae_fonts1/Shmookh/ae_Ouhod.ttf
-lib/X11/fonts/ae_fonts1/Shmookh/ae_Rehan.ttf
-lib/X11/fonts/ae_fonts1/Shmookh/ae_Sharjah.ttf
-lib/X11/fonts/ae_fonts1/Shmookh/ae_Tarablus.ttf
+%%FONTSDIR%%/ae_Cortoba.ttf
+%%FONTSDIR%%/ae_Nagham.ttf
+%%FONTSDIR%%/ae_Ostorah.ttf
+%%FONTSDIR%%/ae_Dimnah.ttf
+%%FONTSDIR%%/ae_Furat.ttf
+%%FONTSDIR%%/ae_Granada.ttf
+%%FONTSDIR%%/ae_Kayrawan.ttf
+%%FONTSDIR%%/ae_Mashq.ttf
+%%FONTSDIR%%/ae_Mashq_bold.ttf
+%%FONTSDIR%%/ae_Nada.ttf
+%%FONTSDIR%%/ae_Petra.ttf
+%%FONTSDIR%%/ae_Rasheeq_bold.ttf
+%%FONTSDIR%%/ae_Sindibad.ttf
+%%FONTSDIR%%/ae_Arab.ttf
+%%FONTSDIR%%/ae_Graph.ttf
+%%FONTSDIR%%/ae_Japan.ttf
+%%FONTSDIR%%/ae_Jet.ttf
+%%FONTSDIR%%/ae_Metal.ttf
+%%FONTSDIR%%/ae_Nice.ttf
+%%FONTSDIR%%/ae_Salem.ttf
+%%FONTSDIR%%/ae_Shado.ttf
+%%FONTSDIR%%/ae_AlArabiya.ttf
+%%FONTSDIR%%/ae_AlBattar.ttf
+%%FONTSDIR%%/ae_AlHor.ttf
+%%FONTSDIR%%/ae_AlManzomah.ttf
+%%FONTSDIR%%/ae_AlMateen.ttf
+%%FONTSDIR%%/ae_AlMohanad.ttf
+%%FONTSDIR%%/ae_AlMothnna_bold.ttf
+%%FONTSDIR%%/ae_Electron.ttf
+%%FONTSDIR%%/ae_Haramain.ttf
+%%FONTSDIR%%/ae_Hor.ttf
+%%FONTSDIR%%/ae_Tholoth.ttf
+%%FONTSDIR%%/ae_AlYermook.ttf
+%%FONTSDIR%%/ae_Hani.ttf
+%%FONTSDIR%%/ae_Khalid.ttf
+%%FONTSDIR%%/ae_Ouhod.ttf
+%%FONTSDIR%%/ae_Rehan.ttf
+%%FONTSDIR%%/ae_Sharjah.ttf
+%%FONTSDIR%%/ae_Tarablus.ttf