Wed Dec 7 16:58:55 2011 UTC ()
delegate setting of MOTIFLIB to the motif version specific bl3 files
(drochner)
diff -r1.13 -r1.14 pkgsrc/mk/motif.buildlink3.mk
diff -r1.21 -r1.22 pkgsrc/x11/lesstif/buildlink3.mk
diff -r1.18 -r1.19 pkgsrc/x11/openmotif/buildlink3.mk
--- pkgsrc/mk/motif.buildlink3.mk 2008/09/10 16:40:47 1.13
+++ pkgsrc/mk/motif.buildlink3.mk 2011/12/07 16:58:54 1.14
@@ -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 @@
.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
--- pkgsrc/x11/lesstif/buildlink3.mk 2011/11/01 06:03:02 1.21
+++ pkgsrc/x11/lesstif/buildlink3.mk 2011/12/07 16:58:55 1.22
@@ -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
@@ -8,6 +8,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"
--- pkgsrc/x11/openmotif/Attic/buildlink3.mk 2011/11/01 06:03:04 1.18
+++ pkgsrc/x11/openmotif/Attic/buildlink3.mk 2011/12/07 16:58:54 1.19
@@ -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
@@ -8,6 +8,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"