Date: Wed, 19 Apr 2000 21:32:31 +0900 From: Makoto MATSUSHITA <matusita@jp.freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18092: Update ports: japanese/dbskkd-cdb Message-ID: <20000419213231K.matusita@jp.FreeBSD.org>
next in thread | raw e-mail | index | archive | help
>Number: 18092
>Category: ports
>Synopsis: Update ports: japanese/dbskkd-cdb
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 19 05:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Makoto MATSUSHITA
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
Japan FreeBSD Users' Group
>Environment:
FreeBSD 5.0-CURRENT (as of Apr/18/2000)
>Description:
Current ports/japanese/dbskkd-cdb is broken 'cause
ports/database/cdb is updated to 0.70 (and it is incompatible
to cdb-0.55).
There is a new development version, 1.70dev; however, it
requires latest version of daemontools which is not included
current ports (ports/sysutils/daemontools). Note that 1.70dev
also requires ucspi-tcp.
>How-To-Repeat:
cd ${PORTSDIR}/japanese/dbskkd-cdb
make
>Fix:
Here is a first-aid patch to current ports/japanese/dbskkd-cdb. This
patch includes cdb-0.55 itself (not installed) and does not depends on
ports/database/cdb anymore. Also some cosmetics are applied.
I'll update dbskkd-cdb to 1.70dev or whatever latest version
available, if the ports of daemontools and/or ucspi-tcp are updated.
Please consult this patch and apply to our CVS repository.
--- Makefile.dist Mon Apr 17 14:00:40 2000
+++ Makefile Wed Apr 19 21:12:37 2000
@@ -9,6 +9,8 @@
PORTVERSION= 1.01
CATEGORIES= japanese
MASTER_SITES= http://www.k2r.org/kenji/software/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ cdb-0.55.tar.gz
MAINTAINER= matusita@jp.Freebsd.ORG
@@ -21,12 +23,12 @@
post-patch:
.for docs in ${DOCS}
- @${SED} -e "s!%%PREFIX%%!${PREFIX}!g" -e "s!%%JISYONAME%%!${SKKJISYO}!g" < ${WRKSRC}/${docs} > ${WRKSRC}/.tmp
- @${MV} -f ${WRKSRC}/.tmp ${WRKSRC}/${docs}
+ ${SED} -e "s!%%PREFIX%%!${PREFIX}!g" -e "s!%%JISYONAME%%!${SKKJISYO}!g" < ${WRKSRC}/${docs} > ${WRKSRC}/.tmp
+ ${MV} -f ${WRKSRC}/.tmp ${WRKSRC}/${docs}
.endfor
post-install:
- @${MKDIR} ${PREFIX}/share/dbskkd-cdb ${PREFIX}/share/doc/dbskkd-cdb
+ ${MKDIR} ${PREFIX}/share/dbskkd-cdb ${PREFIX}/share/doc/dbskkd-cdb
${INSTALL_DATA} ${WRKSRC}/${SKKJISYO}.cdb ${PREFIX}/share/dbskkd-cdb
.for docs in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${docs} ${PREFIX}/share/doc/dbskkd-cdb
@@ -37,24 +39,17 @@
.if defined(WITH_JISYO) || (exists(${LOCALBASE}/share/skk/${SKKJISYO}) \
&& !defined(WITHOUT_JISYO))
pre-build::
- @${CP} ${LOCALBASE}/share/skk/${SKKJISYO} ${WRKSRC}
+ ${CP} ${LOCALBASE}/share/skk/${SKKJISYO} ${WRKSRC}
.else
BUILD_DEPENDS+= /nonexistent:${PORTSDIR}/japanese/skk-jisyo:extract
pre-build::
- @${CP} ${PORTSDIR}/japanese/skk-jisyo/work/*/jisyo/${SKKJISYO} ${WRKSRC}
+ ${CP} ${PORTSDIR}/japanese/skk-jisyo/work/*/jisyo/${SKKJISYO} ${WRKSRC}
.endif
-.if defined(WITH_CDB) || (exists(${LOCALBASE}/lib/libcdb.a) && \
- exists(${LOCALBASE}/bin/cdbmake) && !defined(WITHOUT_CDB))
pre-build::
- @${CP} ${LOCALBASE}/lib/libcdb.a ${LOCALBASE}/bin/cdbmake ${WRKSRC}
- @(cd ${WRKSRC}; SKKJISYO=${SKKJISYO} ./makeskkcdb.sh)
-.else
-BUILD_DEPENDS+= /nonexistent:${PORTSDIR}/databases/cdb:build
-pre-build::
- @${CP} ${PORTSDIR}/databases/cdb/work/*/libcdb.a ${WRKSRC}
- @${CP} ${PORTSDIR}/databases/cdb/work/*/cdbmake ${WRKSRC}
- @(cd ${WRKSRC}; SKKJISYO=${SKKJISYO} ./makeskkcdb.sh)
-.endif
+ (cd ${WRKDIR}/cdb-0.55; make it)
+ ${CP} ${WRKDIR}/cdb-0.55/libcdb.a ${WRKSRC}
+ ${CP} ${WRKDIR}/cdb-0.55/cdbmake ${WRKSRC}
+ (cd ${WRKSRC}; SKKJISYO=${SKKJISYO} ./makeskkcdb.sh)
.include <bsd.port.post.mk>
--- files/md5.dist Tue Oct 26 12:23:18 1999
+++ files/md5 Wed Apr 19 20:57:55 2000
@@ -1 +1,2 @@
MD5 (dbskkd-cdb-1.01.tar.gz) = 866bbf49a4c264c0efd6e5e53934bd55
+MD5 (cdb-0.55.tar.gz) = bc6f32de8df81c699d5d76431ce76e79
>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?20000419213231K.matusita>