Update to 2.5.04.3236.

svn path=/head/; revision=230118

devel/cvsnt/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cvsnt
-PORTVERSION=	2.5.03.2704
-PORTREVISION=	1
+PORTVERSION=	2.5.04.3236
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cvsnt.org/archive/
 
@@ -16,19 +15,18 @@ COMMENT=	CVS clone
 
 CONFLICTS=	cvs-1*
 
-SUB_FILES=	patch-rcs-common.cpp
-
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	cvslockd.sh
 CONFIGURE_ARGS=	--enable-fork --enable-rcs \
 		--disable-odbc --disable-postgres\
-		--disable-mysql --disable-sqlite
+		--disable-mysql --disable-sqlite\
+		--without-howl
 USE_ICONV=	yes
 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
+		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2\
 		pcre.0:${PORTSDIR}/devel/pcre
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 MAN1=		cvs.1
 MAN5=		cvs.5

devel/cvsnt/distinfo

@@ -1,3 +1,3 @@
-MD5 (cvsnt-2.5.03.2704.tar.gz) = f7b854bfbab784f331b58f9df012f64d
-SHA256 (cvsnt-2.5.03.2704.tar.gz) = f7ae5f010b214751e70c064550e31bc939b71656ae4594e7b218a7e3d54581d6
-SIZE (cvsnt-2.5.03.2704.tar.gz) = 7088568
+MD5 (cvsnt-2.5.04.3236.tar.gz) = 853d1f2e1c89e8776467271d34bc0dcf
+SHA256 (cvsnt-2.5.04.3236.tar.gz) = 8cd0445efc9ebe653ba1cdecc38765fe4d8986b879cb2272025bc1840f74ac33
+SIZE (cvsnt-2.5.04.3236.tar.gz) = 9831558

devel/cvsnt/files/patch-diff-diff3.c

@@ -1,11 +0,0 @@
---- diff/diff3.c.orig	2007-11-06 23:59:45.000000000 +0600
-+++ diff/diff3.c	2007-11-06 23:59:05.000000000 +0600
-@@ -1367,7 +1367,7 @@
-   char const **ap;
-   char *diffout;
-   char *difffn;
--  char *encoding;
-+  char *encoding = NULL;
- 
-   TRACE(3, "read_diff() - process arguments");
-   ap = argv;

devel/cvsnt/pkg-plist

@@ -2,6 +2,7 @@ bin/co
 bin/cvs
 bin/cvslockd
 bin/cvsnt
+bin/cvsscript
 bin/rcsdiff
 bin/rlog
 etc/cvsnt/PServer.example
@@ -25,6 +26,8 @@ lib/cvsnt/protocols/sserver.la
 lib/cvsnt/protocols/sserver.so
 lib/cvsnt/protocols/sspi.la
 lib/cvsnt/protocols/sspi.so
+lib/cvsnt/protocols/sync.la
+lib/cvsnt/protocols/sync.so
 lib/cvsnt/triggers/audit.la
 lib/cvsnt/triggers/audit.so
 lib/cvsnt/triggers/checkout.la
@@ -35,13 +38,13 @@ lib/cvsnt/triggers/info.la
 lib/cvsnt/triggers/info.so
 lib/cvsnt/xdiff/extdiff.la
 lib/cvsnt/xdiff/extdiff.so
-lib/libcvsapi-2.5.03.2704.so
+lib/libcvsapi-%%PORTVERSION%%.so
 lib/libcvsapi.la
 lib/libcvsapi.so
-lib/libcvstools-2.5.03.2704.so
+lib/libcvstools-%%PORTVERSION%%.so
 lib/libcvstools.la
 lib/libcvstools.so
-lib/libmdnsclient-2.5.03.2704.so
+lib/libmdnsclient-%%PORTVERSION%%.so
 lib/libmdnsclient.la
 lib/libmdnsclient.so
 @dirrm lib/cvsnt/xdiff