Update newfile package to 1.0.14 migrating to use new framework for Ruby,

prefixing package name with "ruby1*-".

4 files changed, 29 insertions, 28 deletions

diff --git a/devel/newfile/Makefile b/devel/newfile/Makefile
index 106adaf8bfa..0108a766d2e 100644
--- a/devel/newfile/Makefile
+++ b/devel/newfile/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/04/25 05:33:18 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/27 15:58:22 taca Exp $
 #
 
-DISTNAME=	newfile-1.0.7
-PKGREVISION=	1
+DISTNAME=	newfile-1.0.14
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=newfile/}
 
@@ -10,14 +10,17 @@ MAINTAINER=	flynn@energyhq.homeip.net
 HOMEPAGE=	http://newfile.sourceforge.net/
 COMMENT=	Tool for creating starter files in various languages
 
-DEPENDS+=	ruby-optparse>=0.8.6:../../devel/ruby-optparse
-
-USE_RUBY=	YES
+USE_BUILDLINK3=	YES
 NO_BUILD=	YES
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 
-REPLACE_RUBY=	src/newfile.rb
+.include "../../lang/ruby/rubyversion.mk"
+
+.if ${RUBY_VER} == "16"
+DEPENDS+=	${RUBY_PKGPREFIX}-optparse>=0.8.6:../../devel/ruby-optparse
+.endif
+
+REPLACE_RUBY=	src/newfile.rb.in
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/newfile.rb ${PREFIX}/bin/newfile
@@ -25,5 +28,5 @@ post-install:
 		${PREFIX}/share/newfile/
 	${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${PREFIX}/man/man1/
 
-.include "../../lang/ruby-base/buildlink3.mk"
+.include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/newfile/PLIST b/devel/newfile/PLIST
index 6418cdc62bc..533083d61d5 100644
--- a/devel/newfile/PLIST
+++ b/devel/newfile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/22 03:22:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/27 15:58:22 taca Exp $
 bin/newfile
 man/man1/newfile.1
 share/newfile/fileproc.rb
@@ -18,16 +18,14 @@ share/newfile/licenses/minimal@license.inc
 share/newfile/licenses/no@license.inc
 share/newfile/projects/auto@Makefile.am
 share/newfile/projects/auto@Makefile.cvs
+share/newfile/projects/auto@Mk^alane.pod.mk
+share/newfile/projects/auto@Mk^alane.rd.mk
+share/newfile/projects/auto@Mk^alane.tex.mk
 share/newfile/projects/auto@acinclude.m4
 share/newfile/projects/auto@configure.ac
-share/newfile/projects/auto@doc!Makefile.am
-share/newfile/projects/auto@doc-src!Makefile.am
-share/newfile/projects/auto@doc-src!alane.pod.mk
-share/newfile/projects/auto@doc-src!alane.tex.mk
-share/newfile/projects/auto@src!Makefile.am
+share/newfile/projects/auto@doc^Makefile.am
+share/newfile/projects/auto@src^Makefile.am
 share/newfile/projects/port@Makefile
-share/newfile/projects/port@distinfo
-share/newfile/projects/port@pkg-comment
 share/newfile/projects/port@pkg-descr
 share/newfile/projects/port@pkg-plist
 share/newfile/sytab.rb
diff --git a/devel/newfile/distinfo b/devel/newfile/distinfo
index f45691831dd..eb7e9f406a8 100644
--- a/devel/newfile/distinfo
+++ b/devel/newfile/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/03/22 03:22:57 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/11/27 15:58:22 taca Exp $
 
-SHA1 (newfile-1.0.7.tar.gz) = c183c2679e3262fc0ad0e7f90db998df42be94d8
-Size (newfile-1.0.7.tar.gz) = 129448 bytes
-SHA1 (patch-aa) = 95be72f2f3784fa70e5d444d5c14f61c66124eca
+SHA1 (ruby/newfile-1.0.14.tar.gz) = 247bf4e9d46a3d5715ffae71f0645bf19d00d03a
+Size (ruby/newfile-1.0.14.tar.gz) = 177411 bytes
+SHA1 (patch-aa) = c442c763b1f99961aef799c9cbe104e2a496a7f2
diff --git a/devel/newfile/patches/patch-aa b/devel/newfile/patches/patch-aa
index 73922402732..609b2bbc712 100644
--- a/devel/newfile/patches/patch-aa
+++ b/devel/newfile/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/16 03:42:36 salo Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/27 15:58:22 taca Exp $
 
---- Makefile.in.orig	Fri Feb  7 19:01:54 2003
-+++ Makefile.in	Sun Feb 16 03:49:33 2003
-@@ -119,7 +119,7 @@
+--- Makefile.in.orig	2003-11-03 21:49:37.000000000 +0900
++++ Makefile.in
+@@ -130,7 +130,7 @@ am__include = @am__include@
  am__quote = @am__quote@
  install_sh = @install_sh@
  
--SUBDIRS = src doc data doc-src www
-+SUBDIRS = data
+-SUBDIRS = src data 
++SUBDIRS = data 
+ #doc doc-src www
  EXTRA_DIST = LICENSE README Makefile.cvs
  subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4