Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Apr 2008 15:20:30 GMT
From:      Ganael Laplanche <ganael.laplanche@martymac.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/123016: Port fix: multimedia/tv_grab_au - Fix pkg-plist
Message-ID:  <200804231520.m3NFKUP3071901@www.freebsd.org>
Resent-Message-ID: <200804231530.m3NFU3aP082273@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         123016
>Category:       ports
>Synopsis:       Port fix: multimedia/tv_grab_au - Fix pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 23 15:30:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ganael Laplanche
>Release:        7.0-STABLE
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD home.martymac.com 7.0-STABLE FreeBSD 7.0-STABLE #14: Sun Apr 20 14:11:03 CEST 2008     root@home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL  amd64
>Description:
This patch performs the following :

- fixes the plist file
- removes the BROKEN flag
- removes the patch and uses REINPLACE_CMD instead (to handle PREFIX correctly)
- uses INSTALL_DATA and INSTALL_SCRIPT instead of generic INSTALL
- installs to share/xmltv (no more to share/p5-xmltv)
- bumps PORTREVISION
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN tv_grab_au.orig/Makefile tv_grab_au/Makefile
--- tv_grab_au.orig/Makefile	2007-05-19 22:18:03.000000000 +0200
+++ tv_grab_au/Makefile	2008-04-23 08:36:22.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	tv_grab_au
 PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.onlinetractorparts.com.au/rohbags/xmltvau/
 # DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -17,14 +17,15 @@
 
 RUN_DEPENDS=	tv_check:${PORTSDIR}/textproc/p5-xmltv
 
-BROKEN=		Incomplete pkg-plist
-
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
+post-patch:
+		@${REINPLACE_CMD} 's|/usr/share/xmltv|${PREFIX}/share/xmltv|' ${WRKDIR}/tv_grab_au
+
 do-install:
-		${INSTALL} ${WRKDIR}/tv_grab_au ${PREFIX}/bin
-		${MKDIR} ${PREFIX}/share/p5-xmltv/tv_grab_au
-		${INSTALL} ${WRKDIR}/channel_ids ${PREFIX}/share/p5-xmltv/tv_grab_au/channel_ids
+		${INSTALL_SCRIPT} ${WRKDIR}/tv_grab_au ${PREFIX}/bin
+		${MKDIR} ${PREFIX}/share/xmltv/tv_grab_au
+		${INSTALL_DATA} ${WRKDIR}/channel_ids ${PREFIX}/share/xmltv/tv_grab_au/channel_ids
 
 .include <bsd.port.mk>
diff -aurN tv_grab_au.orig/files/patch-tv_grab_au tv_grab_au/files/patch-tv_grab_au
--- tv_grab_au.orig/files/patch-tv_grab_au	2007-02-27 07:47:17.000000000 +0100
+++ tv_grab_au/files/patch-tv_grab_au	1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
---- tv_grab_au~	Tue May 31 15:59:17 2005
-+++ tv_grab_au	Tue Feb 27 17:05:10 2007
-@@ -68,7 +68,7 @@
- B<--debug> Output debugging info.
- 
- B<--share> Specify alternate directory for channel_ids file, usally found
--in /usr/share/xmltv/tv_grab_au/.
-+in /usr/local/share/p5-xmltv/tv_grab_au/.
- 
- =head1 SEE ALSO
- 
-@@ -218,7 +218,7 @@
- 
- # share/ directory for storing region-to-channel mapping files.
- # The directory can be overridden with the --share option.
--my $SHARE_DIR='/usr/share/xmltv';
-+my $SHARE_DIR='/usr/local/share/p5-xmltv';
- $SHARE_DIR = $opt_share if defined $opt_share;
- my $OUR_SHARE_DIR = (defined $SHARE_DIR) ? "$SHARE_DIR/tv_grab_au" : '.';
- my $channel_ids_file = "$OUR_SHARE_DIR/channel_ids";
diff -aurN tv_grab_au.orig/pkg-plist tv_grab_au/pkg-plist
--- tv_grab_au.orig/pkg-plist	2007-02-27 07:47:17.000000000 +0100
+++ tv_grab_au/pkg-plist	2008-04-22 22:05:03.000000000 +0200
@@ -1,4 +1,4 @@
 bin/tv_grab_au
-share/p5-xmltv/tv_grab_au/channel_ids
-@dirrm share/p5-xmltv/tv_grab_au
-
+share/xmltv/tv_grab_au/channel_ids
+@dirrm share/xmltv/tv_grab_au
+@dirrmtry share/xmltv


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804231520.m3NFKUP3071901>