diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/sane-frontends/Makefile | 12 | ||||
| -rw-r--r-- | graphics/xsane/Makefile | 21 |
2 files changed, 14 insertions, 19 deletions
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index 094f8822f06..22110881167 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/08/19 19:18:31 mycroft Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/22 21:56:28 wiz Exp $ .include "../../graphics/sane-backends/Makefile.common" @@ -6,20 +6,18 @@ DISTNAME= sane-frontends-${SANE_VERSION} COMMENT= Frontends for access to scanners, digitals camera, frame grabbers etc -DEPENDS+= gimp>=1.0.4:../../graphics/gimp BUILDLINK_DEPENDS.sane= sane-backends-${SANE_VERSION} GNU_CONFIGURE= yes USE_GMAKE= yes +USE_BUILDLINK2= yes USE_X11BASE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig # -O to work around a bug with -O2 and egcs. CFLAGS= -O -# to find gimp includes -CPPFLAGS= -I${LOCALBASE}/include -.include "../../graphics/sane-backends/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" +.include "../../graphics/sane-backends/buildlink2.mk" +.include "../../graphics/gimp-base/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index f56074c1193..a4a9eab2d59 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/08/19 19:36:48 mycroft Exp $ +# $NetBSD: Makefile,v 1.34 2002/09/22 21:55:03 wiz Exp $ # DISTNAME= xsane-0.86 @@ -18,21 +18,18 @@ HOMEPAGE= http://www.xsane.org/ COMMENT= New improved frontend for SANE BUILD_USES_MSGFMT= yes -BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.5 -DEPENDS+= jpeg-6b:../../graphics/jpeg -DEPENDS+= png>=1.2.1:../../graphics/png -DEPENDS+= tiff-[0-9]*:../../graphics/tiff -DEPENDS+= gimp>=1.0.4:../../graphics/gimp -DEPENDS+= sane-backends>=1.0.4:../../graphics/sane-backends USE_LIBINTL= YES GNU_CONFIGURE= YES USE_GMAKE= YES USE_X11BASE= YES +USE_BUILDLINK2= YES -LDFLAGS+= -L${PREFIX}/lib/sane -Wl,-R${PREFIX}/lib/sane -CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include -LIBS= -lintl - -.include "../../x11/gtk/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../graphics/gimp-base/buildlink2.mk" +.include "../../graphics/sane-backends/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |