Fri Jun 7 15:57:48 2013 UTC ()
Fix build of motif and its dependencies.

* libfontconfig should be linked too.


(ryoon)
diff -r1.8 -r1.9 pkgsrc/x11/motif/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/motif/buildlink3.mk
cvs diff -r1.8 -r1.9 pkgsrc/x11/motif/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/motif/Makefile 2013/06/06 12:53:40 1.8
+++ pkgsrc/x11/motif/Makefile 2013/06/07 15:57:47 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2013/06/06 12:53:40 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2013/06/07 15:57:47 ryoon Exp $
2 2
3PKGVER= 2.3.4 3PKGVER= 2.3.4
4PKGREVISION= 6 4PKGREVISION= 6
5DISTNAME= motif-${PKGVER}-src 5DISTNAME= motif-${PKGVER}-src
6PKGNAME= motif-${PKGVER} 6PKGNAME= motif-${PKGVER}
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=motif/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=motif/}
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://motif.ics.com/ 12HOMEPAGE= http://motif.ics.com/
13COMMENT= LGPLed Motif toolkit for the X Window System 13COMMENT= LGPLed Motif toolkit for the X Window System
14LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
@@ -36,26 +36,28 @@ SUBST_SED.man_rename= -e 's: Core.3: XC @@ -36,26 +36,28 @@ SUBST_SED.man_rename= -e 's: Core.3: XC
36SUBST_SED.man_rename+= -e 's: Object.3: XObject.3:g' 36SUBST_SED.man_rename+= -e 's: Object.3: XObject.3:g'
37SUBST_SED.man_rename+= -e 's: Shell.3: XShell.3:g' 37SUBST_SED.man_rename+= -e 's: Shell.3: XShell.3:g'
38 38
39CONFIGURE_ARGS+= \ 39CONFIGURE_ARGS+= \
40 --enable-jpeg --enable-png \ 40 --enable-jpeg --enable-png \
41 --with-libjpeg-includes=${JPEGBASE}/include \ 41 --with-libjpeg-includes=${JPEGBASE}/include \
42 --with-libjpeg-lib=${JPEGBASE}/lib \ 42 --with-libjpeg-lib=${JPEGBASE}/lib \
43 --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \ 43 --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \
44 --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib \ 44 --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib \
45 --x-libraries=${X11BASE}/lib 45 --x-libraries=${X11BASE}/lib
46 46
47CONFIGURE_ARGS+= --disable-printing 47CONFIGURE_ARGS+= --disable-printing
48 48
 49BUILDLINK_TRANSFORM+= l:Xft:Xft:fontconfig
 50
49# Don't compress manual pages as they include each other. 51# Don't compress manual pages as they include each other.
50.undef MANZ 52.undef MANZ
51 53
52.if ${OPSYS} == "NetBSD" 54.if ${OPSYS} == "NetBSD"
53CONFIGURE_ENV+= ac_cv_func_setpgrp_void=no 55CONFIGURE_ENV+= ac_cv_func_setpgrp_void=no
54.endif 56.endif
55CONFIGURE_ARGS+= --enable-xft 57CONFIGURE_ARGS+= --enable-xft
56CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 58CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
57 59
58.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 60.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
59MAKE_FLAGS+= CROSS_COMPILING=yes CC_FOR_BUILD=${NATIVE_CC:Q} \ 61MAKE_FLAGS+= CROSS_COMPILING=yes CC_FOR_BUILD=${NATIVE_CC:Q} \
60 CPPFLAGS_FOR_BUILD=-I${PREFIX}/include 62 CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
61.endif 63.endif
cvs diff -r1.6 -r1.7 pkgsrc/x11/motif/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/motif/buildlink3.mk 2013/06/06 12:53:40 1.6
+++ pkgsrc/x11/motif/buildlink3.mk 2013/06/07 15:57:47 1.7
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: buildlink3.mk,v 1.6 2013/06/06 12:53:40 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2013/06/07 15:57:47 ryoon Exp $
2 2
3BUILDLINK_TREE+= motif 3BUILDLINK_TREE+= motif
4 4
5.if !defined(X11MOTIF_BUILDLINK3_MK) 5.if !defined(X11MOTIF_BUILDLINK3_MK)
6X11MOTIF_BUILDLINK3_MK:= 6X11MOTIF_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.motif+= motif>=2.3.4 8BUILDLINK_API_DEPENDS.motif+= motif>=2.3.4
9BUILDLINK_ABI_DEPENDS.motif+= motif>=2.3.4nb6 9BUILDLINK_ABI_DEPENDS.motif+= motif>=2.3.4nb6
10BUILDLINK_PKGSRCDIR.motif?= ../../x11/motif 10BUILDLINK_PKGSRCDIR.motif?= ../../x11/motif
11 11
12_MOTIFBASE= ${BUILDLINK_PREFIX.motif} 12_MOTIFBASE= ${BUILDLINK_PREFIX.motif}
13MOTIFLIB= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \ 13MOTIFLIB= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \
14 -L${_MOTIFBASE}/lib -lXm 14 -L${_MOTIFBASE}/lib -lXm -lXft
15 15
16BUILDLINK_TRANSFORM+= rm:-lXp 16BUILDLINK_TRANSFORM+= rm:-lXp
 17BUILDLINK_TRANSFORM+= l:Xm:Xm:Xft
17 18
18.include "../../mk/jpeg.buildlink3.mk" 19.include "../../mk/jpeg.buildlink3.mk"
19.include "../../graphics/png/buildlink3.mk" 20.include "../../graphics/png/buildlink3.mk"
20.include "../../x11/libX11/buildlink3.mk" 21.include "../../x11/libX11/buildlink3.mk"
21.include "../../x11/libXaw/buildlink3.mk" 22.include "../../x11/libXaw/buildlink3.mk"
22.include "../../x11/libXmu/buildlink3.mk" 23.include "../../x11/libXmu/buildlink3.mk"
23.include "../../x11/libXext/buildlink3.mk" 24.include "../../x11/libXext/buildlink3.mk"
24.include "../../x11/libXft/buildlink3.mk" 25.include "../../x11/libXft/buildlink3.mk"
25.include "../../x11/xbitmaps/buildlink3.mk" 26.include "../../x11/xbitmaps/buildlink3.mk"
26.endif # X11MOTIF_BUILDLINK3_MK 27.endif # X11MOTIF_BUILDLINK3_MK
27 28
28BUILDLINK_TREE+= -motif 29BUILDLINK_TREE+= -motif