Update to 0.8.5

Changelog:
unknown.

4 files changed, 54 insertions, 61 deletions

diff --git a/devel/acr/Makefile b/devel/acr/Makefile
index dba525c7747..51ab5c60f40 100644
--- a/devel/acr/Makefile
+++ b/devel/acr/Makefile
@@ -1,19 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2012/10/31 11:16:33 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/06/12 11:00:57 ryoon Exp $
 #
 
-DISTNAME=		acr-0.4
-PKGREVISION=		1
+DISTNAME=		acr-0.8.6
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.nopcode.org/prj/acr/
+MASTER_SITES=		http://www.lolcathost.org/b/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://news.nopcode.org/pancake/acr.html
+HOMEPAGE=		http://www.nopcode.org/wk.php/Acr
 COMMENT=		Autoconf replacement
+LICENSE=		gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 
-INSTALL_MAKE_FLAGS=	BINDIR=${DESTDIR}${PREFIX}/bin \
-			MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} \
-			DATADIR=${DESTDIR}${PREFIX}/share
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/acr/PLIST b/devel/acr/PLIST
index 59a46fa51ad..73ebdad4ae2 100644
--- a/devel/acr/PLIST
+++ b/devel/acr/PLIST
@@ -1,42 +1,55 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/06/12 11:00:57 ryoon Exp $
 bin/acr
-bin/acr-recover
+bin/acr-cat
+bin/acr-install
 bin/acr-sh
-man/man1/acr-recover.1
+bin/amr
+man/man1/acr-cat.1
 man/man1/acr.1
+man/man1/amr.1
 man/man5/configure.acr.5
+man/man5/configure.amr.5
+share/acr/examples/and.acr
+share/acr/examples/chaos.acr
+share/acr/examples/check.acr
+share/acr/examples/chklibdl.acr
+share/acr/examples/contexts.acr
+share/acr/examples/cpu.acr
+share/acr/examples/endian.acr
+share/acr/examples/if.acr
+share/acr/examples/ifeqval.acr
+share/acr/examples/perl.acr
+share/acr/examples/pkgcfg.acr
+share/acr/examples/python.acr
+share/acr/examples/ruby.acr
+share/acr/examples/sdl.acr
+share/acr/examples/sizeof.acr
+share/acr/examples/x11.acr
+share/acr/modules/csharp.acr
+share/acr/modules/java-gtk.acr
+share/acr/modules/sizes.acr
 share/acr/vim/ftplugin/acr.vim
 share/acr/vim/install.sh
 share/acr/vim/syntax/acr.vim
 share/acr/vim/vimrc
+share/doc/acr/amr-tutorial
 share/doc/acr/backup
+share/doc/acr/check-user
 share/doc/acr/cmdline
 share/doc/acr/conditionals
 share/doc/acr/crosscompile
 share/doc/acr/crosspath-build
 share/doc/acr/developers/adding_new_language
+share/doc/acr/developers/string-mode
+share/doc/acr/developers/unit-tests
 share/doc/acr/developers/using_cvs
 share/doc/acr/endian
+share/doc/acr/flag-arguments
+share/doc/acr/gnumake
 share/doc/acr/hello_world
 share/doc/acr/keywords
+share/doc/acr/libtool
 share/doc/acr/make-tips
+share/doc/acr/pkg-config
 share/doc/acr/sandbox
-share/doc/acr/stages
 share/doc/acr/syntax
-share/examples/acr/and.acr
-share/examples/acr/chaos.acr
-share/examples/acr/check.acr
-share/examples/acr/chklibdl.acr
-share/examples/acr/contexts.acr
-share/examples/acr/cpu.acr
-share/examples/acr/csharp.acr
-share/examples/acr/endian.acr
-share/examples/acr/if.acr
-share/examples/acr/ifeqval.acr
-share/examples/acr/perl.acr
-share/examples/acr/pkgcfg.acr
-share/examples/acr/python.acr
-share/examples/acr/ruby.acr
-share/examples/acr/sdl.acr
-share/examples/acr/sizeof.acr
-share/examples/acr/x11.acr
diff --git a/devel/acr/distinfo b/devel/acr/distinfo
index 13fc3e3a6a3..16517d18d44 100644
--- a/devel/acr/distinfo
+++ b/devel/acr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/01/23 20:49:21 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/06/12 11:00:57 ryoon Exp $
 
-SHA1 (acr-0.4.tar.gz) = e4d37c35c44bb978e50171a741ebdc0f4c126324
-RMD160 (acr-0.4.tar.gz) = 971070fa7f6e98c98cf4a19408834349d052f8f5
-Size (acr-0.4.tar.gz) = 58479 bytes
-SHA1 (patch-man_man5_configure.acr.5) = 7bfef1ce3e3a9eee57715d59e7ddb7966389f1ba
+SHA1 (acr-0.8.6.tar.gz) = 3fc8c751e671db866253854a9afdfe943ecc2bbb
+RMD160 (acr-0.8.6.tar.gz) = 00e1793860ef2b4dc44649e664809fe01291e678
+Size (acr-0.8.6.tar.gz) = 71099 bytes
+SHA1 (patch-man_man5_configure.acr.5) = 54d15c48625086939d19c99efa76ebb231b30834
diff --git a/devel/acr/patches/patch-man_man5_configure.acr.5 b/devel/acr/patches/patch-man_man5_configure.acr.5
index 32c65407b0f..9280f565d13 100644
--- a/devel/acr/patches/patch-man_man5_configure.acr.5
+++ b/devel/acr/patches/patch-man_man5_configure.acr.5
@@ -1,8 +1,10 @@
-$NetBSD: patch-man_man5_configure.acr.5,v 1.1 2012/01/23 20:49:21 joerg Exp $
+$NetBSD: patch-man_man5_configure.acr.5,v 1.2 2013/06/12 11:00:57 ryoon Exp $
 
---- man/man5/configure.acr.5.orig	2005-09-23 05:21:20.000000000 +0000
+* WIth this patch, configure.acr(5) is rendered properly with mdocml.
+
+--- man/man5/configure.acr.5.orig	2011-08-04 10:24:58.000000000 +0000
 +++ man/man5/configure.acr.5
-@@ -31,14 +31,13 @@ conditionals and dies
+@@ -33,14 +33,13 @@ generation of .acr files with SUBDIRS an
  .El
  .\"
  .Sh SYNTAX
@@ -10,33 +12,15 @@ $NetBSD: patch-man_man5_configure.acr.5,v 1.1 2012/01/23 20:49:21 joerg Exp $
  The configure.acr file is a word-based configuration file for ACR.
  .Pp
  This means that each word must be separated with space, tab or new-lines.
- The ';' separator must be also a word.
+ The ';' separator to terminate strings must be also a separated word.
  .Pp
 -.Bl -bold -tag -width indent
- Each word is called "keyword", there these types:
-+.Bl -tag -width indent
+ Each word is called "keyword", there are these types:
++.Bl -bold -tag -width indent
  .It Miscelaneous-Keys:
  { } ;
- .It Context:
-@@ -56,7 +55,6 @@ IF IFEQ IFEQVAL IFAND -NOT
- From the version 0.4, acr supports the normal variable assignation syntax format. Now you can use things like that:
- VAR = VALUE ;
- Old format ( = VAR VALUE ; ) may be deprecated in the future.
--
- .Bl -bullet -compact
- .It
- "=" resets the value of the target variable.
-@@ -201,8 +199,8 @@ Checks if CLASSPATH contains the desired
- .Sh CONTEXTS
- Contexts tells definitions where to be stored, in a global context (before all checks and conditionals) or in 'local' context (inside conditional checks). This last context is useful for nested conditionals.
- .Pp
--.Bl -tag -width indent
- Contexts are:
-+.Bl -tag -width indent
- .It GLOBAL:
- The default one. Tells definitions to be stored before any check or conditional.
- .It LOCAL:
-@@ -210,8 +208,8 @@ Definitions are ordered to be stored ins
+ .It Command:
+@@ -208,8 +207,8 @@ Checks the existence of the target user 
  .El
  .\"
  .Sh DEFINITIONS