4 files changed, 32 insertions, 53 deletions

diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile
index 4b2b2733b71f..d12330d5de69 100644
--- a/devel/cvsnt/Makefile
+++ b/devel/cvsnt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvsnt
-PORTVERSION=	2.5.01.1927
+PORTVERSION=	2.5.02.2115
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cvsnt.org/archive/
 
@@ -15,27 +15,27 @@ COMMENT=	CVS clone
 
 CONFLICTS=	cvs-1*
 
-USE_LIBLTDL=	yes
 USE_INC_LIBTOOL_VER=	13
 USE_RC_SUBR=	cvslockd.sh
-CONFIGURE_ARGS=	--enable-fork
+CONFIGURE_ARGS=	--enable-fork\
+		--disable-odbc --disable-postgres\
+		--disable-mysql --disable-sqlite
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
 USE_ICONV=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include"\
+		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"\
+		ac_cv_have_howl=no ac_cv_search_sw_discovery_run=no
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 MAN1=		cvs.1
 MAN5=		cvs.5
 MLINKS=		cvs.1 cvsnt.1 cvs.5 cvsnt.5
 
-.if exists(/usr/include/gssapi.h)
-PLIST_SUB=	GSERVER=""
-.else
-PLIST_SUB=	GSERVER="@comment "
-CONFIGURE_ARGS+=--disable-gserver
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+IGNORE=		requires wscanf, vswprintf
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/cvsnt/distinfo b/devel/cvsnt/distinfo
index b3f0363acd97..4a8ca3cc2a52 100644
--- a/devel/cvsnt/distinfo
+++ b/devel/cvsnt/distinfo
@@ -1,2 +1,2 @@
-MD5 (cvsnt-2.5.01.1927.tar.gz) = daa028983a4d5aa71b95ff2d506b017c
-SIZE (cvsnt-2.5.01.1927.tar.gz) = 5247997
+MD5 (cvsnt-2.5.02.2115.tar.gz) = 02835f3751272b06437a42ac80c27bdd
+SIZE (cvsnt-2.5.02.2115.tar.gz) = 6370312
diff --git a/devel/cvsnt/files/patch-protocols-gserver.c b/devel/cvsnt/files/patch-protocols-gserver.c
deleted file mode 100644
index 791637ccd094..000000000000
--- a/devel/cvsnt/files/patch-protocols-gserver.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- protocols/gserver.c.orig	Fri Mar 18 20:56:35 2005
-+++ protocols/gserver.c	Wed Apr 20 01:49:15 2005
-@@ -43,12 +43,13 @@
- 
- #ifdef HAVE_GSSAPI_H
- #include <gssapi.h>
--#endif
-+#else
- #ifdef HAVE_GSSAPI_GSSAPI_H
- #include <gssapi/gssapi.h>
- #endif /* freebsd needs 'else' but this breaks on other platforms so is incorrect for the main distribution.  Fix manually if building on that platform */
- #ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
- #include <gssapi/gssapi_generic.h>
-+#endif
- #endif
- #include <krb5.h>
- 
diff --git a/devel/cvsnt/pkg-plist b/devel/cvsnt/pkg-plist
index ba92a952e532..5325411c9d32 100644
--- a/devel/cvsnt/pkg-plist
+++ b/devel/cvsnt/pkg-plist
@@ -1,19 +1,27 @@
 bin/cvs
 bin/cvslockd
 bin/cvsnt
-bin/rcs2log
 etc/cvsnt/PServer.example
+etc/cvsnt/Plugins.example
 etc/cvsnt/ca.pem
+lib/cvsnt/audit_trigger.la
+lib/cvsnt/audit_trigger.so
+lib/cvsnt/checkout_trigger.la
+lib/cvsnt/checkout_trigger.so
 lib/cvsnt/default_trigger.la
 lib/cvsnt/default_trigger.so
+lib/cvsnt/email_trigger.la
+lib/cvsnt/email_trigger.so
+lib/cvsnt/enum_protocol.la
+lib/cvsnt/enum_protocol.so
 lib/cvsnt/ext_protocol.la
 lib/cvsnt/ext_protocol.so
 lib/cvsnt/ext_xdiff.la
 lib/cvsnt/ext_xdiff.so
 lib/cvsnt/fork_protocol.la
 lib/cvsnt/fork_protocol.so
-%%GSERVER%%lib/cvsnt/gserver_protocol.la
-%%GSERVER%%lib/cvsnt/gserver_protocol.so
+lib/cvsnt/gserver_protocol.la
+lib/cvsnt/gserver_protocol.so
 lib/cvsnt/pserver_protocol.la
 lib/cvsnt/pserver_protocol.so
 lib/cvsnt/server_protocol.la
@@ -22,26 +30,14 @@ lib/cvsnt/sserver_protocol.la
 lib/cvsnt/sserver_protocol.so
 lib/cvsnt/sspi_protocol.la
 lib/cvsnt/sspi_protocol.so
-lib/libcvsapi-2.5.01.1927.so
+lib/libcvsapi-2.5.02.2115.so
 lib/libcvsapi.la
 lib/libcvsapi.so
-share/cvsnt/contrib/README
-share/cvsnt/contrib/clmerge
-share/cvsnt/contrib/cln_hist
-share/cvsnt/contrib/commit_prep
-share/cvsnt/contrib/cvs2vendor
-share/cvsnt/contrib/cvs_acls
-share/cvsnt/contrib/cvscheck
-share/cvsnt/contrib/debug_check_log
-share/cvsnt/contrib/intro.doc
-share/cvsnt/contrib/log
-share/cvsnt/contrib/log_accum
-share/cvsnt/contrib/mfpipe
-share/cvsnt/contrib/rcs-to-cvs
-share/cvsnt/contrib/rcs2log
-share/cvsnt/contrib/rcslock
-share/cvsnt/contrib/sccs2rcs
-@dirrm share/cvsnt/contrib
-@dirrm share/cvsnt
+lib/libcvstools-2.5.02.2115.so
+lib/libcvstools.la
+lib/libcvstools.so
+lib/libmdnsclient-2.5.02.2115.so
+lib/libmdnsclient.la
+lib/libmdnsclient.so
 @dirrm lib/cvsnt
 @dirrm etc/cvsnt