4 files changed, 26 insertions, 19 deletions

diff --git a/japanese/ndtpd/Makefile b/japanese/ndtpd/Makefile
index 8c7c33255f68..bc72a95723cb 100644
--- a/japanese/ndtpd/Makefile
+++ b/japanese/ndtpd/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	ndtpd
-PORTVERSION=	2.3.8
+PORTVERSION=	3.1.1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${DISTNAME}+2.diff
+PATCHFILES=	${DISTNAME}+.diff
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
-LIB_DEPENDS=	eb.3:${PORTSDIR}/japanese/eb
+LIB_DEPENDS=	eb.6:${PORTSDIR}/japanese/eb
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
 
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-logdir=${LOGDIR} \
-		--with-eb --with-eb-includes=${PREFIX}/include \
-		--with-zlib --with-eb-libraries=${PREFIX}/lib
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-logdir=${LOGDIR}
 
 .if !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	Maybe_interactive_at_install_stage
@@ -29,11 +28,10 @@ IS_INTERACTIVE=	Maybe_interactive_at_install_stage
 # Local variables
 LOGDIR=		/var/log
 RUNDIR=		/var/run
-STARTUP_SCRIPT=	ndtpd.sh.sample
-
-post-extract:
-	cd ${WRKSRC} && ${RM} -rf eb
+STARTUP_SCRIPT=	${PORTNAME}.sh.sample
 
+pre-configure:
+	cd ${WRKSRC}; autoconf
 post-build:
 	${SED} "s,@prefix@,${PREFIX},; s,@rundir@,${RUNDIR},"\
 	  ${FILESDIR}/${STARTUP_SCRIPT} > ${WRKDIR}/${STARTUP_SCRIPT}
diff --git a/japanese/ndtpd/distinfo b/japanese/ndtpd/distinfo
index c618c455e5a6..b8cdc4e4e37e 100644
--- a/japanese/ndtpd/distinfo
+++ b/japanese/ndtpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (ndtpd-2.3.8.tar.gz) = eef3dd6caa2c2e9c86ad6ca458670567
-MD5 (ndtpd-2.3.8+2.diff) = f2df1db77591257c758a5f726a626eb7
+MD5 (ndtpd-3.1.1.tar.gz) = 84e12593cd38cf1ff85de05274a20560
+MD5 (ndtpd-3.1.1+.diff) = ad650bf77dccaa364c831928fd7039fa
diff --git a/japanese/ndtpd/pkg-descr b/japanese/ndtpd/pkg-descr
index c62a145acf09..bb90d62bfe49 100644
--- a/japanese/ndtpd/pkg-descr
+++ b/japanese/ndtpd/pkg-descr
@@ -1,14 +1,18 @@
 NDTPD is a server for accessing CD-ROM books with NDTP (Network
 Dictionary Transfer Protocol) on TCP.  You can replace dserver with
-NDTPD.  NDTPD can run on UNIX derived systems.  It supports to access
-CD-ROM books of EB, EBG, EBXA and EPWING formats.  CD-ROM books of
-those formats are popular in Japan.  Since CD-ROM books themseves are
-stands on the ISO 9660 format, you can mount the discs by the same way
-as other ISO 9660 discs.
+NDTPD.  NDTPD can run on UNIX derived systems.  It supports CD-ROM
+books of EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats.  CD-ROM
+books of those formats are popular in Japan.  Since CD-ROM books
+themseves are stands on the ISO 9660 format, you can mount the discs
+by the same way as other ISO 9660 discs.
 
 -- Motoyuki Kasahara <m-kasahr@sra.co.jp>
 
+In addition, you must follow the licenses of your CD-ROM books.
+Though NDTPD is free software, your books may not be free.  Don't
+open your books to unlicensed hosts nor users.
+
 You can get information about NDTPD from their website.
 WWW: http://www.sra.co.jp/people/m-kasahr/ndtpd/
 
--- Kazutoki TAKAMUNE <takamune@avrl.mei.co.jp>
+-- Kazu TAKAMUNE <takamune@avrl.mei.co.jp>
diff --git a/japanese/ndtpd/pkg-plist b/japanese/ndtpd/pkg-plist
index df03224f8737..cb1c2f7b6ac5 100644
--- a/japanese/ndtpd/pkg-plist
+++ b/japanese/ndtpd/pkg-plist
@@ -3,7 +3,11 @@ etc/rc.d/ndtpd.sh.sample
 @unexec install-info --delete %D/info/ndtpd-ja.info %D/info/dir
 @unexec install-info --delete %D/info/ndtpd.info %D/info/dir
 info/ndtpd-ja.info
+info/ndtpd-ja.info-1
+info/ndtpd-ja.info-2
 info/ndtpd.info
+info/ndtpd.info-1
+info/ndtpd.info-2
 @exec install-info %D/info/ndtpd-ja.info %D/info/dir
 @exec install-info %D/info/ndtpd.info %D/info/dir
 libexec/ndtpstat
@@ -11,3 +15,4 @@ sbin/ndtpcheck
 sbin/ndtpcontrol
 sbin/ndtpd
 sbin/ndtpdaily
+sbin/ndtpupgrade