- Clean-up.

- Use %%DATADIR%%.

1 files changed, 21 insertions, 40 deletions

diff --git a/audio/mbrolavox/Makefile b/audio/mbrolavox/Makefile
index f0fe5b58fc77..cdab9b7f894d 100644
--- a/audio/mbrolavox/Makefile
+++ b/audio/mbrolavox/Makefile
@@ -8,62 +8,43 @@
 PORTNAME=	mbrolavox
 PORTVERSION=	3.0.1
 CATEGORIES=	audio accessibility
+DISTFILES=	#
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Voices for MBROLA voice synthesizer
 
+USE_ZIP=	yes
+NO_BUILD=	yes
+RESTRICTED=	No commercial nor military use, no sale
+WRKSRC=		${WRKDIR}/voices
+PLIST=		${WRKDIR}/plist
+
 VOICESCONF=	${.CURDIR}/voices.conf
 
 .if !defined(OPTIONS)
-OPTIONS!=	/usr/bin/awk -F\| '{ print $$1 " \"" $$3 "\" " $$4 }' < ${VOICESCONF}
-.endif
-.if !defined(ALLOPTIONS)
-ALLOPTIONS!=	/usr/bin/awk -F\| '{ print $$1 }' < ${VOICESCONF}
-.for ii in ${ALLOPTIONS}
-FILE_${ii}!=	/usr/bin/grep ^${ii} ${VOICESCONF} | /usr/bin/awk -F\| '{ print $$2 }'
-.endfor
+OPTIONS!=	/usr/bin/awk -F'|' '{ print $$1 " \"" $$3 "\" " $$4 }' < ${VOICESCONF}
 .endif
 
 .include <bsd.port.pre.mk>
 
-NO_BUILD=	yes
-RESTRICTED=	"no commercial nor military use, no sale"
-USE_ZIP=	yes
-PLIST=		${WRKDIR}/plist
-WRKSRC=		${WRKDIR}/voices
-
-.if !defined(BATCH)
-IS_INTERACTIVE=	yes
-.endif
-.if defined(PACKAGE_BUILDING)	# Ugly hack until OPTIONS and PACKAGE_BUILDING is fixed. Can be removed when ports/63682 has been commited.
-WITH_us1?=	yes
+.if !defined(ALLOPTIONS)
+ALLOPTIONS!=	${CUT} -f 1 -d '|' < ${VOICESCONF}
 .endif
 
 .for ii in ${ALLOPTIONS}
-. if defined(WITH_${ii})
-FILEDIRS+=	${ii}
-MYDISTFILES+=	${FILE_${ii}}:${ii}
-MYFILES+=	${FILE_${ii}}
-MYWITH+=	${ii}
-. endif
-.endfor
-.if defined(MYDISTFILES)
-DISTFILES=	${MYDISTFILES}
-DIST_SUBDIR=	mbrolavox
-.else
-DISTFILES=	# none
-.endif
-
-.for ii in ${FILEDIRS}
+FILE_${ii}!=	${AWK} -F'|' '$$1 == "${ii}" { print $$2 }' < ${VOICESCONF}
+.   if defined(WITH_${ii})
 MASTER_SITES+=	http://www.festvox.org/mbrola/dba/${ii}/:${ii} \
 		http://mambo.ucsc.edu/psl/mbrola/dba/${ii}/:${ii} \
 		ftp://ftp.loria.fr/pub/pc/mbrpsola/${ii}/:${ii} \
 		ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/${ii}/:${ii}
+DISTFILES+=	${FILE_${ii}}:${ii}
+FILEDIRS+=	${ii}
+MYFILES+=	${FILE_${ii}}
+.   endif
 .endfor
 
-do-build:
-	@${DO_NADA}
-
 do-extract:
 	@${MKDIR} ${WRKSRC}
 .for ii in ${MYFILES}
@@ -74,16 +55,16 @@ pre-install:
 	@${RM} -f ${PLIST}
 	@cd ${WRKSRC}; \
 	for ii in `${FIND} * \! -type d | ${SORT}`; do \
-		${ECHO_CMD} share/mbrolavox/$${ii} >> ${PLIST}; \
+		${ECHO_CMD} %%DATADIR%%/$${ii} >> ${PLIST}; \
 	done ; \
 	for ii in `${FIND} -d * -type d`; do \
-		${ECHO_CMD} @dirrm share/mbrolavox/$${ii} >> ${PLIST}; \
+		${ECHO_CMD} @dirrm %%DATADIR%%/$${ii} >> ${PLIST}; \
 	done
-	@${ECHO_CMD} @dirrm share/mbrolavox >> ${PLIST}
+	@${ECHO_CMD} @dirrm %%DATADIR%% >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${DATADIR}
-	@${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	@${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
 
 .include <bsd.port.post.mk>