From 3ddf2d2d21a2285398447a704abeed494c1eca23 Mon Sep 17 00:00:00 2001 From: rh Date: Tue, 9 Mar 2004 02:23:44 +0000 Subject: 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. --- audio/cam/Makefile | 4 +++- graphics/feh/Makefile | 7 +++++-- graphics/feh/PLIST | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/audio/cam/Makefile b/audio/cam/Makefile index f78068cf064..774d7f8e57e 100644 --- a/audio/cam/Makefile +++ b/audio/cam/Makefile @@ -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 @@ CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/mixers/} EXTRACT_SUFX= .tgz +CONFLICTS+= feh<1.2.6nb3 + MAINTAINER= hubertf@NetBSD.org COMMENT= Cpu's Audio Mixer [curses based] diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index cfa3fb1338a..5e53d2bc9e7 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -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 @@ GNU_CONFIGURE= YES 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 --git a/graphics/feh/PLIST b/graphics/feh/PLIST index a9c83fa0d2e..4f9da762df9 100644 --- a/graphics/feh/PLIST +++ b/graphics/feh/PLIST @@ -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 -- cgit v1.2.3