Don't depend on BSD make too much; keep makefile simple. It should help

building on none-BSD environment.

Bump PKGREVISION.

3 files changed, 11 insertions, 63 deletions

diff --git a/devel/ruby-byaccr/Makefile b/devel/ruby-byaccr/Makefile
index dd61b0313f8..01306a46aaa 100644
--- a/devel/ruby-byaccr/Makefile
+++ b/devel/ruby-byaccr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/06/06 00:15:28 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2006/09/07 16:01:30 taca Exp $
 
 DISTNAME=	byaccr-0.1
 PKGNAME=	ruby-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel ruby
 MASTER_SITES=	ftp://ftp.idaemons.org/pub/distfiles/ruby/
 
@@ -10,10 +10,10 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	# not available
 COMMENT=	Parser generator for ruby based on 'Berkeley Yacc/Yacc for Java'
 
-MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
 EXAMPLES=	Makefile cal.y calfunc.rb main.rb
 
 post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/byaccr ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/byaccr
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${PREFIX}/share/examples/byaccr
diff --git a/devel/ruby-byaccr/distinfo b/devel/ruby-byaccr/distinfo
index 9f62ae46cb4..b93161594b3 100644
--- a/devel/ruby-byaccr/distinfo
+++ b/devel/ruby-byaccr/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/06/19 20:44:06 minskim Exp $
+$NetBSD: distinfo,v 1.5 2006/09/07 16:01:30 taca Exp $
 
 SHA1 (byaccr-0.1.tar.gz) = a4971742083d2570bb630908d0b15010af134e9f
 RMD160 (byaccr-0.1.tar.gz) = db1a74e6c94e3df5574a86822ea14c00ab433dae
 Size (byaccr-0.1.tar.gz) = 34786 bytes
-SHA1 (patch-aa) = c096eafa8cf381c3c275e89c8127e2688f7bd37e
+SHA1 (patch-aa) = 096cb56554106ea115247a3b9e07bafe5def604b
 SHA1 (patch-ab) = 204c8d22df7b2534a0da839d65a0c07ac6a41796
 SHA1 (patch-ac) = 458af937b1873cafb0147089a551509d94404828
 SHA1 (patch-ad) = 53c93d78624ff993d8052a888be1897c2f293fb6
diff --git a/devel/ruby-byaccr/patches/patch-aa b/devel/ruby-byaccr/patches/patch-aa
index 8e4d2efabe2..9884a62a037 100644
--- a/devel/ruby-byaccr/patches/patch-aa
+++ b/devel/ruby-byaccr/patches/patch-aa
@@ -1,62 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
+$NetBSD: patch-aa,v 1.2 2006/09/07 16:01:30 taca Exp $
 
---- Makefile.orig	Wed Nov  1 23:03:49 2000
+--- Makefile.orig	2000-11-01 23:03:49.000000000 +0900
 +++ Makefile
-@@ -1,51 +1,8 @@
+@@ -1,5 +1,3 @@
 -CC     = gcc
 -CFLAGS = -O
--PROGRAM  = byaccr
--OBJ 	 = closure.o \
--	error.o \
--	lalr.o \
--	lr0.o \
--	main.o \
--	mkpar.o \
--	output.o \
--	reader.o \
--	skeleton.o \
--	symtab.o \
--	verbose.o \
--	warshall.o
-+PROG=	 byaccr
-+SRCS=	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
-+	skeleton.c symtab.c verbose.c warshall.c
- 
--all: $(PROGRAM)
-+BINDIR=	${LOCALBASE}/bin
-+MKMAN=	no
- 
--SRCS   = closure.c \
--	error.c \
--	lalr.c \
--	lr0.c \
--	main.c \
--	mkpar.c \
--	output.c \
--	reader.c \
--	skeleton.c \
--	symtab.c \
--	verbose.c \
--	warshall.c
--
--$(PROGRAM): $(OBJ)
--	$(CC) -o $(PROGRAM) $(OBJ)
--	@echo "done"
--
--clean:
--	/bin/rm -rf $(OBJ) *~
--
--###
--closure.o: closure.c defs.h
--error.o: error.c defs.h
--lalr.o: lalr.c defs.h
--lr0.o: lr0.c defs.h
--main.o: main.c defs.h
--mkpar.o: mkpar.c defs.h
--output.o: output.c defs.h
--reader.o: reader.c defs.h
--skeleton.o: skeleton.c defs.h
--symtab.o: symtab.c defs.h
--verbose.o: verbose.c defs.h
--warshall.o: warshall.c defs.h
-+.include <bsd.prog.mk>
+ PROGRAM  = byaccr
+ OBJ 	 = closure.o \
+ 	error.o \