Wed May 11 07:05:47 2011 UTC ()
Use mk/jpeg.buildlink3.mk rather than picking up graphics/jpeg/buildlink3.mk directly. Bump pkgrevision


(abs)
diff -r1.20 -r1.21 pkgsrc/print/poppler-utils/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/print/poppler-utils/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-utils/Makefile 2011/05/09 14:03:26 1.20
+++ pkgsrc/print/poppler-utils/Makefile 2011/05/11 07:05:46 1.21
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.20 2011/05/09 14:03:26 gdt Exp $ 1# $NetBSD: Makefile,v 1.21 2011/05/11 07:05:46 abs Exp $
2# 2#
3 3
4.include "../../print/poppler/Makefile.common" 4.include "../../print/poppler/Makefile.common"
5 5
6PKGNAME= poppler-utils-${POPPLER_VERS} 6PKGNAME= poppler-utils-${POPPLER_VERS}
7PKGREVISION= 1 7PKGREVISION= 2
8 8
9COMMENT= PDF utilities (from poppler) 9COMMENT= PDF utilities (from poppler)
10MAINTAINER= reed@reedmedia.net 10MAINTAINER= reed@reedmedia.net
11 11
12CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2 12CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2
13CONFLICTS+= xpdf<3.02pl4nb1 13CONFLICTS+= xpdf<3.02pl4nb1
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17 17
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
19# Don't build the cairo graphics backend. 19# Don't build the cairo graphics backend.
20CONFIGURE_ARGS+= --disable-cairo-output 20CONFIGURE_ARGS+= --disable-cairo-output
@@ -35,16 +35,16 @@ BUILD_DIRS= utils # implies INSTALL_DIR @@ -35,16 +35,16 @@ BUILD_DIRS= utils # implies INSTALL_DIR
35BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} 35BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
36.include "../../print/poppler/buildlink3.mk" 36.include "../../print/poppler/buildlink3.mk"
37 37
38.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
39 39
40.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*) 40.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
41.include "../../devel/pthread-stublib/buildlink3.mk" 41.include "../../devel/pthread-stublib/buildlink3.mk"
42PTHREAD_STUBLIB= "-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpthstub" 42PTHREAD_STUBLIB= "-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpthstub"
43.else 43.else
44PTHREAD_STUBLIB= # provided by libc 44PTHREAD_STUBLIB= # provided by libc
45.endif 45.endif
46MAKE_ENV+= PTHREAD_STUBLIB=${PTHREAD_STUBLIB} 46MAKE_ENV+= PTHREAD_STUBLIB=${PTHREAD_STUBLIB}
47 47
48.include "../../graphics/jpeg/buildlink3.mk" 48.include "../../mk/jpeg.buildlink3.mk"
49.include "../../graphics/png/buildlink3.mk" 49.include "../../graphics/png/buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"