5 files changed, 39 insertions, 27 deletions

diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile
index 2a9bf1beb84c..518532b56a3a 100644
--- a/graphics/qvplay/Makefile
+++ b/graphics/qvplay/Makefile
@@ -6,35 +6,34 @@
 #
 
 PORTNAME=	qvplay
-PORTVERSION=	0.94
+PORTVERSION=	0.95
 CATEGORIES=	graphics
-MASTER_SITES=   http://www.asahi-net.or.jp/~xg2k-hys/
+MASTER_SITES=	http://www.asahi-net.or.jp/~xg2k-hys/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
-RESTRICTED=	"Redistribution prohibited since it is in beta test period"
+WRKSRC=		${WRKDIR}/QVplay095/obj/FreeBSD
 
-WRKSRC=		${WRKDIR}/QVplay094/obj/FreeBSD
 GNU_CONFIGURE=	yes
+
 MAN1= 		qvplay.1 qvrec.1 qvalldel.1
-MAKE_ARGS+=	INSTALL_MAN="${INSTALL_MAN}"
 
-DOC=	README README.eng README.FreeBSD FAQ.txt HISTORY PROTOCOL.txt \
-	PROTOCOL.eng
+PORTDOCS=	FAQ.txt HISTORY PROTOCOL.txt PROTOCOL.eng \
+		README README.eng README.FreeBSD
 
 pre-patch:
 	@${MKDIR} ${WRKSRC}
 
 pre-configure:
-	@( cd ${WRKDIR}/QVplay094; ./setup FreeBSD )
+	@( cd ${WRKDIR}/QVplay095; ./setup FreeBSD )
 
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/qvplay
-	for i in ${DOC}; do \
-		${INSTALL_DATA} ${WRKSRC}/../../$$i \
-			${PREFIX}/share/doc/qvplay; \
-	done
-	@${ECHO} && ${ECHO}
+.for file  in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/../../${file} ${PREFIX}/share/doc/qvplay
+.endfor
+.endif
 	@${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/graphics/qvplay/distinfo b/graphics/qvplay/distinfo
index 91dd0c99d80a..81aaf04b8b56 100644
--- a/graphics/qvplay/distinfo
+++ b/graphics/qvplay/distinfo
@@ -1 +1 @@
-MD5 (qvplay-0.94.tar.gz) = 4f1bbeec547e32f3348c26cfc43e505e
+MD5 (qvplay-0.95.tar.gz) = 70e0f0214b29a931bb5b875abcf41bdd
diff --git a/graphics/qvplay/files/patch-aa b/graphics/qvplay/files/patch-aa
index 8da860548ed1..651b84fc73d2 100644
--- a/graphics/qvplay/files/patch-aa
+++ b/graphics/qvplay/files/patch-aa
@@ -1,15 +1,26 @@
---- ../../src/Makefile.in.old	Mon Nov 22 20:31:59 1999
-+++ ../../src/Makefile.in	Mon Nov 22 20:32:37 1999
+--- ../../src/Makefile.in.orig	Tue Aug 29 20:00:58 2000
++++ ../../src/Makefile.in	Wed Jan 10 03:59:59 2001
+@@ -10,8 +10,8 @@
+ INSTALL	= @INSTALL@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
+-bindir	= /usr/local/bin
+-mandir  = /usr/local/man/man1
++bindir	= @prefix@/bin
++mandir  = @prefix@/man/man1
+ 
+ SRCS1	= tty.c command.c command1.c getuint.c jpeg.c ppm.c bmp.c qvplay.c
+ OBJS1	= tty.o command.o command1.o getuint.o jpeg.o ppm.o bmp.o qvplay.o
 @@ -55,9 +55,9 @@
- 	$(INSTALL_PROGRAM) -s -o root -g uucp -m 4755 $(PROG1) $(bindir)/$(PROG1)
- 	$(INSTALL_PROGRAM) -s -o root -g uucp -m 4755 $(PROG2) $(bindir)/$(PROG2)
- 	$(INSTALL_PROGRAM) -s -o root -g uucp -m 4755 $(PROG3) $(bindir)/$(PROG3)
+ 	$(INSTALL_PROGRAM) -s -o root -g uucp -m 2755 $(PROG1) $(bindir)/$(PROG1)
+ 	$(INSTALL_PROGRAM) -s -o root -g uucp -m 2755 $(PROG2) $(bindir)/$(PROG2)
+ 	$(INSTALL_PROGRAM) -s -o root -g uucp -m 2755 $(PROG3) $(bindir)/$(PROG3)
 -	$(INSTALL_PROGRAM) -o root -g bin -m 444 $(MAN1) $(mandir)/$(MAN1)
 -	$(INSTALL_PROGRAM) -o root -g bin -m 444 $(MAN2) $(mandir)/$(MAN2)
 -	$(INSTALL_PROGRAM) -o root -g bin -m 444 $(MAN3) $(mandir)/$(MAN3)
-+	${INSTALL_MAN} $(MAN1) $(mandir)/$(MAN1)
-+	${INSTALL_MAN} $(MAN2) $(mandir)/$(MAN2)
-+	${INSTALL_MAN} $(MAN3) $(mandir)/$(MAN3)
++	$(INSTALL_DATA) $(MAN1) $(mandir)/$(MAN1)
++	$(INSTALL_DATA) $(MAN2) $(mandir)/$(MAN2)
++	$(INSTALL_DATA) $(MAN3) $(mandir)/$(MAN3)
  depend: .depend
  .depend:
  	mkdep $(SRCS1)
diff --git a/graphics/qvplay/pkg-descr b/graphics/qvplay/pkg-descr
index e091426f691c..af37c12ca419 100644
--- a/graphics/qvplay/pkg-descr
+++ b/graphics/qvplay/pkg-descr
@@ -9,3 +9,5 @@ qvplay
 AUTHOR CONTACT
 	Ken-ichi Hayashi <xg2k-hys@asahi-net.or.jp>
 	Jun-ichiro itojun Itoh <itojun@itojun.org>
+
+WWW: http://www.asahi-net.or.jp/~xg2k-hys/index-e.html
diff --git a/graphics/qvplay/pkg-plist b/graphics/qvplay/pkg-plist
index e41d30c965c9..f19bf49cb002 100644
--- a/graphics/qvplay/pkg-plist
+++ b/graphics/qvplay/pkg-plist
@@ -1,11 +1,11 @@
 bin/qvalldel
 bin/qvplay
 bin/qvrec
-share/doc/qvplay/README
-share/doc/qvplay/README.eng
-share/doc/qvplay/README.FreeBSD
 share/doc/qvplay/FAQ.txt
 share/doc/qvplay/HISTORY
-share/doc/qvplay/PROTOCOL.txt
 share/doc/qvplay/PROTOCOL.eng
+share/doc/qvplay/PROTOCOL.txt
+share/doc/qvplay/README
+share/doc/qvplay/README.FreeBSD
+share/doc/qvplay/README.eng
 @dirrm share/doc/qvplay