mail_cmds: All compiling

diff --git a/mail_cmds/Makefile b/mail_cmds/Makefile
index 127d0a79dd9b5d66a0db5242191807fd80978df5..d7ac9504563b4874d3f0ab0c7fdc4fbcaa7c6be8 100644 (file)
--- 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 2672505ce3455704f569f37affa73d7b6144ef0f..6ba161554ccc57383109d4f4f0bbd4596163bf65 100644 (file)
--- 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 fd52e66abee5cde351430cd5fbe4ed5d6e04bb76..3f349abbde223e54f0df14c9ff7fa86b7315f3fb 100644 (file)
--- 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 b0c5bd7597e613b03e65182e950814230b25a60f..c27be3f50a251947ab9a8b1502e31dbd6030421f 100644 (file)
--- 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 bd82ec4651a95bc47bd8b5fcb017e97d0697c90d..5e3872fd27eb2db57ff615941e43565263150d20 100644 (file)
--- 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 3319b01d5b54f290b10f3ccf74fbc91534c47c2b..a0d558d59ee6fe32647c3d1cdac66f944b25c408 100644 (file)
--- 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>