Use the standard <bsd.files.mk> API to install files.

5 files changed, 65 insertions, 88 deletions

diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile
index 2de9a33..e3cfddf 100644
--- a/etc/isdn/Makefile
+++ b/etc/isdn/Makefile
@@ -1,13 +1,16 @@
 # $FreeBSD$
 
-I4BETCPROG=	answer			\
+NOOBJ=
+
+SCRIPTS=	answer			\
 		isdntel.sh		\
 		record			\
 		tell			\
 		tell-record		\
 		unknown_incoming
+SCRIPTS_NAME_isdntel.sh= isdntel.sh
 
-I4BETCFILE=	holidays.D		\
+FILES=		holidays.D		\
 		isdnd.rates.A		\
 		isdnd.rates.D		\
 		isdnd.rates.F		\
@@ -16,14 +19,8 @@ I4BETCFILE=	holidays.D		\
 		isdnd.rc.sample		\
 		isdntel.alias.sample
 
-install:
-		for i in ${I4BETCPROG} ; do \
-		  ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 700 $$i \
-		  ${DESTDIR}/etc/isdn ; \
-		done ; \
-		for i in ${I4BETCFILE} ; do \
-		  ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 $$i \
-		  ${DESTDIR}/etc/isdn ; \
-		done
+BINDIR=		/etc/isdn
+BINMODE=	700
+FILESMODE=	600
 
-.include <bsd.own.mk>
+.include <bsd.prog.mk>
diff --git a/share/skel/Makefile b/share/skel/Makefile
index aff9bb7..1626964 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -1,19 +1,14 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
-FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile dot.shrc
-FILES2=	dot.mail_aliases dot.rhosts 
-MODE1=	0644
-MODE2=	0600
-
-NOOBJ=	noobj
-
-all clean cleandir depend lint tags:
-
-install:
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${MODE1} ${FILES1} \
-	    ${DESTDIR}${BINDIR}/skel
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${MODE2} ${FILES2} \
-	    ${DESTDIR}${BINDIR}/skel
+FILESGROUPS=	FILES1 FILES2
+FILES1=		dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
+		dot.shrc
+FILES2=		dot.mail_aliases dot.rhosts 
+FILES1DIR=	/usr/share/skel
+FILES2DIR=	/usr/share/skel
+FILES1MODE=	0644
+FILES2MODE=	0600
+NOOBJ=		noobj
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index 11a87b1..44db821 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FONTS=	armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
+FILES=	armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
 	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
 	cp437-thin-8x8.fnt cp437-thin-8x16.fnt \
 	cp850-8x8.fnt cp850-8x14.fnt cp850-8x16.fnt \
@@ -30,13 +30,8 @@ FONTS=	armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
 	swiss-1251-8x16.fnt swiss-1131-8x16.fnt \
 	INDEX.fonts
 
-FONTDIR = ${SHAREDIR}/syscons/fonts
+FILESDIR= ${SHAREDIR}/syscons/fonts
 
-NOMAN = noman
-NOOBJ = noobj
-
-install:
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FONTS} \
-		${DESTDIR}${FONTDIR}
+NOOBJ=	noobj
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index 14835f2..e08db11 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,52 +1,48 @@
 # $FreeBSD$
 
-KEYMAPS=  INDEX.keymaps
-KEYMAPS+= be.iso.kbd be.iso.acc.kbd
-KEYMAPS+= bg.bds.ctrlcaps.kbd bg.phonetic.ctrlcaps.kbd
-KEYMAPS+= br275.iso.kbd br275.iso.acc.kbd br275.cp850.kbd
-KEYMAPS+= by.cp1131.kbd by.cp1251.kbd by.iso5.kbd
-KEYMAPS+= ce.iso2.kbd
-KEYMAPS+= cs.latin2.qwertz.kbd
-KEYMAPS+= cz.iso2.kbd
-KEYMAPS+= danish.iso.kbd danish.cp865.kbd dutch.iso.acc.kbd
-KEYMAPS+= el.iso07.kbd
-KEYMAPS+= estonian.iso.kbd estonian.iso15.kbd estonian.cp850.kbd
-KEYMAPS+= finnish.iso.kbd finnish.cp850.kbd
-KEYMAPS+= fr.iso.kbd fr.iso.acc.kbd fr.dvorak.kbd
-KEYMAPS+= fr_CA.iso.acc.kbd
-KEYMAPS+= german.iso.kbd german.iso.acc.kbd german.cp850.kbd
-KEYMAPS+= gr.elot.acc.kbd gr.us101.acc.kbd
-KEYMAPS+= hr.iso.kbd
-KEYMAPS+= hu.iso2.101keys.kbd hu.iso2.102keys.kbd
-KEYMAPS+= hy.armscii-8.kbd
-KEYMAPS+= icelandic.iso.kbd icelandic.iso.acc.kbd
-KEYMAPS+= it.iso.kbd
-KEYMAPS+= iw.iso8.kbd
-KEYMAPS+= jp.106.kbd jp.106x.kbd jp.pc98.kbd jp.pc98.iso.kbd
-KEYMAPS+= latinamerican.kbd latinamerican.iso.acc.kbd
-KEYMAPS+= lt.iso4.kbd
-KEYMAPS+= norwegian.iso.kbd norwegian.dvorak.kbd
-KEYMAPS+= pl_PL.ISO8859-2.kbd 
-KEYMAPS+= pt.iso.kbd pt.iso.acc.kbd
-KEYMAPS+= ru.koi8-r.kbd ru.koi8-r.shift.kbd ru.cp866.kbd ru.iso5.kbd
-KEYMAPS+= si.iso.kbd
-KEYMAPS+= sk.iso2.kbd
-KEYMAPS+= spanish.iso.kbd spanish.iso.acc.kbd spanish.iso15.acc.kbd
-KEYMAPS+= swedish.iso.kbd swedish.cp850.kbd
-KEYMAPS+= swissfrench.iso.kbd swissfrench.iso.acc.kbd swissfrench.cp850.kbd
-KEYMAPS+= swissgerman.iso.kbd swissgerman.iso.acc.kbd swissgerman.cp850.kbd
-KEYMAPS+= tr.iso9.q.kbd
-KEYMAPS+= ua.koi8-u.kbd ua.koi8-u.shift.alt.kbd ua.iso5.kbd
-KEYMAPS+= uk.iso.kbd uk.iso-ctrl.kbd uk.cp850.kbd uk.cp850-ctrl.kbd
-KEYMAPS+= us.iso.kbd us.dvorak.kbd us.dvorakx.kbd us.emacs.kbd us.pc-ctrl.kbd
-KEYMAPS+= us.unix.kbd us.iso.acc.kbd
+FILES=	INDEX.keymaps \
+	be.iso.kbd be.iso.acc.kbd \
+	bg.bds.ctrlcaps.kbd bg.phonetic.ctrlcaps.kbd \
+	br275.iso.kbd br275.iso.acc.kbd br275.cp850.kbd \
+	by.cp1131.kbd by.cp1251.kbd by.iso5.kbd \
+	ce.iso2.kbd \
+	cs.latin2.qwertz.kbd \
+	cz.iso2.kbd \
+	danish.iso.kbd danish.cp865.kbd dutch.iso.acc.kbd \
+	el.iso07.kbd \
+	estonian.iso.kbd estonian.iso15.kbd estonian.cp850.kbd \
+	finnish.iso.kbd finnish.cp850.kbd \
+	fr.iso.kbd fr.iso.acc.kbd fr.dvorak.kbd \
+	fr_CA.iso.acc.kbd \
+	german.iso.kbd german.iso.acc.kbd german.cp850.kbd \
+	gr.elot.acc.kbd gr.us101.acc.kbd \
+	hr.iso.kbd \
+	hu.iso2.101keys.kbd hu.iso2.102keys.kbd \
+	hy.armscii-8.kbd \
+	icelandic.iso.kbd icelandic.iso.acc.kbd \
+	it.iso.kbd \
+	iw.iso8.kbd \
+	jp.106.kbd jp.106x.kbd jp.pc98.kbd jp.pc98.iso.kbd \
+	latinamerican.kbd latinamerican.iso.acc.kbd \
+	lt.iso4.kbd \
+	norwegian.iso.kbd norwegian.dvorak.kbd \
+	pl_PL.ISO8859-2.kbd  \
+	pt.iso.kbd pt.iso.acc.kbd \
+	ru.koi8-r.kbd ru.koi8-r.shift.kbd ru.cp866.kbd ru.iso5.kbd \
+	si.iso.kbd \
+	sk.iso2.kbd \
+	spanish.iso.kbd spanish.iso.acc.kbd spanish.iso15.acc.kbd \
+	swedish.iso.kbd swedish.cp850.kbd \
+	swissfrench.iso.kbd swissfrench.iso.acc.kbd swissfrench.cp850.kbd \
+	swissgerman.iso.kbd swissgerman.iso.acc.kbd swissgerman.cp850.kbd \
+	tr.iso9.q.kbd \
+	ua.koi8-u.kbd ua.koi8-u.shift.alt.kbd ua.iso5.kbd \
+	uk.iso.kbd uk.iso-ctrl.kbd uk.cp850.kbd uk.cp850-ctrl.kbd \
+	us.iso.kbd us.dvorak.kbd us.dvorakx.kbd us.emacs.kbd us.pc-ctrl.kbd \
+	us.unix.kbd us.iso.acc.kbd
 
-MAPSDIR = ${SHAREDIR}/syscons/keymaps
-NOMAN = noman
-NOOBJ = noobj
+FILESDIR= ${SHAREDIR}/syscons/keymaps
 
-install:
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${KEYMAPS} \
-	    ${DESTDIR}${MAPSDIR}
+NOOBJ=	noobj
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index be0f0eb..64bf455 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -7,19 +7,13 @@ SCRMAPS = armscii8-2haik8.scm \
 	  us-ascii_to_cp437.scm
 
 SCRMAPS_MK = ${SCRMAPS:R:S/$/.mk/g}
-SCRDIR = ${SHAREDIR}/syscons/scrnmaps
 CLEANFILES+= ${SCRMAPS_MK} ${SCRMAPS}
 
-NOMAN = noman
-
-all: ${SCRMAPS}
+FILES=	${SCRMAPS}
+FILESDIR= ${SHAREDIR}/syscons/scrnmaps
 
 build-tools: ${SCRMAPS_MK}
 
-install:
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \
-	    ${SCRMAPS} ${DESTDIR}${SCRDIR}
-
 ${SCRMAPS}: ${.TARGET:R}.mk
 	./${.TARGET:R}.mk ${.TARGET:R}.tmp
 	uuencode ${.TARGET:R}.tmp ${.TARGET:R} > ${.TARGET}