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 (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,113 +1,115 @@ @@ -1,113 +1,115 @@
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
15 15
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17 17
18WRKSRC= ${WRKDIR}/motif-${PKGVER} 18WRKSRC= ${WRKDIR}/motif-${PKGVER}
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22CONFLICTS+= lesstif-[0-9]* openmotif-[0-9]* 22CONFLICTS+= lesstif-[0-9]* openmotif-[0-9]*
23 23
24USE_LIBTOOL= yes 24USE_LIBTOOL= yes
25USE_TOOLS+= flex gmake tbl pkg-config automake yacc 25USE_TOOLS+= flex gmake tbl pkg-config automake yacc
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27MAKE_JOBS_SAFE= no # PR 37233 27MAKE_JOBS_SAFE= no # PR 37233
28 28
29CFLAGS.SunOS+= -Dsun 29CFLAGS.SunOS+= -Dsun
30 30
31SUBST_CLASSES+= man_rename 31SUBST_CLASSES+= man_rename
32SUBST_STAGE.man_rename= pre-configure 32SUBST_STAGE.man_rename= pre-configure
33SUBST_MESSAGE.man_rename= Fixing hardcoded paths. 33SUBST_MESSAGE.man_rename= Fixing hardcoded paths.
34SUBST_FILES.man_rename= doc/man/man3/Makefile.in 34SUBST_FILES.man_rename= doc/man/man3/Makefile.in
35SUBST_SED.man_rename= -e 's: Core.3: XCore.3:g' 35SUBST_SED.man_rename= -e 's: Core.3: XCore.3:g'
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
62 64
63# 1) Fix the man pages to refer to the correct sections. 65# 1) Fix the man pages to refer to the correct sections.
64# 2) Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to 66# 2) Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to
65# avoid manpage conflicts with other packages. 67# avoid manpage conflicts with other packages.
66# 68#
67post-patch: 69post-patch:
68 set -e; \ 70 set -e; \
69 cd ${WRKSRC}/doc/man; \ 71 cd ${WRKSRC}/doc/man; \
70 for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do \ 72 for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do \
71 ${SED} -e "s|user cmd|1|g" \ 73 ${SED} -e "s|user cmd|1|g" \
72 -e "s|library call|3|g" \ 74 -e "s|library call|3|g" \
73 -e "s|special file|5|g" \ 75 -e "s|special file|5|g" \
74 -e "s|file formats|5|g" \ 76 -e "s|file formats|5|g" \
75 $${manpage} > $${manpage}.fixed; \ 77 $${manpage} > $${manpage}.fixed; \
76 ${MV} -f $${manpage}.fixed $${manpage}; \ 78 ${MV} -f $${manpage}.fixed $${manpage}; \
77 done; \ 79 done; \
78 ${CP} -f man4/mwmrc.4 man5/mwmrc.5 80 ${CP} -f man4/mwmrc.4 man5/mwmrc.5
79 set -e; \ 81 set -e; \
80 cd ${WRKSRC}/doc/man/man3; \ 82 cd ${WRKSRC}/doc/man/man3; \
81 for name in Core Object Shell; do \ 83 for name in Core Object Shell; do \
82 ${MV} -f $${name}.3 X$${name}.3; \ 84 ${MV} -f $${name}.3 X$${name}.3; \
83 files=`${GREP} -l ".fB$${name}.fP(3)" *.3`; \ 85 files=`${GREP} -l ".fB$${name}.fP(3)" *.3`; \
84 for manpage in $${files}; do \ 86 for manpage in $${files}; do \
85 ${MV} -f $${manpage} $${manpage}.presubst; \ 87 ${MV} -f $${manpage} $${manpage}.presubst; \
86 ${SED} "s|\\(.fB\\)$${name}\\(.fP(3)\\)|\\1X$${name}\\2|g" \ 88 ${SED} "s|\\(.fB\\)$${name}\\(.fP(3)\\)|\\1X$${name}\\2|g" \
87 $${manpage}.presubst > $${manpage}; \ 89 $${manpage}.presubst > $${manpage}; \
88 ${RM} -f $${manpage}.presubst; \ 90 ${RM} -f $${manpage}.presubst; \
89 done; \ 91 done; \
90 done 92 done
91 ${ECHO} "#include <X11/Xos_r.h>" > ${WRKSRC}/lib/Xm/Xmos_r.h 93 ${ECHO} "#include <X11/Xos_r.h>" > ${WRKSRC}/lib/Xm/Xmos_r.h
92 94
93pre-configure: 95pre-configure:
94 set -e; cd ${WRKSRC} ; sh ./autogen.sh 96 set -e; cd ${WRKSRC} ; sh ./autogen.sh
95 97
96# Filter the manpages through tbl. 98# Filter the manpages through tbl.
97post-build: 99post-build:
98 set -e; \ 100 set -e; \
99 cd ${WRKSRC}/doc/man; \ 101 cd ${WRKSRC}/doc/man; \
100 for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do \ 102 for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do \
101 ${TBL} $${manpage} > $${manpage}.tblized; \ 103 ${TBL} $${manpage} > $${manpage}.tblized; \
102 ${MV} -f $${manpage}.tblized $${manpage}; \ 104 ${MV} -f $${manpage}.tblized $${manpage}; \
103 done 105 done
104 106
105.include "../../mk/jpeg.buildlink3.mk" 107.include "../../mk/jpeg.buildlink3.mk"
106.include "../../graphics/png/buildlink3.mk" 108.include "../../graphics/png/buildlink3.mk"
107.include "../../x11/libX11/buildlink3.mk" 109.include "../../x11/libX11/buildlink3.mk"
108.include "../../x11/libXaw/buildlink3.mk" 110.include "../../x11/libXaw/buildlink3.mk"
109.include "../../x11/libXmu/buildlink3.mk" 111.include "../../x11/libXmu/buildlink3.mk"
110.include "../../x11/libXext/buildlink3.mk" 112.include "../../x11/libXext/buildlink3.mk"
111.include "../../x11/libXft/buildlink3.mk" 113.include "../../x11/libXft/buildlink3.mk"
112.include "../../x11/xbitmaps/buildlink3.mk" 114.include "../../x11/xbitmaps/buildlink3.mk"
113.include "../../mk/bsd.pkg.mk" 115.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/x11/motif/buildlink3.mk (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