diff options
| author | rillig <rillig> | 2006-06-16 14:35:54 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-06-16 14:35:54 +0000 |
| commit | e06dd97a299a0e7e9a9ef326a911418b84936507 (patch) | |
| tree | fa8df4a5c928445c313200b4cf2ab9c5f728ab96 /x11/renderproto | |
| parent | fd8b0eee114142c0d305ed6766a1893d4460c052 (diff) | |
| download | pkgsrc-e06dd97a299a0e7e9a9ef326a911418b84936507.tar.gz | |
Fixed pkglint warnings. Fixed use of ${LN} -sf, which does not do the
expected thing on Solaris.
Diffstat (limited to 'x11/renderproto')
| -rw-r--r-- | x11/renderproto/buildlink3.mk | 7 | ||||
| -rw-r--r-- | x11/renderproto/builtin.mk | 23 |
2 files changed, 16 insertions, 14 deletions
diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk index 0499398d314..4d8b31b5065 100644 --- a/x11/renderproto/buildlink3.mk +++ b/x11/renderproto/buildlink3.mk @@ -1,6 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/04/18 17:16:06 reed Exp $ - -BUILDLINK_DEPMETHOD.renderproto?= build +# $NetBSD: buildlink3.mk,v 1.2 2006/06/16 14:35:54 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RENDERPROTO_BUILDLINK3_MK:= ${RENDERPROTO_BUILDLINK3_MK}+ @@ -15,6 +13,7 @@ BUILDLINK_PACKAGES+= renderproto .if !empty(RENDERPROTO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.1 BUILDLINK_PKGSRCDIR.renderproto?= ../../x11/renderproto +BUILDLINK_DEPMETHOD.renderproto?= build .endif # RENDERPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk index 357ce05c30c..d1779405008 100644 --- a/x11/renderproto/builtin.mk +++ b/x11/renderproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2006/04/19 12:25:15 reed Exp $ +# $NetBSD: builtin.mk,v 1.3 2006/06/16 14:35:54 rillig Exp $ BUILTIN_PKG:= renderproto @@ -17,12 +17,12 @@ IS_BUILTIN.renderproto= no # Here, we skip checking whether the files are under ${LOCALBASE} since # we'll consider this X11 package to be built-in even if it's a part # of one of the pkgsrc-installed X11 distributions. -# +# . if empty(H_RENDER:M__nonexistent__) IS_BUILTIN.renderproto= yes . endif .endif -MAKEVARS+= IS_BUILTIN.renderproto +MAKEVARS+= IS_BUILTIN.renderproto ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -52,10 +52,10 @@ USE_BUILTIN.renderproto= ${IS_BUILTIN.renderproto} . if defined(BUILTIN_PKG.renderproto) && \ !empty(IS_BUILTIN.renderproto:M[yY][eE][sS]) USE_BUILTIN.renderproto= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.renderproto} +. for dep in ${BUILDLINK_API_DEPENDS.renderproto} . if !empty(USE_BUILTIN.renderproto:M[yY][eE][sS]) USE_BUILTIN.renderproto!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.renderproto:Q}; then \ + if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.renderproto:Q}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ @@ -92,12 +92,15 @@ CHECK_BUILTIN.renderproto?= no # this is temporary and can be removed once not used BUILDLINK_TARGETS+= render-symlink-pc +.PHONY: render-symlink-pc render-symlink-pc: - src=${BUILDLINK_PREFIX.renderproto}/lib/pkgconfig/renderproto.pc \ - dst=${BUILDLINK_DIR}/lib/pkgconfig/render.pc; \ - ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ - if ${TEST} -f $${src}; then \ - ${LN} -sf $${src} $${dst}; \ + set -e; \ + src=${BUILDLINK_PREFIX.renderproto}/lib/pkgconfig/renderproto.pc; \ + dst=${BUILDLINK_DIR}/lib/pkgconfig/render.pc; \ + ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ + if ${TEST} -f "$$src"; then \ + ${RM} -f "$$dst"; \ + ${LN} -sf "$$src" "$$dst"; \ fi .endif # CHECK_BUILTIN.renderproto |