ports/177058: [PATCH] graphics/qvplay: Convert to OptionsNG, Files removed

Sun Mar 17 22:20:00 UTC 2013

>Number:         177058
>Category:       ports
>Synopsis:       [PATCH] graphics/qvplay: Convert to OptionsNG, Files removed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 17 22:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10
>Description:

Removed file(s):
- files/patch-aa
- files/pkg-message.in
- pkg-plist

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- qvplay-0.95_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/qvplay/Makefile ./Makefile
--- /usr/ports/graphics/qvplay/Makefile	2013-01-14 17:57:08.000000000 +0100
+++ ./Makefile	2013-03-17 23:14:05.000000000 +0100
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	qvplay
-# Date created:		2 May 1997
-# Whom:			Jun-ichiro itojun Itoh <itojun at itojun.org>
-#
+# Created by: Jun-ichiro itojun Itoh <itojun at itojun.org>
 # $FreeBSD: head/graphics/qvplay/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	qvplay
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.asahi-net.or.jp/~xg2k-hys/
 
@@ -17,25 +14,34 @@
 
 GNU_CONFIGURE=	yes
 
-MAN1=		qvplay.1 qvrec.1 qvalldel.1
+PLIST_FILES=	bin/qvalldel \
+		bin/qvplay \
+		bin/qvrec
 
-MYPORTDOCS=	FAQ.txt HISTORY PROTOCOL.txt PROTOCOL.eng \
-		README README.eng README.FreeBSD
-SUB_FILES=	pkg-message
+MAN1=		qvalldel.1 qvplay.1 qvrec.1
 
-pre-patch:
+PORTDOCS=	FAQ.txt HISTORY PROTOCOL.eng PROTOCOL.txt \
+		README README.FreeBSD README.eng
+
+.include <bsd.port.options.mk>
+
+post-patch:
 	@${MKDIR} ${WRKSRC}
+	@${REINPLACE_CMD} \
+		-e 's|/usr/local/bin|$${PREFIX}/bin|' \
+		-e 's|/usr/local/man/man1|$${PREFIX}/man/man1|' \
+		-e 's|$$(INSTALL_PROGRAM) -o root -g bin -m 444 $$(MAN1) $$(mandir)/$$(MAN1)|$$(INSTALL_DATA) $$(MAN1) $$(mandir)/$$(MAN1)|' \
+		-e 's|$$(INSTALL_PROGRAM) -o root -g bin -m 444 $$(MAN2) $$(mandir)/$$(MAN2)|$$(INSTALL_DATA) $$(MAN2) $$(mandir)/$$(MAN2)|' \
+		-e 's|$$(INSTALL_PROGRAM) -o root -g bin -m 444 $$(MAN3) $$(mandir)/$$(MAN3)|$$(INSTALL_DATA) $$(MAN3) $$(mandir)/$$(MAN3)|' \
+			${WRKSRC}/../../src/Makefile.in
 
 pre-configure:
-	@( cd ${WRKDIR}/QVplay095; ./setup FreeBSD )
+	@(cd ${WRKDIR}/QVplay095; ./setup FreeBSD)
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in ${MYPORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/../../${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/../../|} ${DOCSDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/qvplay/files/patch-aa ./files/patch-aa
--- /usr/ports/graphics/qvplay/files/patch-aa	2013-01-14 17:57:08.000000000 +0100
+++ ./files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
---- ../../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 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_DATA) $(MAN1) $(mandir)/$(MAN1)
-+	$(INSTALL_DATA) $(MAN2) $(mandir)/$(MAN2)
-+	$(INSTALL_DATA) $(MAN3) $(mandir)/$(MAN3)
- depend: .depend
- .depend:
- 	mkdep $(SRCS1)
diff -ruN --exclude=CVS /usr/ports/graphics/qvplay/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/graphics/qvplay/files/pkg-message.in	2013-01-14 17:57:08.000000000 +0100
+++ ./files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Documents for qvplay can be found at: %%DOCSDIR%%
diff -ruN --exclude=CVS /usr/ports/graphics/qvplay/pkg-descr ./pkg-descr
--- /usr/ports/graphics/qvplay/pkg-descr	2013-01-14 17:57:08.000000000 +0100
+++ ./pkg-descr	2013-03-17 23:05:01.000000000 +0100
@@ -1,13 +1,13 @@
 qvplay
-	Downloading tool for Casio QV series digital camera.
-	Known to work with:
-	- Casio QV-10/10A/11/100
-	- Casio QV-30/300
-	(The word "plus" in the US product name "Casio QV-10*plus*"
-	means bundled kit, so you need not to worry about the word "plus")
+        Downloading tool for Casio QV series digital camera.
+        Known to work with:
+        - Casio QV-10/10A/11/100
+        - Casio QV-30/300
+        (The word "plus" in the US product name "Casio QV-10*plus*"
+        means bundled kit, so you need not to worry about the word "plus")
 
 AUTHOR CONTACT
-	Ken-ichi Hayashi <xg2k-hys at asahi-net.or.jp>
-	Jun-ichiro itojun Itoh <itojun at itojun.org>
+        Ken-ichi Hayashi <xg2k-hys at asahi-net.or.jp>
+        Jun-ichiro itojun Itoh <itojun at itojun.org>
 
 WWW: http://www.asahi-net.or.jp/~xg2k-hys/index-e.html
diff -ruN --exclude=CVS /usr/ports/graphics/qvplay/pkg-plist ./pkg-plist
--- /usr/ports/graphics/qvplay/pkg-plist	2013-01-14 17:57:08.000000000 +0100
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-bin/qvalldel
-bin/qvplay
-bin/qvrec
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/PROTOCOL.eng
-%%PORTDOCS%%%%DOCSDIR%%/PROTOCOL.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%%%DOCSDIR%%/README.eng
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- qvplay-0.95_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:
