diff options
| author | rh <rh@pkgsrc.org> | 2004-03-09 02:23:44 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2004-03-09 02:23:44 +0000 |
| commit | 4be6eb8f1360a8f69dab6a2e68e54d53db368795 (patch) | |
| tree | 76f22f4675d4f29759ef9e5d33907d4657446a72 /graphics/feh | |
| parent | 917b2190e9331d14799d6ac02f1e930f7dbed942 (diff) | |
| download | pkgsrc-4be6eb8f1360a8f69dab6a2e68e54d53db368795.tar.gz | |
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 (limited to 'graphics/feh')
| -rw-r--r-- | graphics/feh/Makefile | 7 | ||||
| -rw-r--r-- | graphics/feh/PLIST | 6 |
2 files changed, 8 insertions, 5 deletions
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 |