Restore the 'beforeinstall' for chpass(1), so files with the

[pw-darwin.git] / chpass / Makefile

diff --git a/chpass/Makefile b/chpass/Makefile
index e9589562186a5f257b3fb9ae845b9ba85f5a5786..16974e211d923bdbaa24c4aa14420de8f3301644 100644 (file)
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -1,7 +1,7 @@
 #      @(#)Makefile    8.2 (Berkeley) 4/2/94
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen
 
@@ -9,7 +9,7 @@ PROG=   chpass
 SRCS=  chpass.c edit.c field.c pw_scan.c table.c util.c
 BINOWN=        root
 BINMODE=4555
-WARNS?=        5
+PRECIOUSPROG=
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
@@ -17,19 +17,17 @@ CFLAGS+= -DYP
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
 CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
 
-DPADD= ${LIBCRYPT} ${LIBUTIL}
-LDADD= -lcrypt -lutil
+LIBADD=        crypt util
 .if ${MK_NIS} != "no"
-DPADD+=        ${LIBYPCLNT}
-LDADD+=        -lypclnt
+LIBADD+=       ypclnt
 .endif 
 
-LINKS= ${BINDIR}/chpass ${BINDIR}/chfn
-LINKS+=        ${BINDIR}/chpass ${BINDIR}/chsh
+SYMLINKS=      ${BINDIR}/chpass ${BINDIR}/chfn
+SYMLINKS+=     ${BINDIR}/chpass ${BINDIR}/chsh
 .if ${MK_NIS} != "no"
-LINKS+=        ${BINDIR}/chpass ${BINDIR}/ypchpass
-LINKS+=        ${BINDIR}/chpass ${BINDIR}/ypchfn
-LINKS+=        ${BINDIR}/chpass ${BINDIR}/ypchsh
+SYMLINKS+=     ${BINDIR}/chpass ${BINDIR}/ypchpass
+SYMLINKS+=     ${BINDIR}/chpass ${BINDIR}/ypchfn
+SYMLINKS+=     ${BINDIR}/chpass ${BINDIR}/ypchsh
 .endif
 
 MLINKS=        chpass.1 chfn.1 chpass.1 chsh.1
@@ -39,12 +37,9 @@ MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
 
 beforeinstall:
 .for i in chpass chfn chsh ypchpass ypchfn ypchsh
+.if exists(${DESTDIR}${BINDIR}/$i)
        -chflags noschg ${DESTDIR}${BINDIR}/$i
-.endfor
-
-.if !defined(NO_FSCHG)
-afterinstall:
-       chflags schg ${DESTDIR}${BINDIR}/chpass
 .endif
+.endfor
 
 .include <bsd.prog.mk>