diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-05 19:25:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-05 19:25:06 +0000 |
| commit | afe13927bc95790c8a1e766bddb44d489c029bcf (patch) | |
| tree | a3daf9a5fb572d8089372ce24f3f353d4bac8d47 /converters | |
| parent | eadb7c0805bfa87d05e1bdde7c55dea0db0bd118 (diff) | |
| download | pkgsrc-afe13927bc95790c8a1e766bddb44d489c029bcf.tar.gz | |
Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/fribidi/buildlink3.mk | 18 | ||||
| -rw-r--r-- | converters/wv/buildlink3.mk | 17 |
2 files changed, 14 insertions, 21 deletions
diff --git a/converters/fribidi/buildlink3.mk b/converters/fribidi/buildlink3.mk index 1ba055e8a70..2b88e1a3b61 100644 --- a/converters/fribidi/buildlink3.mk +++ b/converters/fribidi/buildlink3.mk @@ -1,9 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:01:11 wiz Exp $ -# -# This Makefile fragment is included by packages that use fribidi. -# -# This file was created automatically using createbuildlink-3.1. -# +# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FRIBIDI_BUILDLINK3_MK:= ${FRIBIDI_BUILDLINK3_MK}+ @@ -12,11 +7,12 @@ FRIBIDI_BUILDLINK3_MK:= ${FRIBIDI_BUILDLINK3_MK}+ BUILDLINK_DEPENDS+= fribidi .endif -.if !empty(FRIBIDI_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= fribidi -BUILDLINK_DEPENDS.fribidi+= fribidi>=0.10.4 -BUILDLINK_PKGSRCDIR.fribidi?= ../../converters/fribidi +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfribidi} +BUILDLINK_PACKAGES+= fribidi -.endif # FRIBIDI_BUILDLINK3_MK +.if !empty(FRIBIDI_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.fribidi+= fribidi>=0.10.4 +BUILDLINK_PKGSRCDIR.fribidi?= ../../converters/fribidi +.endif # FRIBIDI_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk index c56965afc64..fac1628f6f0 100644 --- a/converters/wv/buildlink3.mk +++ b/converters/wv/buildlink3.mk @@ -1,9 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:19:00 wiz Exp $ -# -# This Makefile fragment is included by packages that use wv. -# -# This file was created automatically using createbuildlink-3.1. -# +# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WV_BUILDLINK3_MK:= ${WV_BUILDLINK3_MK}+ @@ -12,10 +7,12 @@ WV_BUILDLINK3_MK:= ${WV_BUILDLINK3_MK}+ BUILDLINK_DEPENDS+= wv .endif +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwv} +BUILDLINK_PACKAGES+= wv + .if !empty(WV_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= wv -BUILDLINK_DEPENDS.wv+= wv>=1.0.0 -BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv +BUILDLINK_DEPENDS.wv+= wv>=1.0.0 +BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -25,6 +22,6 @@ BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv .include "../../graphics/png/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # WV_BUILDLINK3_MK +.endif # WV_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |