diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
| commit | d26cf36e5784f5b648404b8d68c21adb4398f33f (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /editors | |
| parent | 6432f76116c5a27e6f554145314e47d93eeec7a9 (diff) | |
| download | pkgsrc-d26cf36e5784f5b648404b8d68c21adb4398f33f.tar.gz | |
- fine grained X11 dependencies for packages which have either USE_IMAKE
or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
C++ for compilation without including the proper headers
Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/cooledit/Makefile | 3 | ||||
| -rw-r--r-- | editors/sam/Makefile | 3 | ||||
| -rw-r--r-- | editors/ted/Makefile | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index 9ad243b9a2f..b8adc475c53 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:54 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2006/12/27 13:37:36 joerg Exp $ DISTNAME= cooledit-3.17.17 PKGREVISION= 2 @@ -25,5 +25,6 @@ post-configure: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/sam/Makefile b/editors/sam/Makefile index 7182aa7745a..346b3b61a86 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/03/04 21:29:32 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2006/12/27 13:37:36 joerg Exp $ DISTNAME= sam PKGNAME= sam-4.3 @@ -36,4 +36,5 @@ do-build: done .endif # SunOS +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/ted/Makefile b/editors/ted/Makefile index 0fbcbfc0f3d..a8e54cf234b 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:54 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/12/27 13:37:36 joerg Exp $ DISTNAME= ted-2.16.src PKGNAME= ted-2.16 @@ -30,8 +30,8 @@ CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include" CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib" CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include" CONFIGURE_ENV+= ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib" -CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.xpm}/include" -CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.xpm}/lib" +CONFIGURE_ENV+= ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include" +CONFIGURE_ENV+= ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib" CONFIGURE_ENV+= ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include" CONFIGURE_ENV+= ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib" |