From df7d10dbeb6ea893cc9ee596440b17f678ac520b Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 6 Sep 2007 21:51:52 +0000 Subject: Convert all libnbcompat/buildlink3.mk references to inplace.mk. --- graphics/netpbm/Makefile | 6 ++---- graphics/xpm/Makefile | 9 ++++----- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'graphics') diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 37e3977c853..fe426a32d85 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.153 2007/04/22 09:58:10 tnn Exp $ +# $NetBSD: Makefile,v 1.154 2007/09/06 21:51:53 jlam Exp $ DISTNAME= netpbm-10.34 PKGREVISION= 1 @@ -67,9 +67,7 @@ CPPFLAGS+= -DSGI_IDO_CC .endif .if !empty(LOWER_OPSYS:Mirix5*) -# needs snprintf() -. include "../../pkgtools/libnbcompat/buildlink3.mk" -LIBS+= ${BUILDLINK_LDADD.libnbcompat} +. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf() .endif .include "../../graphics/jasper/buildlink3.mk" diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index 3cbee558490..e5df2f84f73 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2007/01/06 16:45:17 rillig Exp $ +# $NetBSD: Makefile,v 1.55 2007/09/06 21:51:53 jlam Exp $ DISTNAME= xpm-3.4k PKGREVISION= 7 @@ -31,13 +31,12 @@ SUBST_STAGE.sodots= post-configure SUBST_FILES.sodots= lib/Makefile SUBST_SED.sodots= -e 's,\.so$$(SOXPMLIBREV),.so.$$(SOXPMLIBREV),g' -# needs snprintf() -. include "../../pkgtools/libnbcompat/buildlink3.mk" -IMAKEOPTS+= -DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q} +. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf() +IMAKEOPTS+= -DExtraLibraries=-lnbcompat IMAKEOPTS+= -DInstallCmd=${INSTALL:Q} post-configure: - mkdir ${WRKSRC}/usrlib + ${MKDIR} ${WRKSRC}/usrlib .endif .include "../../x11/libXext/buildlink3.mk" -- cgit v1.2.3