Upgrade to 2.3.6.

Changes (from PR):
   - japanese/ndtpd
     o Set default syslog file for `/var/log/ndtpd.log'.
     o Change the default working directory `/var/ndtpd' to `/var/run/ndtpd'.
        * It will created by `${PREFIX}/etc/rc.d/ndtpd.sh'
          (even if the user select "Inetd mode" !)
        * Lock files and a PID file are created under it.
     o Support some arguments in the startup script:
        ${PREFIX}/etc/rc.d/ndtpd.sh start|stop|kill|restart|status|terminate
     o Separate the session to build `ndtpd.sh.sample'
       from `post-install' into `post-build'.
     o Don't configure EB sybsystem in NDTPD.
   - japanese/eb
     o Don't configure ZLIB sybsystem in EB.
     o Don't define CONFIGURE_ENV.
        * Suggested by Michael's last commit to japanese/ndtpd/Makefile.

PR:		16117
Submitted by:	Kazu TAKAMUNE <takamune@avrl.mei.co.jp>

1 files changed, 15 insertions, 15 deletions

diff --git a/japanese/ndtpd/Makefile b/japanese/ndtpd/Makefile
index e59c4d08e902..dbeb18ed2a87 100644
--- a/japanese/ndtpd/Makefile
+++ b/japanese/ndtpd/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	ndtpd
-# Version required:		2.3.5
+# Version required:		2.3.6
 # Date created:			4 Aug 1998
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ndtpd-2.3.5
-PKGNAME=	ja-ndtpd-2.3.5
+DISTNAME=	ndtpd-2.3.6
+PKGNAME=	ja-ndtpd-2.3.6
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/
 
@@ -16,28 +16,28 @@ MAINTAINER=	takamune@avrl.mei.co.jp
 LIB_DEPENDS=	eb.3:${PORTSDIR}/japanese/eb
 
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${VARDIR} --with-eb --with-zlib \
-		--with-eb-includes=${PREFIX}/include \
-		--with-eb-libraries=${PREFIX}/lib
+CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-logdir=${LOGDIR} \
+		--with-eb --with-eb-includes=${PREFIX}/include \
+		--with-zlib --with-eb-libraries=${PREFIX}/lib
 
 .if !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	Maybe_interactive_at_install_stage
 .endif
-PLIST_SUB=	VARDIR=${VARDIR} OWNER=${OWNER} GROUP=${GROUP} MODE=${MODE}
 
 # Local variables
-VARDIR=		/var
-OWNER=		nobody
-GROUP=		nogroup
-MODE=		755
+LOGDIR=		/var/log
+RUNDIR=		/var/run
 STARTUP_SCRIPT=	ndtpd.sh.sample
-INSTALL_DIR=	${INSTALL} -d -o ${OWNER} -g ${GROUP} -m ${MODE}
+
+post-extract:
+	cd ${WRKSRC} && ${RM} -rf eb
+
+post-build:
+	${SED} "s,@prefix@,${PREFIX},; s,@rundir@,${RUNDIR},"\
+	  ${FILESDIR}/${STARTUP_SCRIPT} > ${WRKDIR}/${STARTUP_SCRIPT}
 
 post-install:
-	${SED} "s,@prefix@,${PREFIX}," ${FILESDIR}/${STARTUP_SCRIPT} \
-	  > ${WRKDIR}/${STARTUP_SCRIPT}
 	${INSTALL_SCRIPT} ${WRKDIR}/${STARTUP_SCRIPT} ${PREFIX}/etc/rc.d
-	${INSTALL_DIR} ${VARDIR}/ndtpd
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}