Index: head/japanese/dbskkd-cdb/Makefile
===================================================================
--- head/japanese/dbskkd-cdb/Makefile	(revision 27981)
+++ head/japanese/dbskkd-cdb/Makefile	(revision 27982)
@@ -1,60 +1,57 @@
 # New ports collection makefile for:	dbskkd-cdb
 # Date created:		17 Jun 1999
 # Whom:			Makoto Matsushita <matusita@jp.FreeBSD.ORG>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dbskkd-cdb
 PORTVERSION=	1.01
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.k2r.org/kenji/software/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${CDB_DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	matusita@jp.Freebsd.ORG
 
+CDB_DISTNAME=	cdb-0.55
+
 SKKJISYO_SIZE?=	L
 SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
 DOCS=		Release-Notes.English Release-Notes.Japanese LICENSE
 
 MAKE_ENV+=	SKKJISYO=${SKKJISYO}
 PLIST_SUB=	JISYONAME=${SKKJISYO}
 
 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
 .endfor
 
 .include <bsd.port.pre.mk>
 
 .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
+BUILD_DEPENDS+=	/nonexistent:${.CURDIR}/../../japanese/skk-jisyo:extract
 pre-build::
-	@${CP} ${PORTSDIR}/japanese/skk-jisyo/work/*/jisyo/${SKKJISYO} ${WRKSRC}
+	${CP} ${WRKDIR}/../../../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_DISTNAME}; make it)
+	${CP} ${WRKDIR}/${CDB_DISTNAME}/libcdb.a ${WRKSRC}
+	${CP} ${WRKDIR}/${CDB_DISTNAME}/cdbmake ${WRKSRC}
+	(cd ${WRKSRC}; SKKJISYO=${SKKJISYO} ./makeskkcdb.sh)
 
 .include <bsd.port.post.mk>

Property changes on: head/japanese/dbskkd-cdb/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/japanese/dbskkd-cdb/distinfo
===================================================================
--- head/japanese/dbskkd-cdb/distinfo	(revision 27981)
+++ head/japanese/dbskkd-cdb/distinfo	(revision 27982)
@@ -1 +1,2 @@
 MD5 (dbskkd-cdb-1.01.tar.gz) = 866bbf49a4c264c0efd6e5e53934bd55
+MD5 (cdb-0.55.tar.gz) = bc6f32de8df81c699d5d76431ce76e79

Property changes on: head/japanese/dbskkd-cdb/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property