Remove dependency to ruby-zlib and ruby-digest package since they are

included in ruby18 (base) package.

And miscellous clean up dependency to ruby18 package.

Bump PKGREVISION.

www/instiki/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/02/06 13:36:10 taca Exp $
+# $NetBSD: Makefile,v 1.5 2005/02/21 15:41:30 taca Exp $
 
 DISTNAME=	instiki-0.9.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://rubyforge.org/frs/download.php/2515/
 EXTRACT_SUFX=	.tgz
@@ -10,11 +10,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://instiki.org/
 COMMENT=	Wiki clone that focuses on simple installation and running
 
-DEPENDS+=	ruby${RUBY_VER}>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}
-DEPENDS+=	ruby${RUBY_VER}-digest-[0-9]*:../../security/ruby-digest
-DEPENDS+=	ruby${RUBY_VER}-zlib-[0-9]*:../../devel/ruby-zlib
-
 NO_BUILD=	# defined
+USE_BUILDLINK3= yes
 USE_PKGINSTALL=	yes
 
 RCD_SCRIPTS=	instiki
@@ -32,9 +29,6 @@ SUBST_FILES.paths=	app/controllers/wiki.rb
 SUBST_SED.paths=							\
 	-e 's,File.dirname(__FILE__) + "/../../storage,"${VARBASE}/instiki,g'
 
-.include "../../lang/ruby/replace.mk"
-.include "../../lang/ruby/rubyversion.mk"
-
 post-patch:
 	${MV} ${WRKSRC}/instiki ${WRKSRC}/instiki.tmp
 	${TR} -d '\015' < ${WRKSRC}/instiki.tmp > ${WRKSRC}/instiki
@@ -51,4 +45,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE}
 
+.include "../../lang/ruby/replace.mk"
+.include "../../lang/ruby/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"