7 files changed, 40 insertions, 31 deletions

diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile
index 2f5681b69f4e..0b1c8515b4e2 100644
--- a/devel/cvsnt/Makefile
+++ b/devel/cvsnt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvsnt
-PORTVERSION=	2.0.34
+PORTVERSION=	2.0.51
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cvsnt.org/archive/ \
 		http://homepages.nildram.co.uk/~tmhoyle/
@@ -15,7 +15,8 @@ MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	CVS clone
 
 USE_LIBLTDL=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
+USE_RC_SUBR=	yes
 CONFIGURE_ARGS=	--enable-fork
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
@@ -31,5 +32,16 @@ PLIST_SUB=	GSERVER=""
 .else
 PLIST_SUB=	GSERVER="@comment "
 .endif
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
+STARTUPDIR=	etc/rc.d
+STARTUPFILES=	cvslockd.sh
+
+post-install:
+.for file in ${STARTUPFILES}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/${file} > ${WRKDIR}/${file}
+	${INSTALL_SCRIPT} ${WRKDIR}/${file} ${PREFIX}/${STARTUPDIR}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/cvsnt/distinfo b/devel/cvsnt/distinfo
index 26617e925206..062f23729f83 100644
--- a/devel/cvsnt/distinfo
+++ b/devel/cvsnt/distinfo
@@ -1,2 +1,2 @@
-MD5 (cvsnt-2.0.34.tar.gz) = b6aa62d34aa51928e816e3c093718d2e
-SIZE (cvsnt-2.0.34.tar.gz) = 3653441
+MD5 (cvsnt-2.0.51.tar.gz) = 47cdda97c63f3c0ce447c34a721d31e0
+SIZE (cvsnt-2.0.51.tar.gz) = 4238853
diff --git a/devel/cvsnt/files/cvslockd.sh b/devel/cvsnt/files/cvslockd.sh
new file mode 100644
index 000000000000..9364402ca382
--- /dev/null
+++ b/devel/cvsnt/files/cvslockd.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cvslockd
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+#
+. %%RC_SUBR%%
+
+[ -z "$cvslockd_enable" ] && cvslockd_enable="NO"
+
+name=cvslockd
+rcvar=`set_rcvar`
+command=%%PREFIX%%/bin/${name}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/devel/cvsnt/files/patch-configure b/devel/cvsnt/files/patch-configure
index 73aad5724e6d..5cf90f7ca076 100644
--- a/devel/cvsnt/files/patch-configure
+++ b/devel/cvsnt/files/patch-configure
@@ -1,12 +1,10 @@
---- configure.orig	Mon Feb  9 21:48:11 2004
-+++ configure	Sun Feb 22 03:02:53 2004
-@@ -19221,7 +19221,8 @@
- 
+--- configure.orig	Sun Aug  1 00:11:00 2004
++++ configure	Sun Aug  1 00:12:15 2004
+@@ -19196,6 +19196,7 @@
  
  # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
-+/usr/local/share/libtool13/ltconfig13 $LIBTOOL_DEPS
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/cvsnt/files/patch-cvsdelta-cvsdelta.cpp b/devel/cvsnt/files/patch-cvsdelta-cvsdelta.cpp
deleted file mode 100644
index a4a054a3cbb6..000000000000
--- a/devel/cvsnt/files/patch-cvsdelta-cvsdelta.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- cvsdelta/cvsdelta.cpp.orig	Thu Mar  4 01:17:46 2004
-+++ cvsdelta/cvsdelta.cpp	Thu Mar  4 01:18:01 2004
-@@ -23,6 +23,7 @@
- #if defined(_WIN32)
-   #include <winsock2.h>
- #else
-+  #include <sys/types.h>
-   #include <netinet/in.h>
- #endif
- 
diff --git a/devel/cvsnt/files/patch-lockservice-LockParse.cpp b/devel/cvsnt/files/patch-lockservice-LockParse.cpp
deleted file mode 100644
index 16475977521d..000000000000
--- a/devel/cvsnt/files/patch-lockservice-LockParse.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lockservice/LockParse.cpp.orig	Thu Mar  4 01:19:43 2004
-+++ lockservice/LockParse.cpp	Thu Mar  4 01:19:58 2004
-@@ -11,6 +11,7 @@
- #include <sys/socket.h>
- #include <netdb.h>
- #include <errno.h>
-+#include <time.h>
- #define SOCKET int
- #endif
- 
diff --git a/devel/cvsnt/pkg-plist b/devel/cvsnt/pkg-plist
index 578dac593a2f..df984925c099 100644
--- a/devel/cvsnt/pkg-plist
+++ b/devel/cvsnt/pkg-plist
@@ -4,6 +4,7 @@ bin/cvslockd
 bin/rcs2log
 bin/rcsdiff
 bin/rlog
+etc/rc.d/cvslockd.sh
 etc/cvsnt/PServer.example
 lib/cvsnt/ca.pem
 lib/cvsnt/ext_protocol.so