Upgrade to 1.2.

PR:	ports/6250
Submitted by:	maintainer

3 files changed, 15 insertions, 59 deletions

diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 3ab6706aa458..35a7a7798594 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,12 +1,12 @@
 # New ports collection Makefile for: aview
-# Version required:     1.1
+# Version required:     1.2
 # Date created:         Dec 18 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/12/24 07:39:24 vanilla Exp $
 #
 
-DISTNAME=       aview-1.1
+DISTNAME=       aview-1.2
 CATEGORIES=     graphics x11
 MASTER_SITES=   ftp://ftp.ta.jcu.cz/pub/aa/
 
diff --git a/graphics/aview/distinfo b/graphics/aview/distinfo
index fc5cacc923ed..1d2c16faf6bc 100644
--- a/graphics/aview/distinfo
+++ b/graphics/aview/distinfo
@@ -1 +1 @@
-MD5 (aview-1.1.tar.gz) = 603ce1815c55b1ee456ab18363043f79
+MD5 (aview-1.2.tar.gz) = 8c3bc5d64f8b8d290e4d7816a6201bca
diff --git a/graphics/aview/files/patch-aa b/graphics/aview/files/patch-aa
index ecfd1df80b1f..ad72cf41075d 100644
--- a/graphics/aview/files/patch-aa
+++ b/graphics/aview/files/patch-aa
@@ -1,28 +1,12 @@
---- flip.c.orig	Thu Dec 18 23:22:17 1997
-+++ flip.c	Thu Dec 18 23:22:59 1997
-@@ -659,15 +659,15 @@
- static void selectsupported(aa_context * c)
+--- asciiview.orig	Wed Apr  8 16:34:50 1998
++++ asciiview	Wed Apr  8 16:35:02 1998
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # asciiview - an ascii art image browser script. Front end for aview/aaflip
+ clear()
  {
-     int supported = 0;
--    if (c->driver->params.supported & AA_NORMAL_MASK)
-+    if (c->params.supported & AA_NORMAL_MASK)
- 	supported |= yesno(0, 0, "May I use normal text?          ") ? AA_NORMAL_MASK : 0;
--    if (c->driver->params.supported & AA_DIM_MASK)
-+    if (c->params.supported & AA_DIM_MASK)
- 	supported |= yesno(0, 1, "May I use half bright(dim)?     ") ? AA_DIM_MASK : 0;
--    if (c->driver->params.supported & AA_BOLD_MASK)
-+    if (c->params.supported & AA_BOLD_MASK)
- 	supported |= yesno(0, 2, "May I use bold as double bright?") ? AA_BOLD_MASK : 0;
--    if (c->driver->params.supported & AA_BOLDFONT_MASK)
-+    if (c->params.supported & AA_BOLDFONT_MASK)
- 	supported |= yesno(0, 3, "May I use bold as bold font?    ") ? AA_BOLDFONT_MASK : 0;
--    if (c->driver->params.supported & AA_REVERSE_MASK)
-+    if (c->params.supported & AA_REVERSE_MASK)
- 	supported |= yesno(0, 4, "May I use reversed text?        ") ? AA_REVERSE_MASK : 0;
-     aa_setsupported(c, supported);
- }
---- image.c.orig	Thu Dec 18 23:21:31 1997
-+++ image.c	Thu Dec 18 23:21:50 1997
+--- image.c.orig	Wed Apr  8 16:34:02 1998
++++ image.c	Wed Apr  8 16:34:43 1998
 @@ -1,5 +1,5 @@
  #include <stdio.h>
 -#include <malloc.h>
@@ -30,41 +14,13 @@
  
  int imgwidth, imgheight;
  unsigned char *imgdata;
---- ui.c.orig	Thu Dec 18 23:20:31 1997
-+++ ui.c	Thu Dec 18 23:22:05 1997
+--- ui.c.orig	Wed Apr  8 16:34:09 1998
++++ ui.c	Wed Apr  8 16:34:26 1998
 @@ -1,6 +1,6 @@
  #include <stdio.h>
-+#include <stdlib.h>
  #include <ctype.h>
 -#include <malloc.h>
++#include <stdlib.h>
  #include <string.h>
  #include <aalib.h>
  #include "shrink.h"
-@@ -56,15 +56,15 @@
- static void selectsupported(aa_context * c)
- {
-     int supported = 0;
--    if (c->driver->params.supported & AA_NORMAL_MASK)
-+    if (c->params.supported & AA_NORMAL_MASK)
- 	supported |= yesno(0, 0, "May I use normal text?          ") ? AA_NORMAL_MASK : 0;
--    if (c->driver->params.supported & AA_DIM_MASK)
-+    if (c->params.supported & AA_DIM_MASK)
- 	supported |= yesno(0, 1, "May I use half bright(dim)?     ") ? AA_DIM_MASK : 0;
--    if (c->driver->params.supported & AA_BOLD_MASK)
-+    if (c->params.supported & AA_BOLD_MASK)
- 	supported |= yesno(0, 2, "May I use bold as double bright?") ? AA_BOLD_MASK : 0;
--    if (c->driver->params.supported & AA_BOLDFONT_MASK)
-+    if (c->params.supported & AA_BOLDFONT_MASK)
- 	supported |= yesno(0, 3, "May I use bold as bold font?    ") ? AA_BOLDFONT_MASK : 0;
--    if (c->driver->params.supported & AA_REVERSE_MASK)
-+    if (c->params.supported & AA_REVERSE_MASK)
- 	supported |= yesno(0, 4, "May I use reversed text?        ") ? AA_REVERSE_MASK : 0;
-     aa_setsupported(c, supported);
- }
---- asciiview.orig	Thu Dec 18 23:25:19 1997
-+++ asciiview	Thu Dec 18 23:25:29 1997
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # asciiview - an ascii art image browser script. Front end for aview/aaflip
- clear()
- {