From 28c83d46a6eca90d9abd2b90cc9c9b51a1e73249 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Mon, 27 Jan 2003 12:44:06 +0000
Subject: [PATCH] Update to 0.9.16.

PR:		ports/47317
Submitted by:	Ports Fury
---
 devel/cvsd/Makefile              | 26 ++++++++++++++------------
 devel/cvsd/distinfo              |  2 +-
 devel/cvsd/files/patch-configure | 24 ++++++++++++------------
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile
index 8c545ccb7ba9..09358a502693 100644
--- a/devel/cvsd/Makefile
+++ b/devel/cvsd/Makefile
@@ -7,31 +7,33 @@
 #
 
 PORTNAME=	cvsd
-PORTVERSION=	0.9.14
+PORTVERSION=	0.9.16
 CATEGORIES=	devel
 MASTER_SITES=	http://tiefighter.et.tudelft.nl/~arthur/cvsd/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
+USE_PERL5=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--with-libwrap
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 
 MAN5=	cvsd.conf.5
 MAN8=	cvsd.8 cvsd-buildroot.8 cvsd-passwd.8
 
+.if !exists(/usr/include/getopt.h)
+LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|@ACLOCAL@|${TRUE}|g ; \
-		 s|@AUTOCONF@|${TRUE}|g ; \
-		 s|@AUTOMAKE@|${TRUE}|g ; \
-		 s|@AUTOHEADER@|${TRUE}|g ; \
-		 s|init.d/cvsd|rc.d/cvsd.sh.sample|g ; \
+	@${REINPLACE_CMD} -e 's|init.d/cvsd|rc.d/cvsd.sh.sample|g ; \
 		 s|init.d|rc.d|g' ${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/devel/cvsd/distinfo b/devel/cvsd/distinfo
index fbd846a6a47d..30400609da11 100644
--- a/devel/cvsd/distinfo
+++ b/devel/cvsd/distinfo
@@ -1 +1 @@
-MD5 (cvsd-0.9.14.tar.gz) = bd978dad0d96875d1bf298aef397a359
+MD5 (cvsd-0.9.16.tar.gz) = 2f481b4ece7ae77ad24c39aaa61d5186
diff --git a/devel/cvsd/files/patch-configure b/devel/cvsd/files/patch-configure
index 850b5815ba6f..822d22c2c06a 100644
--- a/devel/cvsd/files/patch-configure
+++ b/devel/cvsd/files/patch-configure
@@ -1,18 +1,18 @@
---- configure	Sat Sep 14 18:11:40 2002
-+++ configure	Sat Sep 21 20:39:57 2002
-@@ -5498,6 +5498,7 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
+--- configure.orig	Sun Jan 19 22:20:34 2003
++++ configure	Mon Jan 20 02:43:51 2003
+@@ -6428,6 +6428,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 +#include <sys/types.h>
  #include <sys/socket.h>
  
- #ifdef F77_DUMMY_MAIN
-@@ -5557,6 +5558,7 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
+ int
+@@ -6486,6 +6487,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 +#include <sys/types.h>
  #include <sys/socket.h>
  
- #ifdef F77_DUMMY_MAIN
+ int