Sat Jul 22 16:48:46 2017 UTC ()
Darwin seems to also need -liconv.

blind commit prompted by darwin bulk builds


(maya)
diff -r1.61 -r1.62 pkgsrc/editors/ted/Makefile
cvs diff -r1.61 -r1.62 pkgsrc/editors/ted/Makefile (switch to unified diff)

--- pkgsrc/editors/ted/Makefile 2014/10/09 14:06:32 1.61
+++ pkgsrc/editors/ted/Makefile 2017/07/22 16:48:46 1.62
@@ -1,83 +1,84 @@ @@ -1,83 +1,84 @@
1# $NetBSD: Makefile,v 1.61 2014/10/09 14:06:32 wiz Exp $ 1# $NetBSD: Makefile,v 1.62 2017/07/22 16:48:46 maya Exp $
2 2
3DISTNAME= ted-2.21.src 3DISTNAME= ted-2.21.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
5PKGREVISION= 11 5PKGREVISION= 11
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ 7MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.nllgg.nl/Ted/ 10HOMEPAGE= http://www.nllgg.nl/Ted/
11COMMENT= X11 based WordPad-like word processor 11COMMENT= X11 based WordPad-like word processor
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_TOOLS+= bsdtar 15USE_TOOLS+= bsdtar
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18WRKSRC= ${WRKDIR}/Ted-2.21 18WRKSRC= ${WRKDIR}/Ted-2.21
19 19
20AFMDIR= ${PREFIX}/share/Ted/afm 20AFMDIR= ${PREFIX}/share/Ted/afm
21INDDIR= ${PREFIX}/share/Ted/ind 21INDDIR= ${PREFIX}/share/Ted/ind
22INFODIR= ${PREFIX}/share/doc/Ted 22INFODIR= ${PREFIX}/share/doc/Ted
23 23
24CONFIGURE_ENV+= ac_jpeg_includes="${JPEGBASE}/include" 24CONFIGURE_ENV+= ac_jpeg_includes="${JPEGBASE}/include"
25CONFIGURE_ENV+= ac_jpeg_libraries="${JPEGBASE}/lib" 25CONFIGURE_ENV+= ac_jpeg_libraries="${JPEGBASE}/lib"
26CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include" 26CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include"
27CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib" 27CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
28CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include" 28CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
29CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib" 29CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib"
30CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include" 30CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include"
31CONFIGURE_ENV+= ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib" 31CONFIGURE_ENV+= ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib"
32CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include" 32CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include"
33CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib" 33CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib"
34CONFIGURE_ENV+= ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include" 34CONFIGURE_ENV+= ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include"
35CONFIGURE_ENV+= ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib" 35CONFIGURE_ENV+= ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib"
36 36
37LDFLAGS.SunOS+= -liconv 37LDFLAGS.SunOS+= -liconv
38LDFLAGS+= -lXft 38LDFLAGS.Darwin+= -liconv
39LDFLAGS+= -lfontconfig 39LDFLAGS+= -lXft
 40LDFLAGS+= -lfontconfig
40 41
41MAKE_FLAGS+= CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-MOTIF 42MAKE_FLAGS+= CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-MOTIF
42 43
43MAKE_ENV+= ${CONFIGURE_ENV} 44MAKE_ENV+= ${CONFIGURE_ENV}
44MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \ 45MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \
45 DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \ 46 DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \
46 DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \ 47 DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \
47 DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"' 48 DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"'
48 49
49BUILD_TARGET= compile.shared 50BUILD_TARGET= compile.shared
50INSTALL_TARGET= install.shared 51INSTALL_TARGET= install.shared
51 52
52INSTALLATION_DIRS= bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR} 53INSTALLATION_DIRS= bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR}
53 54
54post-extract: 55post-extract:
55 @cd ${WRKSRC} ; ${TOOLS_PATH.bsdtar} xf tedPackage/TedBindist.tar 56 @cd ${WRKSRC} ; ${TOOLS_PATH.bsdtar} xf tedPackage/TedBindist.tar
56 57
57post-patch: 58post-patch:
58 @cd ${WRKSRC}/Ted ; \ 59 @cd ${WRKSRC}/Ted ; \
59 ${SED} -e "s!Ted.afmDirectory:.*!Ted.afmDirectory:${AFMDIR}!g" \ 60 ${SED} -e "s!Ted.afmDirectory:.*!Ted.afmDirectory:${AFMDIR}!g" \
60 -e "s!Ted.spellToolSystemDicts:.*!Ted.spellToolSystemDicts:${INDDIR}!g" \ 61 -e "s!Ted.spellToolSystemDicts:.*!Ted.spellToolSystemDicts:${INDDIR}!g" \
61 -e "s!Ted.documentFileName:.*!Ted.documentFileName:${INFODIR}/TedDocument-en_US.rtf!g" \ 62 -e "s!Ted.documentFileName:.*!Ted.documentFileName:${INFODIR}/TedDocument-en_US.rtf!g" \
62 Ted.ad.sample > Ted.ad 63 Ted.ad.sample > Ted.ad
63 64
64do-install: 65do-install:
65 ${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${DESTDIR}${PREFIX}/bin/Ted 66 ${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${DESTDIR}${PREFIX}/bin/Ted
66 ${INSTALL_DATA} ${WRKSRC}/Ted/afm/*.afm ${DESTDIR}${AFMDIR} 67 ${INSTALL_DATA} ${WRKSRC}/Ted/afm/*.afm ${DESTDIR}${AFMDIR}
67 ${INSTALL_DATA} ${FILESDIR}/README.ind ${DESTDIR}${INDDIR} 68 ${INSTALL_DATA} ${FILESDIR}/README.ind ${DESTDIR}${INDDIR}
68 ${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${DESTDIR}${INFODIR} 69 ${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${DESTDIR}${INFODIR}
69 ${INSTALL_DATA} ${WRKSRC}/Ted/Ted.ad \ 70 ${INSTALL_DATA} ${WRKSRC}/Ted/Ted.ad \
70 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ted 71 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ted
71 72
72.include "../../converters/libiconv/buildlink3.mk" 73.include "../../converters/libiconv/buildlink3.mk"
73.include "../../devel/pcre/buildlink3.mk" 74.include "../../devel/pcre/buildlink3.mk"
74.include "../../devel/zlib/buildlink3.mk" 75.include "../../devel/zlib/buildlink3.mk"
75.include "../../fonts/fontconfig/buildlink3.mk" 76.include "../../fonts/fontconfig/buildlink3.mk"
76.include "../../mk/jpeg.buildlink3.mk" 77.include "../../mk/jpeg.buildlink3.mk"
77.include "../../graphics/png/buildlink3.mk" 78.include "../../graphics/png/buildlink3.mk"
78.include "../../graphics/tiff/buildlink3.mk" 79.include "../../graphics/tiff/buildlink3.mk"
79.include "../../x11/libXft/buildlink3.mk" 80.include "../../x11/libXft/buildlink3.mk"
80.include "../../x11/libXpm/buildlink3.mk" 81.include "../../x11/libXpm/buildlink3.mk"
81.include "../../mk/motif.buildlink3.mk" 82.include "../../mk/motif.buildlink3.mk"
82 83
83.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"