3 files changed, 23 insertions, 8 deletions

diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 6516cd44837f..c4a74c62fc75 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -2,5 +2,10 @@
 
 FILES=		${DEVFILES}
 FILESDIR?=	${fontdir}/dev${DEV}
+SCRIPTS=	${DEVSCRIPTS}
+SCRIPTSDIR?=	${fontdir}/dev${DEV}
+.for script in ${SCRIPTS}
+SCRIPTSNAME_${script:T}= ${script:T}
+.endfor
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/devdvi/Makefile b/gnu/usr.bin/groff/font/devdvi/Makefile
index 4e3480761888..9497e2d45b4a 100644
--- a/gnu/usr.bin/groff/font/devdvi/Makefile
+++ b/gnu/usr.bin/groff/font/devdvi/Makefile
@@ -5,17 +5,24 @@ DEVFILES=	DESC \
 		TR TI TB TBI CW CWI HR HI HB HBI \
 		TREC TIEC TBEC TBIEC CWEC CWIEC HREC HIEC HBEC HBIEC \
 		TRTC TITC TBTC TBITC CWTC CWITC HRTC HITC HBTC HBITC \
-		MI S EX SA SB \
-		generate/CompileFonts generate/Makefile \
+		MI S EX SA SB SC \
+		generate/Makefile \
 		generate/msam.map generate/msbm.map \
 		generate/texb.map generate/texex.map generate/texi.map \
 		generate/texmi.map generate/texr.map generate/texsy.map \
-		generate/textt.map generate/ec.map generate/tc.map
+		generate/textt.map generate/textex.map generate/ec.map \
+		generate/tc.map
+DEVSCRIPTS=	generate/CompileFonts
 
 CLEANFILES+=	DESC
 
 DESC:	DESC.in
-	cat ${DIST_DIR}/DESC.in >DESC
-	test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>DESC
+	cat ${DIST_DIR}/DESC.in >${.TARGET}
+	if test "${PAGE}" = A4; then \
+	  echo "papersize a4" >>${.TARGET}; \
+	else \
+	  echo "papersize letter" >>${.TARGET}; \
+	fi
+	test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>${.TARGET}
 
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile
index 79a9819764e4..d45d4426a06e 100644
--- a/gnu/usr.bin/groff/font/devps/Makefile
+++ b/gnu/usr.bin/groff/font/devps/Makefile
@@ -4,12 +4,15 @@ DEV=		ps
 DISTFILES=	text.enc download \
 		S ZD ZDR SS AB ABI AI AR BMB BMBI BMI BMR \
 		CB CBI CI CR HB HBI HI HR HNB HNBI HNI HNR \
-		NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
+		NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI \
+		EURO freeeuro.pfa
 PSFILES=	prologue symbolsl.pfa zapfdr.pfa
-DEVGENFILES=	generate/Makefile generate/afmname generate/dingbats.map \
-		generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \
+DEVGENFILES=	generate/Makefile generate/dingbats.map \
+		generate/dingbats.rmap generate/lgreekmap \
 		generate/symbolchars generate/symbolsl.afm generate/textmap
+DEVGENSCRIPTS=	generate/afmname generate/symbol.sed
 DEVFILES=	DESC ${PSFILES} ${DISTFILES} ${DEVGENFILES}
+DEVSCRIPTS=	${DEVGENSCRIPTS}
 
 CLEANFILES+=	DESC ${PSFILES}