[pkgsrc/trunk]: pkgsrc Fix conflict between graphics/feh and audio/cam by ren...

[rh <rh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/19626cadb4aa
branches:  trunk
changeset: 470406:19626cadb4aa
user:      rh <rh%pkgsrc.org@localhost>
date:      Tue Mar 09 02:23:44 2004 +0000

description:
Fix conflict between graphics/feh and audio/cam by renaming cam to feh_cam.
Fix the Perl path for feh_cam.
Bump PKGREVISION for feh.
Add CONFLICTS= feh<1.2.6nb3 to  audio/cam.

diffstat:

 audio/cam/Makefile    |  4 +++-
 graphics/feh/Makefile |  7 +++++--
 graphics/feh/PLIST    |  6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r ad2eed0068e1 -r 19626cadb4aa audio/cam/Makefile
--- a/audio/cam/Makefile        Tue Mar 09 01:22:58 2004 +0000
+++ b/audio/cam/Makefile        Tue Mar 09 02:23:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:21:58 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/09 02:23:44 rh Exp $
 #
 
 DISTNAME=      cam-1.02
@@ -6,6 +6,8 @@
 MASTER_SITES=  ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
 EXTRACT_SUFX=  .tgz
 
+CONFLICTS+=    feh<1.2.6nb3
+
 MAINTAINER=    hubertf%NetBSD.org@localhost
 COMMENT=       Cpu's Audio Mixer [curses based]
 
diff -r ad2eed0068e1 -r 19626cadb4aa graphics/feh/Makefile
--- a/graphics/feh/Makefile     Tue Mar 09 01:22:58 2004 +0000
+++ b/graphics/feh/Makefile     Tue Mar 09 02:23:44 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:42 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/09 02:23:44 rh Exp $
 #
 
 DISTNAME=      feh-1.2.6
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.linuxbrit.co.uk/downloads/
 
@@ -16,5 +16,8 @@
 USE_BUILDLINK2=        YES
 USE_X11=       YES
 
+CONFIGURE_ARGS+=--program-transform-name=s,cam,feh_cam,
+REPLACE_PERL=  ${WRKSRC}/cam/cam
+
 .include "../../devel/giblib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ad2eed0068e1 -r 19626cadb4aa graphics/feh/PLIST
--- a/graphics/feh/PLIST        Tue Mar 09 01:22:58 2004 +0000
+++ b/graphics/feh/PLIST        Tue Mar 09 02:23:44 2004 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2003/02/24 16:10:07 salo Exp $
-bin/cam
+@comment $NetBSD: PLIST,v 1.5 2004/03/09 02:23:44 rh Exp $
 bin/feh
-bin/gen_cam_menu.sh
+bin/feh_cam
+bin/gen_feh_cam_menu.sh
 man/man1/feh.1
 share/doc/feh/AUTHORS
 share/doc/feh/ChangeLog