Sun Dec 19 12:32:42 2010 UTC ()
The comment about needing jpegint.h no longer appears to apply, so convert
the jpeg dependency to a common or garden buildlink.


(dsainty)
diff -r1.38 -r1.39 pkgsrc/graphics/feh/Makefile
cvs diff -r1.38 -r1.39 pkgsrc/graphics/feh/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/feh/Makefile 2010/06/13 22:44:30 1.38
+++ pkgsrc/graphics/feh/Makefile 2010/12/19 12:32:42 1.39
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.39 2010/12/19 12:32:42 dsainty Exp $
2# 2#
3 3
4DISTNAME= feh-1.3.4 4DISTNAME= feh-1.3.4
5PKGREVISION= 7 5PKGREVISION= 7
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://linuxbrit.co.uk/downloads/ 7MASTER_SITES= http://linuxbrit.co.uk/downloads/
8 8
9MAINTAINER= rh@NetBSD.org 9MAINTAINER= rh@NetBSD.org
10HOMEPAGE= http://linuxbrit.co.uk/feh/ 10HOMEPAGE= http://linuxbrit.co.uk/feh/
11COMMENT= Advanced image viewer 11COMMENT= Advanced image viewer
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DEPENDS+= wget-[0-9]*:../../net/wget 15DEPENDS+= wget-[0-9]*:../../net/wget
16 16
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
18CONFIGURE_ARGS+= --program-transform-name=s,cam,feh_cam, 18CONFIGURE_ARGS+= --program-transform-name=s,cam,feh_cam,
19 19
20USE_TOOLS+= bash:run perl:run 20USE_TOOLS+= bash:run perl:run
21 21
22REPLACE_BASH= cam/gen_cam_menu.sh 22REPLACE_BASH= cam/gen_cam_menu.sh
23REPLACE_PERL= cam/cam 23REPLACE_PERL= cam/cam
24 24
25LDFLAGS.SunOS+= -lnsl -lsocket 25LDFLAGS.SunOS+= -lnsl -lsocket
26 26
27BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.4 27BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.4
28BUILDLINK_API_DEPENDS.jpeg+= jpeg>=6bnb3 # includes jpegint.h 
29 28
30BUILDLINK_DEPMETHOD.libXt?= build 29BUILDLINK_DEPMETHOD.libXt?= build
31 30
 31.include "../../graphics/jpeg/buildlink3.mk"
32.include "../../devel/giblib/buildlink3.mk" 32.include "../../devel/giblib/buildlink3.mk"
33.include "../../x11/libXext/buildlink3.mk" 33.include "../../x11/libXext/buildlink3.mk"
34.include "../../x11/libXinerama/buildlink3.mk" 34.include "../../x11/libXinerama/buildlink3.mk"
35.include "../../x11/libXt/buildlink3.mk" 35.include "../../x11/libXt/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"