ports/163626: [Update] net-p2p/ncdc to 1.6

[Dmitriy Limonov]

>Number:         163626
>Category:       ports
>Synopsis:       [Update] net-p2p/ncdc to 1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 26 11:10:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Dmitriy Limonov
>Release:        FreeBSD 8.2-RELEASE-p5 amd64
>Organization:
>Environment:
FreeBSD excluzive.ws 8.2-RELEASE-p5 FreeBSD 8.2-RELEASE-p5 #0: Sun Dec 25 09:12:20 MSK 2011     earl at excluzive.ws:/usr/obj/usr/src/sys/EXCLUZIVE  amd64

>Description:
Update ncdc to version 1.6
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Naur ncdc.orig/Makefile ncdc/Makefile
--- ncdc.orig/Makefile	2011-12-25 11:26:30.000000000 +0000
+++ ncdc/Makefile	2011-12-26 10:33:31.634985706 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ncdc
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dev.yorhel.nl/download/
@@ -15,18 +15,35 @@
 MAINTAINER=	earl1k at mail.ru
 COMMENT=	Lightweight direct connect client with ncurses interface
 
-LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm \
+LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3 \
 		xml2:${PORTSDIR}/textproc/libxml2
 
+OPTIONS=	GDBM "Build ncdc-db-upgrade" off
+
 USE_GNOME=	glib20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
-MAN1=		ncdc.1 ncdc-gen-cert.1
+MAN1=		ncdc.1 ncdc-gen-cert.1 ncdc-db-upgrade.1
 PLIST_FILES=	bin/ncdc bin/ncdc-gen-cert
 
 #force base compiler,linker flags to avoid linking to ncurses from ports
 CFLAGS+=	-I/usr/include -I${LOCALBASE}/include
 LDFLAGS+=	-L/usr/lib -L${LOCALBASE}/lib
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_GDBM)
+LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
+PLIST_FILES+=	bin/ncdc-db-upgrade
+.else
+post-patch:
+	@${REINPLACE_CMD} \
+		-e '/#include <gdbm.h>/d' \
+		${WRKSRC}/src/fl_local.c
+	@${REINPLACE_CMD} \
+		-e '/have_gdbm=yes/d' \
+		${WRKSRC}/configure
+.endif
+
 .include <bsd.port.mk>
diff -Naur ncdc.orig/distinfo ncdc/distinfo
--- ncdc.orig/distinfo	2011-12-25 11:26:30.000000000 +0000
+++ ncdc/distinfo	2011-12-26 08:12:25.285875314 +0000
@@ -1,2 +1,2 @@
-SHA256 (ncdc-1.5.tar.gz) = d6bd0e6a9e4852a4bbf4249954d65863b1f9dcc0064eb9923f3a1e95e9c1fd03
-SIZE (ncdc-1.5.tar.gz) = 282706
+SHA256 (ncdc-1.6.tar.gz) = 13d898455c5892364ff0769be76cc5fb188a801b08ba3a646e0ecf217db6ddfc
+SIZE (ncdc-1.6.tar.gz) = 304918


>Release-Note:
>Audit-Trail:
>Unformatted: