Update PicoBSD so it does not need to patch the passwd Makefile.

5 files changed, 25 insertions, 112 deletions

diff --git a/release/picobsd/isp/crunch1/Makefile b/release/picobsd/isp/crunch1/Makefile
index 20cbc04..e5b52d4 100644
--- a/release/picobsd/isp/crunch1/Makefile
+++ b/release/picobsd/isp/crunch1/Makefile
@@ -6,20 +6,12 @@ SRC?=/usr/src
 all: crunch
 
 crunch:
-	@if [ ! -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
-		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -p0); \
-		touch /usr/src/usr.bin/passwd/.picobsd.patched; \
-	fi
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk -DNOPAM all \
 	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
-	@if [ -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
-		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -R -p0); \
-		rm /usr/src/usr.bin/passwd/.picobsd.patched; \
-	fi
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
 		crunch.cache \
 		crunch.mk \
diff --git a/release/picobsd/isp/crunch1/passwd.diff b/release/picobsd/isp/crunch1/passwd.diff
deleted file mode 100644
index 739b9a3..0000000
--- a/release/picobsd/isp/crunch1/passwd.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-*** Makefile.orig	Sat Aug  1 20:39:04 1998
---- Makefile	Sat Aug  1 20:40:38 1998
-***************
-*** 2,24 ****
-  # $FreeBSD$
-  
-  PROG=	passwd
-! SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
-! 	yp_passwd.c ypxfr_misc.c ${GENSRCS}
-  GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
-  	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
-  CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS
-  
-! DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
-! LDADD=	-lcrypt -lrpcsvc -lutil
-  .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-! 	${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \
-! 	${.CURDIR}/../../usr.sbin/rpc.yppasswdd
-  
-! CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \
-  	-I${.CURDIR}/../../usr.sbin/vipw \
-  	-I${.CURDIR}/../../usr.bin/chpass \
-- 	-I${.CURDIR}/../../libexec/ypxfr \
-- 	-I${.CURDIR}/../../usr.sbin/rpc.yppasswdd \
-  	-Dyp_error=warnx -DLOGGING
-  
-  CLEANFILES= ${GENSRCS}
---- 2,21 ----
-  # $FreeBSD$
-  
-  PROG=	passwd
-! SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c 
-! 
-  GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
-  	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
-  CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS
-  
-! DPADD=	${LIBCRYPT} ${LIBUTIL}
-! LDADD=	-lcrypt -lutil
-  .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-! 	${.CURDIR}/../rlogin 
-  
-! CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
-  	-I${.CURDIR}/../../usr.sbin/vipw \
-  	-I${.CURDIR}/../../usr.bin/chpass \
-  	-Dyp_error=warnx -DLOGGING
-  
-  CLEANFILES= ${GENSRCS}
diff --git a/release/picobsd/net/crunch1/Makefile b/release/picobsd/net/crunch1/Makefile
index 9498639..1c84330 100644
--- a/release/picobsd/net/crunch1/Makefile
+++ b/release/picobsd/net/crunch1/Makefile
@@ -6,20 +6,12 @@ SRC?=/usr/src
 all: crunch
 
 crunch:
-	@if [ ! -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
-		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -p0); \
-		touch /usr/src/usr.bin/passwd/.picobsd.patched; \
-	fi
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk -DNOPAM all \
 	    "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
-	@if [ -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
-		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -R -p0); \
-		rm /usr/src/usr.bin/passwd/.picobsd.patched; \
-	fi
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
 		crunch.cache \
 		crunch.mk \
diff --git a/release/picobsd/net/crunch1/passwd.diff b/release/picobsd/net/crunch1/passwd.diff
deleted file mode 100644
index 739b9a3..0000000
--- a/release/picobsd/net/crunch1/passwd.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-*** Makefile.orig	Sat Aug  1 20:39:04 1998
---- Makefile	Sat Aug  1 20:40:38 1998
-***************
-*** 2,24 ****
-  # $FreeBSD$
-  
-  PROG=	passwd
-! SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
-! 	yp_passwd.c ypxfr_misc.c ${GENSRCS}
-  GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
-  	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
-  CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS
-  
-! DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
-! LDADD=	-lcrypt -lrpcsvc -lutil
-  .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-! 	${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \
-! 	${.CURDIR}/../../usr.sbin/rpc.yppasswdd
-  
-! CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \
-  	-I${.CURDIR}/../../usr.sbin/vipw \
-  	-I${.CURDIR}/../../usr.bin/chpass \
-- 	-I${.CURDIR}/../../libexec/ypxfr \
-- 	-I${.CURDIR}/../../usr.sbin/rpc.yppasswdd \
-  	-Dyp_error=warnx -DLOGGING
-  
-  CLEANFILES= ${GENSRCS}
---- 2,21 ----
-  # $FreeBSD$
-  
-  PROG=	passwd
-! SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c 
-! 
-  GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
-  	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
-  CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS
-  
-! DPADD=	${LIBCRYPT} ${LIBUTIL}
-! LDADD=	-lcrypt -lutil
-  .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-! 	${.CURDIR}/../rlogin 
-  
-! CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
-  	-I${.CURDIR}/../../usr.sbin/vipw \
-  	-I${.CURDIR}/../../usr.bin/chpass \
-  	-Dyp_error=warnx -DLOGGING
-  
-  CLEANFILES= ${GENSRCS}
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 9b6de34..953e534 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,6 +1,29 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
 # $FreeBSD$
 
+# NOPAM is used by PicoBSD
+
+.if defined(NOPAM)
+
+PROG=	passwd
+SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c 
+
+GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
+	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
+CFLAGS+=-Wall
+
+DPADD=	${LIBCRYPT} ${LIBUTIL}
+LDADD=	-lcrypt -lutil
+.PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
+	${.CURDIR}/../rlogin 
+
+CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
+	-I${.CURDIR}/../../usr.sbin/vipw \
+	-I${.CURDIR}/../../usr.bin/chpass \
+	-Dyp_error=warnx -DLOGGING
+
+.else
+
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
 	yp_passwd.c ypxfr_misc.c ${GENSRCS}
@@ -21,6 +44,8 @@ CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \
 	-I${.CURDIR}/../../usr.sbin/rpc.yppasswdd \
 	-Dyp_error=warnx -DLOGGING
 
+.endif
+
 CLEANFILES= ${GENSRCS}
 
 RPCGEN= rpcgen -C