Thu Jul 12 17:10:21 2012 UTC ()
editors/ted: Fix DragonFly indirect linking error


(marino)
diff -r1.49 -r1.50 pkgsrc/editors/ted/Makefile
cvs diff -r1.49 -r1.50 pkgsrc/editors/ted/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/ted/Makefile 2012/03/03 00:13:01 1.49
+++ pkgsrc/editors/ted/Makefile 2012/07/12 17:10:21 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.49 2012/03/03 00:13:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.50 2012/07/12 17:10:21 marino Exp $
2 2
3DISTNAME= ted-2.21.src 3DISTNAME= ted-2.21.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
5PKGREVISION= 5 5PKGREVISION= 5
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
@@ -28,26 +28,27 @@ CONFIGURE_ENV+= ac_jpeg_includes="${JPEG @@ -28,26 +28,27 @@ CONFIGURE_ENV+= ac_jpeg_includes="${JPEG
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 40LDFLAGS.SunOS+= -liconv
 41LDFLAGS.DragonFly+= -lXft -lfontconfig
41 42
42MAKE_FLAGS+= CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-MOTIF 43MAKE_FLAGS+= CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-MOTIF
43 44
44MAKE_ENV+= ${CONFIGURE_ENV} 45MAKE_ENV+= ${CONFIGURE_ENV}
45MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \ 46MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \
46 DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \ 47 DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \
47 DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \ 48 DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \
48 DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"' 49 DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"'
49 50
50BUILD_TARGET= compile.shared 51BUILD_TARGET= compile.shared
51INSTALL_TARGET= install.shared 52INSTALL_TARGET= install.shared
52 53
53INSTALLATION_DIRS= bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR} 54INSTALLATION_DIRS= bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR}