Fri Mar 9 00:14:16 2012 UTC ()
add acl.c


(christos)
diff -r1.3 -r1.4 src/external/gpl2/xcvs/bin/xcvs/Makefile
cvs diff -r1.3 -r1.4 src/external/gpl2/xcvs/bin/xcvs/Makefile (switch to unified diff)

--- src/external/gpl2/xcvs/bin/xcvs/Makefile 2011/06/04 02:08:50 1.3
+++ src/external/gpl2/xcvs/bin/xcvs/Makefile 2012/03/09 00:14:16 1.4
@@ -1,63 +1,62 @@ @@ -1,63 +1,62 @@
1# $NetBSD: Makefile,v 1.3 2011/06/04 02:08:50 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.4 2012/03/09 00:14:16 christos Exp $
2 2
3.include "${.CURDIR}/../../Makefile.inc" 3.include "${.CURDIR}/../../Makefile.inc"
4 
5PROG= xcvs 4PROG= xcvs
6 5
7# So that cleandir works on case-insensitive file systems. 6# So that cleandir works on case-insensitive file systems.
8PROGNAME= cvs 7PROGNAME= cvs
9 8
10DIST= ${IDIST}/src 9DIST= ${IDIST}/src
11.PATH: ${DIST} ${IDIST}/doc ${IDIST}/man 10.PATH: ${DIST} ${IDIST}/doc ${IDIST}/man
12 11
13MAN= cvs.1 cvs.5 12MAN= cvs.1 cvs.5
14SRCS= add.c admin.c annotate.c buffer.c checkin.c checkout.c classify.c \ 13SRCS= acl.c add.c admin.c annotate.c buffer.c checkin.c checkout.c \
15 client.c commit.c create_adm.c cvsrc.c diff.c edit.c \ 14 classify.c client.c commit.c create_adm.c cvsrc.c diff.c edit.c \
16 entries.c error.c exithandle.c expand_path.c fileattr.c filesubr.c \ 15 entries.c error.c exithandle.c expand_path.c fileattr.c filesubr.c \
17 find_names.c hardlink.c hash.c history.c ignore.c import.c \ 16 find_names.c hardlink.c hash.c history.c ignore.c import.c \
18 lock.c log.c log-buffer.c login.c logmsg.c ls.c main.c mkmodules.c \ 17 lock.c log.c log-buffer.c login.c logmsg.c ls.c main.c mkmodules.c \
19 modules.c ms-buffer.c myndbm.c no_diff.c parseinfo.c patch.c rcs.c \ 18 modules.c ms-buffer.c myndbm.c no_diff.c parseinfo.c patch.c rcs.c \
20 rcscmds.c recurse.c release.c remove.c repos.c root.c rsh-client.c \ 19 rcscmds.c recurse.c release.c remove.c repos.c root.c rsh-client.c \
21 run.c scramble.c server.c stack.c status.c subr.c tag.c update.c \ 20 run.c scramble.c server.c stack.c status.c subr.c tag.c update.c \
22 vers_ts.c version.c watch.c wrapper.c zlib.c 21 vers_ts.c version.c watch.c wrapper.c zlib.c
23 22
24DPADD+= ${LIBDIFF} ${LIBCVS} 23DPADD+= ${LIBDIFF} ${LIBCVS}
25LDADD+= ${LIBDIFF} ${LIBCVS} 24LDADD+= ${LIBDIFF} ${LIBCVS}
26 25
27.if defined(USE_KERBEROS) && (${USE_KERBEROS} != "no") 26.if defined(USE_KERBEROS) && (${USE_KERBEROS} != "no")
28CPPFLAGS+= -DHAVE_GSSAPI -I${DESTDIR}/usr/include/krb5 27CPPFLAGS+= -DHAVE_GSSAPI -I${DESTDIR}/usr/include/krb5
29DPADD+= ${LIBGSSAPI} ${LIBKRB5} 28DPADD+= ${LIBGSSAPI} ${LIBKRB5}
30SRCS+= gssapi-client.c 29SRCS+= gssapi-client.c
31LDADD+= -lgssapi -lkrb5 30LDADD+= -lgssapi -lkrb5
32 31
33# libheimntlm is required by libgssapi 32# libheimntlm is required by libgssapi
34DPADD+= ${LIBHEIMNTLM} 33DPADD+= ${LIBHEIMNTLM}
35LDADD+= -lheimntlm 34LDADD+= -lheimntlm
36 35
37# libheimbase is required by libkrb5 36# libheimbase is required by libkrb5
38# libhx509 is required by libkrb5 37# libhx509 is required by libkrb5
39DPADD+= ${LIBHEIMBASE} ${LIBHX509} 38DPADD+= ${LIBHEIMBASE} ${LIBHX509}
40LDADD+= -lheimbase -lhx509 39LDADD+= -lheimbase -lhx509
41 40
42# libasn1 is required by all the above libs 41# libasn1 is required by all the above libs
43DPADD+= ${LIBASN1} 42DPADD+= ${LIBASN1}
44LDADD+= -lasn1 43LDADD+= -lasn1
45 44
46# libcom_err is required by libasn1 45# libcom_err is required by libasn1
47# libroken is required by libgssapi, libkrb5, libheimntlm, and libhx509 46# libroken is required by libgssapi, libkrb5, libheimntlm, and libhx509
48# libcrypto is required by libgssapi, libkrb5, and libhx509 47# libcrypto is required by libgssapi, libkrb5, and libhx509
49# libwind is required by libhx509 48# libwind is required by libhx509
50CPPFLAGS+= -DENCRYPTION 49CPPFLAGS+= -DENCRYPTION
51DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBCRYPTO} 50DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBCRYPTO}
52LDADD+= -lcom_err -lroken -lwind -lcrypto 51LDADD+= -lcom_err -lroken -lwind -lcrypto
53 52
54 53
55# libutil is required by libroken 54# libutil is required by libroken
56DPADD+= ${LIBUTIL} 55DPADD+= ${LIBUTIL}
57LDADD+= -lutil 56LDADD+= -lutil
58.endif 57.endif
59 58
60DPADD+= ${LIBCRYPT} ${LIBZ} 59DPADD+= ${LIBCRYPT} ${LIBZ}
61LDADD+= -lcrypt -lz 60LDADD+= -lcrypt -lz
62 61
63.include <bsd.prog.mk> 62.include <bsd.prog.mk>