Index: head/share/i18n/esdb/BIG5/Makefile
===================================================================
--- head/share/i18n/esdb/BIG5/Makefile	(revision 296701)
+++ head/share/i18n/esdb/BIG5/Makefile	(revision 296702)
@@ -1,24 +1,22 @@
 # $FreeBSD$
 # $NetBSD: Makefile.inc,v 1.3 2008/10/25 22:35:36 apb Exp $
 
 CODE=	Big5
 ESUBDIR= BIG5
 NO_PREPROC= yes
 
 .include "../Makefile.part"
 
 .for i in ${PART:S/:/@/}
 Big5_$i_variable!= sed \
 	'/^\#/d;/^ *$$/d;/^${i:S/@/:/}[ 	]/!d;s/^[^ 	]*[ 	]*//' \
 	${.CURDIR}/Big5.variable
 .endfor
 .for i in ${PART}
-.if !exists(Big5-${i:S/:/@/}.src)
 # XXX: FIXME
 Big5-${i:S/:/@/}.src: Big5.src Big5.variable
 	sed -e 's/encoding/Big5-$i/' \
 		-e 's/variable/${Big5_$i_variable}/' \
 		${.CURDIR}/Big5.src > $@
-	@echo Big5-${i:S/:/@/}.src >>.tmpfiles
-.endif
+	@echo ${.TARGET} >>.tmpfiles
 .endfor
Index: head/share/i18n/esdb/Makefile.part
===================================================================
--- head/share/i18n/esdb/Makefile.part	(revision 296701)
+++ head/share/i18n/esdb/Makefile.part	(revision 296702)
@@ -1,84 +1,82 @@
 # $FreeBSD$
 # $NetBSD: Makefile.part,v 1.6 2008/10/25 22:35:36 apb Exp $
 
 MKESDB?= ${.OBJDIR}/../../../../usr.bin/mkesdb_static/mkesdb_static
 
 PARTFILE?= ${.CURDIR}/${CODE}.part
 ALIASFILE?= ${.CURDIR}/${CODE}.alias
 .if !defined(NO_SEP)
 SEP?=	-
 .endif
 .if exists(${PARTFILE})
 PART!=	sed '/^\#/d;/^ *$$/d' ${PARTFILE}
 .endif
 .if !defined(NO_EPREFIX)
 CODESETS?= ${PART:C/^/${CODE}${SEP}/}
 EPREFIX?= ${CODE}${SEP}
 .else
 CODESETS?= ${PART}
 EPREFIX?=	
 .endif
 ESUBDIR?= ${CODE}
 ESDB?=	${CODESETS:C/$/.esdb/:S/:/@/}
 
 FILES+=	${ESDB}
 FILESDIR= ${ESDBDIR}/${ESUBDIR}
 
 .SUFFIXES: .src .esdb
 
 .src.esdb:
 	${MKESDB} -o $@ $>
 
 CLEANFILES+= ${ESDB} esdb.dir.${ESUBDIR} esdb.alias.${ESUBDIR}
 
 # ----------------------------------------------------------------------
 # esdb.dir
 #
 esdb.dir.${ESUBDIR}: ${PARTFILE}
 	echo "# ${CODE}" >${.TARGET}
 .for i in ${PART}
 	printf "%-32s%s\n" "${EPREFIX}$i" \
 		"${ESUBDIR}/${EPREFIX}${i:S/:/@/}.esdb" >>${.TARGET}
 .endfor
 	echo >>${.TARGET}
 
 # ----------------------------------------------------------------------
 # esdb.alias
 #
 .for i in ${PART:S/:/@/}
 ${CODE}_$i_aliases!= echo \
 	`sed \
 	    '/^\#/d;/^ *$$/d;/^${i:S/@/:/}[ 	]/!d;s/^[^ 	]*[ 	]*//' \
 		${ALIASFILE}`
 .endfor
 esdb.alias.${ESUBDIR}: ${PARTFILE} ${ALIASFILE}
 	echo "# ${CODE}" >${.TARGET}
 .for i in ${PART:S/:/@/}
 .for j in ${${CODE}_$i_aliases}
 	printf "%-32s%s\n" "$j" "${EPREFIX}${i:S/@/:/}" >>${.TARGET}
 .endfor
 .endfor
 	echo >>${.TARGET}
 
 .if !defined(_SKIP_BUILD)
 all: esdb.dir.${ESUBDIR} esdb.alias.${ESUBDIR} codesets
 .endif
 codesets: ${ESDB}
 
 .if !defined(NO_PREPROC)
 .for i in ${PART}
-.if !exists(${EPREFIX}${i:S/:/@/}.src)
 ${EPREFIX}${i:S/:/@/}.src: ${CODE}.src
-	sed ${SED_EXP:S@%%PART%%@${i}@} ${.CURDIR}/${CODE}.src > ${EPREFIX}${i:S/:/@/}.src
-	@echo ${EPREFIX}${i:S/:/@/}.src >>.tmpfiles
-.endif
+	sed ${SED_EXP:S@%%PART%%@${i}@} ${.ALLSRC} > ${.TARGET}
+	@echo ${.TARGET} >>.tmpfiles
 .endfor
 .endif
 
 .if exists(.tmpfiles)
 TMPFILES!= cat .tmpfiles
 CLEANFILES+= ${TMPFILES} .tmpfiles
 .endif
 
 .include "./Makefile.inc"
 .include <bsd.prog.mk>
Index: head/share/i18n/esdb/UTF/Makefile
===================================================================
--- head/share/i18n/esdb/UTF/Makefile	(revision 296701)
+++ head/share/i18n/esdb/UTF/Makefile	(revision 296702)
@@ -1,41 +1,41 @@
 # $FreeBSD$
 # $NetBSD: Makefile.inc,v 1.5 2008/10/25 22:27:36 apb Exp $
 
 CODE=	UTF
 NO_PREPROC= yes
 
 UTF-16-mod= UTF1632
 UTF-16-var= utf16
 UTF-16BE-mod= UTF1632
 UTF-16BE-var= utf16,big,force
 UTF-16LE-mod= UTF1632
 UTF-16LE-var= utf16,little,force
 UTF-16-INTERNAL-mod= UTF1632
 UTF-16-INTERNAL-var= utf16,internal,force
 UTF-16-SWAPPED-mod= UTF1632
 UTF-16-SWAPPED-var= utf16,swapped,force
 UTF-32-mod= UTF1632
 UTF-32-var= utf32
 UTF-32BE-mod= UTF1632
 UTF-32BE-var= utf32,big,force
 UTF-32LE-mod= UTF1632
 UTF-32LE-var= utf32,little,force
 UTF-32-INTERNAL-mod= UTF1632
 UTF-32-INTERNAL-var= utf32,internal,force
 UTF-32-SWAPPED-mod= UTF1632
 UTF-32-SWAPPED-var= utf32,swapped,force
 UTF-8-mod= UTF8
 UTF-8-var= utf8
 UTF-7-mod= UTF7
 UTF-7-var= utf7
 
 .include "../Makefile.part"
 
 .for i in ${PART}
 ${EPREFIX}${i}.src: ${CODE}.src
 	sed -e 's/UTF-x/UTF-${i}/' \
 		-e 's/UTF-mod/${UTF-${i}-mod}/' \
 		-e 's/UTF-var/${UTF-${i}-var}/' \
-		${.CURDIR}/${CODE}.src > ${EPREFIX}${i:S/:/@/}.src
-	@echo ${EPREFIX}${i:S/:/@/}.src >>.tmpfiles
+		${.ALLSRC} > ${.TARGET}
+	@echo ${.TARGET} >>.tmpfiles
 .endfor