Fri Sep 11 12:55:44 2009 UTC ()
Pass down X11BASE/lib explicitly to avoid empty rpath options


(joerg)
diff -r1.35 -r1.36 pkgsrc/editors/ted/Makefile
cvs diff -r1.35 -r1.36 pkgsrc/editors/ted/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/ted/Makefile 2009/08/26 19:57:26 1.35
+++ pkgsrc/editors/ted/Makefile 2009/09/11 12:55:44 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.35 2009/08/26 19:57:26 sno Exp $ 1# $NetBSD: Makefile,v 1.36 2009/09/11 12:55:44 joerg Exp $
2 2
3DISTNAME= ted-2.16.src 3DISTNAME= ted-2.16.src
4PKGNAME= ted-2.16 4PKGNAME= ted-2.16
5PKGREVISION= 6 5PKGREVISION= 6
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
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -25,26 +25,28 @@ INFODIR= ${PREFIX}/share/doc/Ted @@ -25,26 +25,28 @@ INFODIR= ${PREFIX}/share/doc/Ted
25CONFIGURE_ENV+= ac_jpeg_includes="${BUILDLINK_PREFIX.jpeg}/include" 25CONFIGURE_ENV+= ac_jpeg_includes="${BUILDLINK_PREFIX.jpeg}/include"
26CONFIGURE_ENV+= ac_jpeg_libraries="${BUILDLINK_PREFIX.jpeg}/lib" 26CONFIGURE_ENV+= ac_jpeg_libraries="${BUILDLINK_PREFIX.jpeg}/lib"
27CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include" 27CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include"
28CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib" 28CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
29CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include" 29CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
30CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib" 30CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib"
31CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include" 31CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include"
32CONFIGURE_ENV+= ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib" 32CONFIGURE_ENV+= ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib"
33CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include" 33CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include"
34CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib" 34CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib"
35CONFIGURE_ENV+= ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include" 35CONFIGURE_ENV+= ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include"
36CONFIGURE_ENV+= ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib" 36CONFIGURE_ENV+= ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib"
37 37
 38MAKE_FLAGS+= CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-motif
 39
38MAKE_ENV+= ${CONFIGURE_ENV} 40MAKE_ENV+= ${CONFIGURE_ENV}
39MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \ 41MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \
40 DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \ 42 DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \
41 DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \ 43 DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \
42 DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"' 44 DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"'
43 45
44BUILD_TARGET= compile.shared 46BUILD_TARGET= compile.shared
45INSTALL_TARGET= install.shared 47INSTALL_TARGET= install.shared
46 48
47INSTALLATION_DIRS= bin lib/X11/app-defaults 49INSTALLATION_DIRS= bin lib/X11/app-defaults
48 50
49post-extract: 51post-extract:
50 @cd ${WRKSRC} ; ${GTAR} xf tedPackage/TedBindist.tar 52 @cd ${WRKSRC} ; ${GTAR} xf tedPackage/TedBindist.tar