Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 02 Mar 2002 01:04:25 +0900 (JST)
From:      Kazu TAKAMUNE <takamune@avrl.mei.co.jp>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        takamune@avrl.mei.co.jp
Subject:   ports/35458: Update: japanese/eb, japanese/ndtpd
Message-ID:  <20020302.010425.126570044.takamune@mail.com>

next in thread | raw e-mail | index | archive | help

>Number:         35458
>Category:       ports
>Synopsis:       Update: japanese/eb, japanese/ndtpd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 01 08:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Kazu TAKAMUNE
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
Matsushita Electric Industrial Co., Ltd.
>Environment:

FreeBSD 4.5-STABLE(Thu Feb 28 11:34:24 JST 2002)
ports/Mk/bsd.port.mk,v 1.400 2002/02/24 16:54:34

>Description:

Please apply this patch to upgrade ports (of which I'm the maintainer).

These ports should be simultaneously upgraded.
  - Updates japanese/eb for the latest version 3.2
  - Updates japanese/ndtpd for the latest version 3.1.1pl1
  - No files have been added or removed.

Notice:
  EB-3.2 is not upper compatible with old version 2.3.8.
  We have three ports which directly depend EB library;
	japanese/eblook, japanese/ruby-eb, japanese/kebook,
  and we can maintain them in refering ja-eb-3.2, not including
  ja-kebook-0.35.

  So please repository copy 'ports/japanese/eb' to 'ports/japanese/eb2',
  refine japasese/kebook/Makefile, and then commit this PR.

Changes:
  - japanese/eb
    o Use internal libtool-1.4 (It is not portlint clean!)
    o Use autoconf-2.5.2
    o Use gettext and iconv
    o EB does not have the ZLIB sybsystem in itself.

  - japanese/ndtpd
    o Use internal libtool-1.4
    o Use autoconf-2.5.2
    o NDTPD does not have the EB sybsystem in itself.
    o Append license notes to pkg-descr.

cf:
  USE_AUTOMAKE_VER=15 does not accepted by both ports.

>How-To-Repeat:
>Fix:

diff -x CVS -Nur /usr/ports/japanese/eb/Makefile japanese/eb/Makefile
--- /usr/ports/japanese/eb/Makefile	Mon Aug 21 12:39:42 2000
+++ japanese/eb/Makefile	Wed Feb 27 23:12:35 2002
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eb
-PORTVERSION=	2.3.8
+PORTVERSION=	3.2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
 DISTFILES=	${EBFILES} \
@@ -15,10 +15,14 @@
 EXTRACT_ONLY=	${EBFILES}
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${DISTNAME}+.diff
+#PATCHFILES=	${DISTNAME}+.diff
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		iconv.2:${PORTSDIR}/converters/iconv
+
 EBFILES=	${DISTNAME}${EXTRACT_SUFX}
 LISTFILES=	appendix/LIST \
 		appendix/LIST-ja
@@ -49,14 +53,21 @@
 		appendix/superdic98-1.0.tar.gz
 
 DIST_SUBDIR=	eb
-USE_LIBTOOL=	yes
+#USE_AUTOMAKE_VER=	15	# Broken!
+USE_AUTOCONF_VER=	252
+AUTOCONF=	autoconf
+
+#USE_LIBTOOL=	yes		# Use internal libtool-1.4
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--with-zlib
 
-APPENDIXDIR=	${PREFIX}/share/eb/appendix
+#AUTOMAKE_ARGS=	--gnu Makefile
+CONFIGURE_ARGS=	--enable-nls \
+		--with-gettext-includes=${PREFIX}/include \
+		--with-gettext-libraries=${PREFIX}/lib \
+		--with-iconv-includes=${PREFIX}/include \
+		--with-iconv-libraries=${PREFIX}/lib
 
-post-extract:
-	cd ${WRKSRC} && ${RM} -rf zlib
+APPENDIXDIR=	${PREFIX}/share/eb/appendix
 
 post-install:
 .for file in ${LISTFILES}
diff -x CVS -Nur /usr/ports/japanese/eb/distinfo japanese/eb/distinfo
--- /usr/ports/japanese/eb/distinfo	Thu Mar 15 06:24:49 2001
+++ japanese/eb/distinfo	Mon Feb 25 11:34:25 2002
@@ -1,4 +1,4 @@
-MD5 (eb/eb-2.3.8.tar.gz) = fd4e150cf1fc45123a2d82eba0253604
+MD5 (eb/eb-3.2.tar.gz) = eba5a188efcde804f567d9bb7182f4d9
 MD5 (eb/appendix/LIST) = c7119dfcaf285b4db78b586f22f677ca
 MD5 (eb/appendix/LIST-ja) = b878956caacf2e72a9eeafc3292494d8
 MD5 (eb/appendix/cencro-1.0.tar.gz) = 1c93a68fae90990b631bd5302349d199
@@ -26,4 +26,3 @@
 MD5 (eb/appendix/readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
 MD5 (eb/appendix/readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4
 MD5 (eb/appendix/superdic98-1.0.tar.gz) = cc38fde2e6d5b12dba6f494a8a979b03
-MD5 (eb/eb-2.3.8+.diff) = 49feb40cf4388d54ae3deb4027078cbe
diff -x CVS -Nur /usr/ports/japanese/eb/pkg-plist japanese/eb/pkg-plist
--- /usr/ports/japanese/eb/pkg-plist	Wed Jul  5 01:34:25 2000
+++ japanese/eb/pkg-plist	Wed Feb 27 23:34:52 2002
@@ -5,16 +5,17 @@
 bin/ebunzip
 bin/ebzip
 bin/ebzipinfo
+etc/eb.conf
 include/eb/appendix.h
+include/eb/binary.h
 include/eb/defs.h
 include/eb/eb.h
 include/eb/error.h
 include/eb/font.h
-include/eb/language.h
 include/eb/text.h
+include/eb/zio.h
 @dirrm include/eb
 @unexec install-info --delete %D/info/eb-ja.info %D/info/dir
-@unexec install-info --delete %D/info/eb.info %D/info/dir
 @unexec install-info --delete %D/info/ebfont-ja.info %D/info/dir
 @unexec install-info --delete %D/info/ebfont.info %D/info/dir
 @unexec install-info --delete %D/info/ebinfo-ja.info %D/info/dir
@@ -24,7 +25,6 @@
 @unexec install-info --delete %D/info/ebzip-ja.info %D/info/dir
 @unexec install-info --delete %D/info/ebzip.info %D/info/dir
 info/eb-ja.info
-info/eb.info
 info/ebfont-ja.info
 info/ebfont.info
 info/ebinfo-ja.info
@@ -34,7 +34,6 @@
 info/ebzip-ja.info
 info/ebzip.info
 @exec install-info %D/info/eb-ja.info %D/info/dir
-@exec install-info %D/info/eb.info %D/info/dir
 @exec install-info %D/info/ebfont-ja.info %D/info/dir
 @exec install-info %D/info/ebfont.info %D/info/dir
 @exec install-info %D/info/ebinfo-ja.info %D/info/dir
@@ -44,8 +43,9 @@
 @exec install-info %D/info/ebzip-ja.info %D/info/dir
 @exec install-info %D/info/ebzip.info %D/info/dir
 lib/libeb.a
+lib/libeb.la
 lib/libeb.so
-lib/libeb.so.3
+lib/libeb.so.6
 share/eb/appendix/LIST
 share/eb/appendix/LIST-ja
 share/eb/appendix/cencro-1.0/catalog
@@ -203,6 +203,9 @@
 share/eb/appendix/superdic98-1.0/kanjigen/data/furoku
 share/eb/appendix/superdic98-1.0/koujien.app
 share/eb/appendix/superdic98-1.0/koujien/data/furoku
+share/eb/eb3.m4
+share/locale/ja/LC_MESSAGES/eb.mo
+share/locale/ja/LC_MESSAGES/ebutils.mo
 @dirrm share/eb/appendix/cencro-1.0/cencro
 @dirrm share/eb/appendix/cencro-1.0
 @dirrm share/eb/appendix/genius-1.0/genius

diff -x CVS -Nur /usr/ports/japanese/ndtpd/Makefile japanese/ndtpd/Makefile
--- /usr/ports/japanese/ndtpd/Makefile	Wed Aug 30 05:16:57 2000
+++ japanese/ndtpd/Makefile	Sat Mar  2 00:36:09 2002
@@ -6,21 +6,24 @@
 #
 
 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
 
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-logdir=${LOGDIR} \
-		--with-eb --with-eb-includes=${PREFIX}/include \
-		--with-zlib --with-eb-libraries=${PREFIX}/lib
+#USE_AUTOMAKE_VER=	15	# Broken!
+USE_AUTOCONF_VER=	252
+AUTOCONF=	autoconf
+#USE_LIBTOOL=	yes		# Use internal libtool-1.4
+
+#AUTOMAKE_ARGS=	--include-deps
+CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-logdir=${LOGDIR}
 
 .if !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	Maybe_interactive_at_install_stage
@@ -29,10 +32,7 @@
 # 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
 
 post-build:
 	${SED} "s,@prefix@,${PREFIX},; s,@rundir@,${RUNDIR},"\
diff -x CVS -Nur /usr/ports/japanese/ndtpd/distinfo japanese/ndtpd/distinfo
--- /usr/ports/japanese/ndtpd/distinfo	Wed Aug 30 05:16:57 2000
+++ japanese/ndtpd/distinfo	Mon Feb 25 18:23:11 2002
@@ -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 -x CVS -Nur /usr/ports/japanese/ndtpd/pkg-descr japanese/ndtpd/pkg-descr
--- /usr/ports/japanese/ndtpd/pkg-descr	Thu Aug 19 19:50:20 1999
+++ japanese/ndtpd/pkg-descr	Wed Feb 27 23:08:38 2002
@@ -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 -x CVS -Nur /usr/ports/japanese/ndtpd/pkg-plist japanese/ndtpd/pkg-plist
--- /usr/ports/japanese/ndtpd/pkg-plist	Thu Mar 30 20:24:44 2000
+++ japanese/ndtpd/pkg-plist	Wed Feb 27 22:48:48 2002
@@ -3,7 +3,11 @@
 @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/ndtpcontrol
 sbin/ndtpd
 sbin/ndtpdaily
+sbin/ndtpupgrade
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020302.010425.126570044.takamune>