Thu Feb 16 18:48:52 2012 UTC ()
Fix build on SunOS.


(hans)
diff -r1.47 -r1.48 pkgsrc/editors/ted/Makefile
cvs diff -r1.47 -r1.48 pkgsrc/editors/ted/Makefile (switch to unified diff)

--- pkgsrc/editors/ted/Makefile 2012/02/06 12:40:04 1.47
+++ pkgsrc/editors/ted/Makefile 2012/02/16 18:48:52 1.48
@@ -1,79 +1,81 @@ @@ -1,79 +1,81 @@
1# $NetBSD: Makefile,v 1.47 2012/02/06 12:40:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.48 2012/02/16 18:48:52 hans Exp $
2 2
3DISTNAME= ted-2.21.src 3DISTNAME= ted-2.21.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
5PKGREVISION= 4 5PKGREVISION= 4
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
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_TOOLS+= gtar 18USE_TOOLS+= gtar
19MAKE_JOBS_SAFE= no 19MAKE_JOBS_SAFE= no
20 20
21WRKSRC= ${WRKDIR}/Ted-2.21 21WRKSRC= ${WRKDIR}/Ted-2.21
22 22
23AFMDIR= ${PREFIX}/share/Ted/afm 23AFMDIR= ${PREFIX}/share/Ted/afm
24INDDIR= ${PREFIX}/share/Ted/ind 24INDDIR= ${PREFIX}/share/Ted/ind
25INFODIR= ${PREFIX}/share/doc/Ted 25INFODIR= ${PREFIX}/share/doc/Ted
26 26
27CONFIGURE_ENV+= ac_jpeg_includes="${JPEGBASE}/include" 27CONFIGURE_ENV+= ac_jpeg_includes="${JPEGBASE}/include"
28CONFIGURE_ENV+= ac_jpeg_libraries="${JPEGBASE}/lib" 28CONFIGURE_ENV+= ac_jpeg_libraries="${JPEGBASE}/lib"
29CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include" 29CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include"
30CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib" 30CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
31CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include" 31CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
32CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib" 32CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib"
33CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include" 33CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include"
34CONFIGURE_ENV+= ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib" 34CONFIGURE_ENV+= ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib"
35CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include" 35CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include"
36CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib" 36CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib"
37CONFIGURE_ENV+= ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include" 37CONFIGURE_ENV+= ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include"
38CONFIGURE_ENV+= ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib" 38CONFIGURE_ENV+= ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib"
39 39
 40LDFLAGS.SunOS+= -liconv
 41
40MAKE_FLAGS+= CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-MOTIF 42MAKE_FLAGS+= CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-MOTIF
41 43
42MAKE_ENV+= ${CONFIGURE_ENV} 44MAKE_ENV+= ${CONFIGURE_ENV}
43MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \ 45MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \
44 DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \ 46 DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \
45 DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \ 47 DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \
46 DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"' 48 DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"'
47 49
48BUILD_TARGET= compile.shared 50BUILD_TARGET= compile.shared
49INSTALL_TARGET= install.shared 51INSTALL_TARGET= install.shared
50 52
51INSTALLATION_DIRS= bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR} 53INSTALLATION_DIRS= bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR}
52 54
53post-extract: 55post-extract:
54 @cd ${WRKSRC} ; ${GTAR} xf tedPackage/TedBindist.tar 56 @cd ${WRKSRC} ; ${GTAR} xf tedPackage/TedBindist.tar
55 57
56post-patch: 58post-patch:
57 @cd ${WRKSRC}/Ted ; \ 59 @cd ${WRKSRC}/Ted ; \
58 ${SED} -e "s!Ted.afmDirectory:.*!Ted.afmDirectory:${AFMDIR}!g" \ 60 ${SED} -e "s!Ted.afmDirectory:.*!Ted.afmDirectory:${AFMDIR}!g" \
59 -e "s!Ted.spellToolSystemDicts:.*!Ted.spellToolSystemDicts:${INDDIR}!g" \ 61 -e "s!Ted.spellToolSystemDicts:.*!Ted.spellToolSystemDicts:${INDDIR}!g" \
60 -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" \
61 Ted.ad.sample > Ted.ad 63 Ted.ad.sample > Ted.ad
62 64
63do-install: 65do-install:
64 ${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${DESTDIR}${PREFIX}/bin/Ted 66 ${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${DESTDIR}${PREFIX}/bin/Ted
65 ${INSTALL_DATA} ${WRKSRC}/Ted/afm/*.afm ${DESTDIR}${AFMDIR} 67 ${INSTALL_DATA} ${WRKSRC}/Ted/afm/*.afm ${DESTDIR}${AFMDIR}
66 ${INSTALL_DATA} ${FILESDIR}/README.ind ${DESTDIR}${INDDIR} 68 ${INSTALL_DATA} ${FILESDIR}/README.ind ${DESTDIR}${INDDIR}
67 ${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${DESTDIR}${INFODIR} 69 ${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${DESTDIR}${INFODIR}
68 ${INSTALL_DATA} ${WRKSRC}/Ted/Ted.ad \ 70 ${INSTALL_DATA} ${WRKSRC}/Ted/Ted.ad \
69 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ted 71 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ted
70 72
71.include "../../devel/pcre/buildlink3.mk" 73.include "../../devel/pcre/buildlink3.mk"
72.include "../../devel/zlib/buildlink3.mk" 74.include "../../devel/zlib/buildlink3.mk"
73.include "../../mk/jpeg.buildlink3.mk" 75.include "../../mk/jpeg.buildlink3.mk"
74.include "../../graphics/png/buildlink3.mk" 76.include "../../graphics/png/buildlink3.mk"
75.include "../../graphics/tiff/buildlink3.mk" 77.include "../../graphics/tiff/buildlink3.mk"
76.include "../../x11/libXpm/buildlink3.mk" 78.include "../../x11/libXpm/buildlink3.mk"
77.include "../../mk/motif.buildlink3.mk" 79.include "../../mk/motif.buildlink3.mk"
78 80
79.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"