diff -urN /usr/ports/devel/cvsd/Makefile devel/cvsd/Makefile
--- /usr/ports/devel/cvsd/Makefile	Tue Sep 10 20:08:04 2002
+++ devel/cvsd/Makefile	Tue Sep 17 19:29:59 2002
@@ -7,27 +7,26 @@
 #
 
 PORTNAME=	cvsd
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.12
 CATEGORIES=	devel
 MASTER_SITES=	http://tiefighter.et.tudelft.nl/~arthur/cvsd/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-CONFIGURE_ARGS=	--disable-afindep
 
 MAN5=	cvsd.conf.5
 MAN8=	cvsd.8 cvsd-buildroot.8 cvsd-passwd.8
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|init.d/cvsd|rc.d/cvsd.sh|g" \
-		-e "s|init.d|rc.d|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|init.d/cvsd|rc.d/cvsd.sh.sample|g ; \
+		 s|init.d|rc.d|g' ${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -urN /usr/ports/devel/cvsd/distinfo devel/cvsd/distinfo
--- /usr/ports/devel/cvsd/distinfo	Tue Sep 10 20:08:04 2002
+++ devel/cvsd/distinfo	Tue Sep 17 19:15:51 2002
@@ -1 +1 @@
-MD5 (cvsd-0.9.9.tar.gz) = f91650d1ee1e86f094fdd2d855f39d1a
+MD5 (cvsd-0.9.12.tar.gz) = 77c49735926ff213f80fa7c7dd21eb61
diff -urN /usr/ports/devel/cvsd/files/patch-cvsd.c devel/cvsd/files/patch-cvsd.c
--- /usr/ports/devel/cvsd/files/patch-cvsd.c	Thu Jan  1 09:00:00 1970
+++ devel/cvsd/files/patch-cvsd.c	Tue Sep 17 19:26:39 2002
@@ -0,0 +1,12 @@
+--- cvsd.c.orig	Sun Aug 25 09:44:33 2002
++++ cvsd.c	Tue Sep 17 19:26:31 2002
+@@ -60,7 +60,9 @@
+ #include <sys/wait.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
++#ifndef __FreeBSD__
+ #include <netinet/in.h>
++#endif
+ #include <arpa/inet.h>
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
diff -urN /usr/ports/devel/cvsd/pkg-plist devel/cvsd/pkg-plist
--- /usr/ports/devel/cvsd/pkg-plist	Mon Dec 31 14:33:17 2001
+++ devel/cvsd/pkg-plist	Tue Sep 17 19:30:06 2002
@@ -1,8 +1,8 @@
+etc/cvsd/cvsd.conf
+etc/rc.d/cvsd.sh.sample
 sbin/cvsd
 sbin/cvsd-buildroot
 sbin/cvsd-passwd
-etc/cvsd/cvsd.conf
-etc/rc.d/cvsd.sh
-@dirrm etc/cvsd
 %%PORTDOCS%%share/doc/cvsd/README
 %%PORTDOCS%%@dirrm share/doc/cvsd
+@dirrm etc/cvsd