4 files changed, 71 insertions, 106 deletions

diff --git a/arabic/ae_fonts_mono/Makefile b/arabic/ae_fonts_mono/Makefile
index fc997ffd19bf..df60f0abbbf4 100644
--- a/arabic/ae_fonts_mono/Makefile
+++ b/arabic/ae_fonts_mono/Makefile
@@ -1,19 +1,15 @@
-# New ports collection makefile for: ae_fonts_mono
-# Date created:        August 22, 2003
-# Whom:                Samy Al Bahra <samy@kerneled.com>
-#
+# Created by: Samy Al Bahra <samy@kerneled.com>
 # $FreeBSD$
-#
 
-PORTNAME=		ae_fonts_mono
-PORTVERSION=		1.0
+PORTNAME=	ae_fonts_mono
+PORTVERSION=	1.0
 PORTREVISION=	2
-CATEGORIES=		arabic
-MASTER_SITES=		SF/arabeyes/Fonts/ae_fonts
-DISTNAME=		ae_fonts_mono
+CATEGORIES=	arabic x11-fonts
+MASTER_SITES=	SF/arabeyes/Fonts/ae_fonts
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A collection of PCF fonts that include Arabic glyphs
+COMMENT=	Collection of PCF fonts that include Arabic glyphs
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
@@ -28,10 +24,12 @@ do-build:
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/ae_fonts_mono
-	@${INSTALL_DATA} ${WRKSRC}/*.pcf ${PREFIX}/lib/X11/fonts/ae_fonts_mono
-	@${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/lib/X11/fonts/ae_fonts_mono
+	${INSTALL_DATA} ${WRKSRC}/*.pcf ${WRKSRC}/fonts.dir \
+		${PREFIX}/lib/X11/fonts/ae_fonts_mono
 
 post-install:
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile
index cd62558b9300..d0deeaa96909 100644
--- a/arabic/ae_fonts_ttf/Makefile
+++ b/arabic/ae_fonts_ttf/Makefile
@@ -1,19 +1,15 @@
-# New ports collection makefile for: ae_fonts1_ttf
-# Date created:        August 22 2003
-# Whom:                Samy Al Bahra <samy@kerneled.com>
-#
+# Created by: Samy Al Bahra <samy@kerneled.com>
 # $FreeBSD$
-#
 
-PORTNAME=		ae_fonts1_ttf
-PORTVERSION=		1.1
-PORTREVISION=		2
-CATEGORIES=		arabic x11-fonts
-MASTER_SITES=		SF/arabeyes/Fonts/ae_fonts
-DISTNAME=		ae_fonts1_ttf_${PORTVERSION}
+PORTNAME=	ae_fonts1_ttf
+PORTVERSION=	1.1
+PORTREVISION=	2
+CATEGORIES=	arabic x11-fonts
+MASTER_SITES=	SF/arabeyes/Fonts/ae_fonts
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A collection of truetype Arabic fonts created by Arabeyes.org
+COMMENT=	Collection of TrueType Arabic fonts
 
 BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
 
@@ -21,57 +17,46 @@ USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/ae_fonts1-${PORTVERSION}
 SUB_FILES=	pkg-message
 
-.if !defined(WITHOUT_AAHS)
-FONTS=	AAHS
-.endif
+OPTIONS_DEFINE=	AAHS AGA FS KASR MCS SHMOOKH
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
-.if !defined(WITHOUT_AGA)
-FONTS+=	AGA
-.endif
+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
 
-.if !defined(WITHOUT_FS)
-FONTS+=	FS
-.endif
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_KASR)
-FONTS+=	Kasr
-.endif
-
-.if !defined(WITHOUT_MCS)
-FONTS+=	MCS
-.endif
-
-.if !defined(WITHOUT_SHMOOKH)
-FONTS+=	Shmookh
-.endif
+.for font in AAHS AGA FS MCS
+.  if ${PORT_OPTIONS:M${font}}
+FONTS+=	${font}
+.  endif
+.endfor
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "*****************************************************"
-	@${ECHO_MSG} "The following make variables can be set to"
-	@${ECHO_MSG} "exclude certain font sets:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITHOUT_AAHS    - do not install the AAHS font set"
-	@${ECHO_MSG} "WITHOUT_AGA     - do not install the AGA font set"
-	@${ECHO_MSG} "WITHOUT_FS      - do not install the FS font set"
-	@${ECHO_MSG} "WITHOUT_KASR    - do not install the Kasr font set"
-	@${ECHO_MSG} "WITHOUT_MCS     - do not install the MCS font set"
-	@${ECHO_MSG} "WITHOUT_SHMOOKH - do not install the Shmookh font set"
-	@${ECHO_MSG} "*****************************************************"
-	@${ECHO_MSG} ""
+.for font in KASR SHMOOKH
+.  if ${PORT_OPTIONS:M${font}}
+FONTS+=	${font:C/(.).*/\1/}${font:L:C/.//}
+.  endif
+.endfor
 
 do-build:
-.for i in ${FONTS}
-	cd ${WRKSRC} && ttmkfdir -c -d ${WRKSRC}/${i} > ${WRKSRC}/${i}/fonts.dir
+.for font in ${FONTS}
+	cd ${WRKSRC} && ttmkfdir -c -d ${WRKSRC}/${font} > \
+		${WRKSRC}/${font}/fonts.dir
 .endfor
 
 do-install:
-.for i in ${FONTS}
-	${MKDIR} ${PREFIX}/lib/X11/fonts/ae_fonts1/${i}
-	${INSTALL_DATA} ${WRKSRC}/${i}/* ${PREFIX}/lib/X11/fonts/ae_fonts1/${i}
+.for font in ${FONTS}
+	${MKDIR} ${PREFIX}/lib/X11/fonts/ae_fonts1/${font}
+	${INSTALL_DATA} ${WRKSRC}/${font}/* \
+		${PREFIX}/lib/X11/fonts/ae_fonts1/${font}
 .endfor
 
 post-install:
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/arabic/khotot/Makefile b/arabic/khotot/Makefile
index 39030fce15f1..dd1bee1413c1 100644
--- a/arabic/khotot/Makefile
+++ b/arabic/khotot/Makefile
@@ -1,59 +1,45 @@
-# New ports collection makefile for: khotot
-# Date created:        August 23 2003
-# Whom:                Samy Al Bahra <samy@kerneled.com>
-#
+# Created by: Samy Al Bahra <samy@kerneled.com>
 # $FreeBSD$
-#
 
 PORTNAME=	khotot
 PORTVERSION=	1.0
 PORTREVISION=	2
-CATEGORIES=	arabic
+CATEGORIES=	arabic x11-fonts
 MASTER_SITES=	#
 DISTFILES=	#
 EXTRACT_ONLY=	#
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A meta-port of the most popular Arabic font packages
+COMMENT=	Meta-port for popular Arabic font packages
 
-.if !defined(WITHOUT_MONO)
-RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/ae_fonts_mono/fonts.dir:${PORTSDIR}/arabic/ae_fonts_mono
+NO_BUILD=	yes
+NO_INSTALL=	yes
+SUB_FILES=	pkg-message
+
+OPTIONS_DEFINE=	MONO AEFONTS KACST
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+
+MONO_DESC=	Install Arabic PCF fonts
+AEFONTS_DESC=	Install Arabeyes project TrueType fonts
+KACST_DESC=	Install King AbdulAziz University fonts
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMONO}
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/ae_fonts_mono/fonts.dir:${PORTSDIR}/arabic/ae_fonts_mono
 .endif
 
-.if !defined(WITHOUT_AEFONTS)
+.if ${PORT_OPTIONS:MAEFONTS}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/ae_fonts1/AAHS/fonts.dir:${PORTSDIR}/arabic/ae_fonts_ttf
 .endif
 
-.if !defined(WITHOUT_KACST)
+.if ${PORT_OPTIONS:MKACST}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/kacst_fonts/fonts.dir:${PORTSDIR}/arabic/kacst_fonts
 .endif
 
-NO_BUILD=	yes
-SUB_FILES=	pkg-message
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "**********************************************"
-	@${ECHO_MSG} "The following make variables can be set to"
-	@${ECHO_MSG} "exclude certain font sets:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITHOUT_MONO - do not install the Arabic PCF"
-	@${ECHO_MSG} "		     fonts"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITHOUT_AEFONTS - do not install the Arabeyes"
-	@${ECHO_MSG} "		        truetype Arabic fonts"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITHOUT_KACST - do not install the truetype"
-	@${ECHO_MSG} "		      Arabic fonts created in the"
-	@${ECHO_MSG} "		      King AbdulAziz University of"
-	@${ECHO_MSG} "		      Riyadh, Saudi Arabia"
-	@${ECHO_MSG} "**********************************************"
-	@${ECHO_MSG} ""
-
-do-install:
-	# This is a meta-port, the do-install target is not needed
-
 post-install:
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/arabic/libitl/Makefile b/arabic/libitl/Makefile
index 125cd8ca16cb..631704812c3e 100644
--- a/arabic/libitl/Makefile
+++ b/arabic/libitl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libitl
-# Date created:				January 12 2005
-# Whom:					Samy Al Bahra <samy@kerneled.org>
-#
+# Created by: Samy Al Bahra <samy@kerneled.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libitl
 PORTVERSION=	0.7.0
@@ -11,7 +7,7 @@ CATEGORIES=	arabic
 MASTER_SITES=	SF/arabeyes/ITL%20Library%20%28${PORTNAME}%29/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An API abstraction to common Islamic calculations
+COMMENT=	API abstraction to common Islamic calculations
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/itl