diff options
| author | drochner <drochner@pkgsrc.org> | 2011-12-07 16:58:54 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-12-07 16:58:54 +0000 |
| commit | e99b20a5930bc16e0f25321887519e5f5d030d32 (patch) | |
| tree | c181e55df710cd4bed3912832e2313f8dbeeba42 | |
| parent | 725d218e5ab6c60282afe739ccc681f4770a8d54 (diff) | |
| download | pkgsrc-e99b20a5930bc16e0f25321887519e5f5d030d32.tar.gz | |
delegate setting of MOTIFLIB to the motif version specific bl3 files
| -rw-r--r-- | mk/motif.buildlink3.mk | 4 | ||||
| -rw-r--r-- | x11/lesstif/buildlink3.mk | 6 | ||||
| -rw-r--r-- | x11/openmotif/buildlink3.mk | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/mk/motif.buildlink3.mk b/mk/motif.buildlink3.mk index 643ef6aae97..c69fc456323 100644 --- a/mk/motif.buildlink3.mk +++ b/mk/motif.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink3.mk,v 1.13 2008/09/10 16:40:47 joerg Exp $ +# $NetBSD: motif.buildlink3.mk,v 1.14 2011/12/07 16:58:54 drochner Exp $ # # Package-settable variables: # @@ -74,10 +74,8 @@ _MOTIFBASE= ${X11BASE} .if ${_MOTIF_TYPE} == "openmotif" . include "../../x11/openmotif/buildlink3.mk" -_MOTIFBASE= ${BUILDLINK_PREFIX.openmotif} .elif ${_MOTIF_TYPE} == "lesstif" . include "../../x11/lesstif/buildlink3.mk" -_MOTIFBASE= ${BUILDLINK_PREFIX.lesstif} .else # # Link the pre-existing Motif libraries and headers in ${_MOTIFBASE} into diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk index b793ececac1..51bfc7b310f 100644 --- a/x11/lesstif/buildlink3.mk +++ b/x11/lesstif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2011/11/01 06:03:02 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2011/12/07 16:58:55 drochner Exp $ BUILDLINK_TREE+= lesstif @@ -9,6 +9,10 @@ BUILDLINK_API_DEPENDS.lesstif+= lesstif>=0.95.0nb1 BUILDLINK_ABI_DEPENDS.lesstif?= lesstif>=0.95.2nb2 BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif +_MOTIFBASE= ${BUILDLINK_PREFIX.lesstif} +MOTIFLIB= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \ + -L${_MOTIFBASE}/lib -lXm -lXp + .include "../../fonts/fontconfig/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk index 597ea9ee675..fb7141d4329 100644 --- a/x11/openmotif/buildlink3.mk +++ b/x11/openmotif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2011/11/01 06:03:04 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2011/12/07 16:58:54 drochner Exp $ BUILDLINK_TREE+= openmotif @@ -9,6 +9,10 @@ BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.3.1 BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1nb6 BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif +_MOTIFBASE= ${BUILDLINK_PREFIX.openmotif} +MOTIFLIB= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \ + -L${_MOTIFBASE}/lib -lXm -lXp + .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" |