mail_cmds: All compiling

6 files changed, 35 insertions, 61 deletions

diff --git a/mail_cmds/Makefile b/mail_cmds/Makefile
index 127d0a7..d7ac950 100644
--- a/mail_cmds/Makefile
+++ b/mail_cmds/Makefile
@@ -1,5 +1,7 @@
-Project = mail_cmds
+SUBDIR=	biff \
+	comsat \
+	from \
+	mail \
+	msgs 
 
-SubProjects = biff comsat from mail msgs 
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
+.include <bsd.subdir.mk>
diff --git a/mail_cmds/biff/Makefile b/mail_cmds/biff/Makefile
index 2672505..6ba1615 100644
--- a/mail_cmds/biff/Makefile
+++ b/mail_cmds/biff/Makefile
@@ -1,10 +1,3 @@
-Project = biff
-Install_Dir = /usr/bin
+PROG=	biff
 
-CFILES = biff.c
-MANPAGES = biff.1
-
-Extra_CC_Flags = -Wall -Werror -mdynamic-no-pic
-Extra_LD_Flags = -dead_strip
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
+.include <bsd.prog.mk>
diff --git a/mail_cmds/comsat/Makefile b/mail_cmds/comsat/Makefile
index fd52e66..3f349ab 100644
--- a/mail_cmds/comsat/Makefile
+++ b/mail_cmds/comsat/Makefile
@@ -1,11 +1,4 @@
-Project = comsat
-Install_Dir = /usr/libexec
+PROG=	comsat
+MAN=	comsat.8
 
-CFILES = comsat.c
-MANPAGES = comsat.8
-LAUNCHD_PLISTS = comsat.plist
-
-Extra_CC_Flags = -Wall -Werror -mdynamic-no-pic
-Extra_LD_Flags = -dead_strip
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
+.include <bsd.prog.mk>
diff --git a/mail_cmds/from/Makefile b/mail_cmds/from/Makefile
index b0c5bd7..c27be3f 100644
--- a/mail_cmds/from/Makefile
+++ b/mail_cmds/from/Makefile
@@ -1,10 +1,3 @@
-Project = from
-Install_Dir = /usr/bin
+PROG=	from
 
-CFILES = from.c
-MANPAGES = from.1
-
-Extra_CC_Flags = -Wall -Werror -mdynamic-no-pic
-Extra_LD_Flags = -dead_strip
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
+.include <bsd.prog.mk>
diff --git a/mail_cmds/mail/Makefile b/mail_cmds/mail/Makefile
index bd82ec4..5e3872f 100644
--- a/mail_cmds/mail/Makefile
+++ b/mail_cmds/mail/Makefile
@@ -1,24 +1,23 @@
-Project = mail
-Install_Dir = /usr/bin
+#	@(#)Makefile	8.2 (Berkeley) 1/25/94
+# $FreeBSD$
 
-CFILES = aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
-         edit.c fio.c getname.c head.c lex.c list.c main.c names.c\
-         popen.c quit.c send.c strings.c temp.c tty.c v7.local.c\
-         vars.c version.c
-MANPAGES = mail.1 mailx.1
+CONFS=	misc/mail.rc
+PROG=	mail
+SRCS=	aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
+	edit.c fio.c getname.c head.c lex.c list.c main.c names.c\
+	popen.c quit.c send.c strings.c temp.c tty.c v7.local.c\
+	vars.c version.c
+FILES=	mail.help mail.tildehelp
+FILESDIR=	${SHAREDIR}/misc
+EFILES=	mail.rc
+LINKS=	${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
+MAN=	mail.1 mailx.1
+MLINKS=	mail.1 Mail.1
 
-Extra_CC_Flags = -Wall -Werror -mdynamic-no-pic
-Extra_LD_Flags = -dead_strip
+.PATH: ${.CURDIR}/misc
 
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
+etc-mailrc:
+	cd ${.CURDIR}/misc; ${INSTALL} -o root -g wheel \
+	    -m 644 ${EFILES} ${DESTDIR}/private/etc
 
-ETCDIR=$(DSTROOT)/private/etc
-MISCDIR=$(DSTROOT)/usr/share/misc
-
-after_install:
-	$(INSTALL_DIRECTORY) $(MISCDIR)
-	$(INSTALL_FILE) -c misc/mail.help misc/mail.tildehelp $(MISCDIR)
-	$(INSTALL_DIRECTORY) $(ETCDIR)
-	$(INSTALL_FILE) -c -m 644 misc/mail.rc $(ETCDIR)/mail.rc
-	$(LN) -f $(DSTROOT)$(Install_Dir)/mail \
-		 $(DSTROOT)$(Install_Dir)/mailx
+.include <bsd.prog.mk>
diff --git a/mail_cmds/msgs/Makefile b/mail_cmds/msgs/Makefile
index 3319b01..a0d558d 100644
--- a/mail_cmds/msgs/Makefile
+++ b/mail_cmds/msgs/Makefile
@@ -1,11 +1,5 @@
-Project = msgs
-Install_Dir = /usr/bin
+PROG=	msgs
 
-CFILES = msgs.c
-MANPAGES = msgs.1
+LDADD=-lncursesw
 
-Extra_CC_Flags = -Wall -Werror -mdynamic-no-pic
-Extra_LD_Flags = -dead_strip \
-	-lcurses
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
+.include <bsd.prog.mk>