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
cvs diff -r1.13 -r1.14 pkgsrc/mk/motif.buildlink3.mk (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: motif.buildlink3.mk,v 1.13 2008/09/10 16:40:47 joerg Exp $ 1# $NetBSD: motif.buildlink3.mk,v 1.14 2011/12/07 16:58:54 drochner Exp $
2# 2#
3# Package-settable variables: 3# Package-settable variables:
4# 4#
5# MOTIFBASE 5# MOTIFBASE
6# choose the Motif-2.0 installation at the named location. 6# choose the Motif-2.0 installation at the named location.
7# 7#
8# MOTIF_TYPE 8# MOTIF_TYPE
9# choose a specific Motif-2.0 package. 9# choose a specific Motif-2.0 package.
10# 10#
11# Result variables: 11# Result variables:
12# 12#
13# MOTIFBASE 13# MOTIFBASE
14# The chosen Motif installation. 14# The chosen Motif installation.
@@ -64,30 +64,28 @@ _MOTIF_TYPE= ${MOTIF_TYPE} @@ -64,30 +64,28 @@ _MOTIF_TYPE= ${MOTIF_TYPE}
64.if defined(MOTIFBASE) 64.if defined(MOTIFBASE)
65_MOTIF_TYPE= none 65_MOTIF_TYPE= none
66_MOTIFBASE= ${MOTIFBASE} 66_MOTIFBASE= ${MOTIFBASE}
67.else 67.else
68. if ${_MOTIF_TYPE} == "dt" 68. if ${_MOTIF_TYPE} == "dt"
69_MOTIFBASE= /usr/dt 69_MOTIFBASE= /usr/dt
70. elif ${_MOTIF_TYPE} == "none" 70. elif ${_MOTIF_TYPE} == "none"
71_MOTIFBASE= ${X11BASE} 71_MOTIFBASE= ${X11BASE}
72. endif 72. endif
73.endif 73.endif
74 74
75.if ${_MOTIF_TYPE} == "openmotif" 75.if ${_MOTIF_TYPE} == "openmotif"
76. include "../../x11/openmotif/buildlink3.mk" 76. include "../../x11/openmotif/buildlink3.mk"
77_MOTIFBASE= ${BUILDLINK_PREFIX.openmotif} 
78.elif ${_MOTIF_TYPE} == "lesstif" 77.elif ${_MOTIF_TYPE} == "lesstif"
79. include "../../x11/lesstif/buildlink3.mk" 78. include "../../x11/lesstif/buildlink3.mk"
80_MOTIFBASE= ${BUILDLINK_PREFIX.lesstif} 
81.else 79.else
82# 80#
83# Link the pre-existing Motif libraries and headers in ${_MOTIFBASE} into 81# Link the pre-existing Motif libraries and headers in ${_MOTIFBASE} into
84# ${BUILDLINK_DIR}. 82# ${BUILDLINK_DIR}.
85# 83#
86BUILDLINK_PREFIX.motif= ${_MOTIFBASE} 84BUILDLINK_PREFIX.motif= ${_MOTIFBASE}
87 85
88.include "../../mk/x11.buildlink3.mk" 86.include "../../mk/x11.buildlink3.mk"
89.endif 87.endif
90 88
91.if !defined(MOTIFBASE) 89.if !defined(MOTIFBASE)
92MOTIF_TYPE:= ${_MOTIF_TYPE} 90MOTIF_TYPE:= ${_MOTIF_TYPE}
93MOTIFBASE= ${_MOTIFBASE} 91MOTIFBASE= ${_MOTIFBASE}
cvs diff -r1.21 -r1.22 pkgsrc/x11/lesstif/buildlink3.mk (expand / switch to unified diff)

--- 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,19 +1,23 @@ @@ -1,19 +1,23 @@
1# $NetBSD: buildlink3.mk,v 1.21 2011/11/01 06:03:02 sbd Exp $ 1# $NetBSD: buildlink3.mk,v 1.22 2011/12/07 16:58:55 drochner Exp $
2 2
3BUILDLINK_TREE+= lesstif 3BUILDLINK_TREE+= lesstif
4 4
5.if !defined(LESSTIF_BUILDLINK3_MK) 5.if !defined(LESSTIF_BUILDLINK3_MK)
6LESSTIF_BUILDLINK3_MK:= 6LESSTIF_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lesstif+= lesstif>=0.95.0nb1 8BUILDLINK_API_DEPENDS.lesstif+= lesstif>=0.95.0nb1
9BUILDLINK_ABI_DEPENDS.lesstif?= lesstif>=0.95.2nb2 9BUILDLINK_ABI_DEPENDS.lesstif?= lesstif>=0.95.2nb2
10BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif 10BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif
11 11
 12_MOTIFBASE= ${BUILDLINK_PREFIX.lesstif}
 13MOTIFLIB= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \
 14 -L${_MOTIFBASE}/lib -lXm -lXp
 15
12.include "../../fonts/fontconfig/buildlink3.mk" 16.include "../../fonts/fontconfig/buildlink3.mk"
13.include "../../x11/libXext/buildlink3.mk" 17.include "../../x11/libXext/buildlink3.mk"
14.include "../../x11/libXp/buildlink3.mk" 18.include "../../x11/libXp/buildlink3.mk"
15.include "../../x11/libXrender/buildlink3.mk" 19.include "../../x11/libXrender/buildlink3.mk"
16.include "../../x11/libXt/buildlink3.mk" 20.include "../../x11/libXt/buildlink3.mk"
17.endif # LESSTIF_BUILDLINK3_MK 21.endif # LESSTIF_BUILDLINK3_MK
18 22
19BUILDLINK_TREE+= -lesstif 23BUILDLINK_TREE+= -lesstif
cvs diff -r1.18 -r1.19 pkgsrc/x11/openmotif/Attic/buildlink3.mk (expand / switch to unified diff)

--- 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,24 +1,28 @@ @@ -1,24 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.18 2011/11/01 06:03:04 sbd Exp $ 1# $NetBSD: buildlink3.mk,v 1.19 2011/12/07 16:58:54 drochner Exp $
2 2
3BUILDLINK_TREE+= openmotif 3BUILDLINK_TREE+= openmotif
4 4
5.if !defined(OPENMOTIF_BUILDLINK3_MK) 5.if !defined(OPENMOTIF_BUILDLINK3_MK)
6OPENMOTIF_BUILDLINK3_MK:= 6OPENMOTIF_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.3.1 8BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.3.1
9BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1nb6 9BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1nb6
10BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif 10BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif
11 11
 12_MOTIFBASE= ${BUILDLINK_PREFIX.openmotif}
 13MOTIFLIB= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \
 14 -L${_MOTIFBASE}/lib -lXm -lXp
 15
12.include "../../mk/jpeg.buildlink3.mk" 16.include "../../mk/jpeg.buildlink3.mk"
13.include "../../graphics/png/buildlink3.mk" 17.include "../../graphics/png/buildlink3.mk"
14.include "../../x11/libX11/buildlink3.mk" 18.include "../../x11/libX11/buildlink3.mk"
15.include "../../x11/libXaw/buildlink3.mk" 19.include "../../x11/libXaw/buildlink3.mk"
16.include "../../x11/libXmu/buildlink3.mk" 20.include "../../x11/libXmu/buildlink3.mk"
17.include "../../x11/libXp/buildlink3.mk" 21.include "../../x11/libXp/buildlink3.mk"
18.include "../../x11/libXext/buildlink3.mk" 22.include "../../x11/libXext/buildlink3.mk"
19.include "../../x11/libXft/buildlink3.mk" 23.include "../../x11/libXft/buildlink3.mk"
20.include "../../x11/xbitmaps/buildlink3.mk" 24.include "../../x11/xbitmaps/buildlink3.mk"
21.include "../../x11/xextproto/buildlink3.mk" 25.include "../../x11/xextproto/buildlink3.mk"
22.endif # OPENMOTIF_BUILDLINK3_MK 26.endif # OPENMOTIF_BUILDLINK3_MK
23 27
24BUILDLINK_TREE+= -openmotif 28BUILDLINK_TREE+= -openmotif