Update to 1.3.0.r1

PR:		35494
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 9 insertions, 145 deletions

diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 0586efc3bd7c..04536c1d639b 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	aview
-PORTVERSION=	1.2
+PORTVERSION=	1.3.0.r1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aa-project
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -17,12 +18,16 @@ RUN_DEPENDS=	anytopnm:${PORTSDIR}/graphics/netpbm \
 		convert:${PORTSDIR}/graphics/ImageMagick
 LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-x=no
 
+MAN1=		asciiview.1 aview.1
+
 post-patch:
-	@${PERL} -pi -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|/bash|/sh|g' ${WRKSRC}/asciiview
 	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
-		's|<malloc.h>|<stdlib.h>|g' \
+		's|<malloc.h>|<stdlib.h>|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/aview/distinfo b/graphics/aview/distinfo
index 611005bd325f..b07db4bb22be 100644
--- a/graphics/aview/distinfo
+++ b/graphics/aview/distinfo
@@ -1 +1 @@
-MD5 (aview-1.2.tar.gz) = fe292142753ac85d3994f5b5073993ab
+MD5 (aview-1.3.0rc1.tar.gz) = 093f298e7787591e229b59d039c72f4d
diff --git a/graphics/aview/files/patch-aa b/graphics/aview/files/patch-aa
deleted file mode 100644
index 0c54ae68c345..000000000000
--- a/graphics/aview/files/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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()
- {
diff --git a/graphics/aview/files/patch-ab b/graphics/aview/files/patch-ab
deleted file mode 100644
index 78438bb8280b..000000000000
--- a/graphics/aview/files/patch-ab
+++ /dev/null
@@ -1,134 +0,0 @@
---- sstring.h.orig	Tue Sep 16 04:33:13 1997
-+++ sstring.h	Sat Jan 15 22:24:50 2000
-@@ -478,6 +478,7 @@
- extern inline void * __memcpy_g(void * to, const void * from, size_t n)
- {
- register void *tmp = (void *)to;
-+int dummy;	/* dummy output for clobbers */
- __asm__ __volatile__ (
- 	"cld\n\t"
- 	"shrl $1,%%ecx\n\t"
-@@ -488,9 +489,9 @@
- 	"movsw\n"
- 	"2:\trep\n\t"
- 	"movsl"
--	: /* no output */
--	:"c" (n),"D" ((long) tmp),"S" ((long) from)
--	:"cx","di","si","memory");
-+	:"=c" (dummy),"=D" (dummy),"=S" (dummy)	/* dummy output for clobbers */
-+	:"0" (n),"1" ((long) tmp),"2" ((long) from)
-+	:"memory");
- return (to);
- }
- 
-@@ -499,29 +500,32 @@
- extern inline void * memmove(void * dest,const void * src, size_t n)
- {
- register void *tmp = (void *)dest;
-+int dummy;	/* dummy output for clobbers */
- if (dest<src)
- __asm__ __volatile__ (
- 	"cld\n\t"
- 	"rep\n\t"
- 	"movsb"
--	: /* no output */
--	:"c" (n),"S" (src),"D" (tmp)
--	:"cx","si","di");
-+	:"=c" (dummy),"=S" (dummy),"=D" (dummy)	/* dummy outpout for clobbers */
-+	:"0" (n),"1" (src),"2" (tmp)
-+	);
- else
- __asm__ __volatile__ (
- 	"std\n\t"
- 	"rep\n\t"
- 	"movsb\n\t"
- 	"cld"
--	: /* no output */
--	:"c" (n), "S" (n-1+(const char *)src), "D" (n-1+(char *)tmp)
--	:"cx","si","di","memory");
-+	:"=c" (dummy), "=S" (dummy), "=D" (dummy) /* dummy output for clobbers */
-+
-+	:"0" (n), "1" (n-1+(const char *)src), "2" (n-1+(char *)tmp)
-+	:"memory");
- return dest;
- }
- 
- extern inline int memcmp(const void * cs,const void * ct,size_t count)
- {
- register int __res;
-+int dummy;	/* dummy output for clobbers */
- __asm__ __volatile__(
- 	"cld\n\t"
- 	"repe\n\t"
-@@ -530,8 +534,9 @@
- 	"sbbl %0,%0\n\t"
- 	"orb $1,%b0\n"
- 	"1:"
--	:"=abd" (__res):"0" (0),"S" (cs),"D" (ct),"c" (count)
--	:"si","di","cx");
-+	:"=abd" (__res), "=S" (dummy),"=D" (dummy),"=c" (dummy)
-+	:"0" (0),"1" (cs),"2" (ct),"3" (count)
-+	);
- return __res;
- }
- 
-@@ -539,6 +544,7 @@
- extern inline void * memchr(const void * cs,int c,size_t count)
- {
- register void * __res;
-+int dummy;	/* dummy output for clobbers */
- if (!count)
- 	return NULL;
- __asm__ __volatile__(
-@@ -548,8 +554,8 @@
- 	"je 1f\n\t"
- 	"movl $1,%0\n"
- 	"1:\tdecl %0"
--	:"=D" (__res):"a" (c),"D" (cs),"c" (count)
--	:"cx");
-+	:"=D" (__res), "=c"(dummy):"a" (c),"0" (cs),"1" (count)
-+	);
- return __res;
- }
- 
-@@ -657,6 +663,7 @@
- extern inline void * __memset_cg(void * s, char c, size_t count)
- {
- register void *tmp = (void *)s;
-+int dummy;	/* dummy output for clobbers */
- __asm__ __volatile__ (
- 	"shrl $1,%%ecx\n\t"
- 	"rep\n\t"
-@@ -664,15 +671,16 @@
- 	"jnc 1f\n\t"
- 	"movb %%al,(%%edi)\n"
- 	"1:"
--	: /* no output */
--	:"c" (count),"D" (tmp), "a" (0x0101U * (unsigned char) c)
--	:"cx","di","memory");
-+	:"=c" (dummy),"=D" (dummy)	/* dummy output for clobbers */
-+	:"0" (count),"1" (tmp), "a" (0x0101U * (unsigned char) c)
-+	:"memory");
- return s;
- }
- 
- extern inline void * __memset_gg(void * s,char c,size_t count)
- {
- register void *tmp = (void *)s;
-+int dummy;	/* dummy output for clobbers */
- __asm__ __volatile__ (
- 	"movb %%al,%%ah\n\t"
- 	"shrl $1,%%ecx\n\t"
-@@ -681,9 +689,9 @@
- 	"jnc 1f\n\t"
- 	"movb %%al,(%%edi)\n"
- 	"1:"
--	: /* no output */
--	:"c" (count),"D" (tmp), "a" (c)
--	:"cx","di","memory");
-+	:"=c" (dummy),"=D" (dummy)	/* dummy output for clobbers */
-+	:"0" (count),"1" (tmp), "a" (c)
-+	:"memory");
- return s;
- }
-