Using the new contrib rev mechanism, bring cvs up to 1.12.8. Add patch files
[dragonfly.git] / gnu / usr.bin / cvs / cvs / Makefile
index 53608ce..7a5f60a 100644 (file)
@@ -1,27 +1,40 @@
 # $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.32.2.6 2003/01/21 23:06:51 peter Exp $
-# $DragonFly: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.5 2004/01/31 06:56:37 dillon Exp $
+# $DragonFly: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.6 2004/05/20 02:27:56 dillon Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH: ${CVSDIR}/src
 .PATH: ${CVSDIR}/lib
 .PATH: ${CVSDIR}/man
+.PATH: ${CVSDIR}/doc
 .PATH: ${CVSDIR}
 
 PROG=  cvs
-MAN=   cvs.1 cvs.5
+MAN=   ${.OBJDIR}/cvs.1 cvs.5
 
 SRCS=  add.c admin.c annotate.c buffer.c \
        checkin.c checkout.c classify.c client.c \
-       commit.c create_adm.c cvsrc.c diff.c edit.c entries.c error.c \
+       commit.c create_adm.c cvsrc.c edit.c entries.c error.c \
        exithandle.c expand_path.c fileattr.c filesubr.c find_names.c \
        hardlink.c hash.c history.c ignore.c import.c lock.c log.c \
-       log-buffer.c login.c logmsg.c main.c mkmodules.c \
+       log-buffer.c login.c logmsg.c mkmodules.c \
        modules.c myndbm.c no_diff.c parseinfo.c patch.c prepend_args.c \
        rcs.c rcscmds.c \
        recurse.c release.c remove.c repos.c root.c rsh-client.c run.c \
        scramble.c server.c socket-client.c status.c subr.c tag.c update.c \
-       vers_ts.c version.c watch.c wrapper.c zlib.c
+       vers_ts.c version.c watch.c wrapper.c zlib.c \
+       ${.OBJDIR}/main.c ${.OBJDIR}/diff.c
+
+${.OBJDIR}/main.c: main.c.patch
+       patch -o ${.TARGET} -i ${.ALLSRC} ${CONTRIBDIR}/src/main.c
+
+${.OBJDIR}/diff.c: diff.c.patch
+       patch -o ${.TARGET} -i ${.ALLSRC} ${CONTRIBDIR}/src/diff.c
+
+${.OBJDIR}/cvs.1: cvs.1.patch
+       patch -o ${.TARGET} -i ${.ALLSRC} ${CONTRIBDIR}/doc/cvs.1
+
+CLEANFILES+= ${.OBJDIR}/main.c ${.OBJDIR}/diff.c ${.OBJDIR}/cvs.1
 
 CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H \
         -I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff -I.