diff options
author | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
commit | b28533fe59c3ed8a07d089eec0ddb72591404098 (patch) | |
tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /graphics | |
parent | bf64c938460d5b59db13b14b1c0631ed2167b7e6 (diff) | |
download | pkgsrc-b28533fe59c3ed8a07d089eec0ddb72591404098.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 'graphics')
-rw-r--r-- | graphics/MesaDemos/Makefile | 5 | ||||
-rw-r--r-- | graphics/glut/buildlink3.mk | 3 | ||||
-rw-r--r-- | graphics/gtkglext/Makefile | 5 | ||||
-rw-r--r-- | graphics/plotmtv/Makefile | 4 | ||||
-rw-r--r-- | graphics/tgif/Makefile | 4 | ||||
-rw-r--r-- | graphics/viewfax/Makefile | 4 | ||||
-rw-r--r-- | graphics/wmphoto/Makefile | 4 | ||||
-rw-r--r-- | graphics/xart/Makefile | 5 | ||||
-rw-r--r-- | graphics/xbmbrowser/Makefile | 5 | ||||
-rw-r--r-- | graphics/xgraph/Makefile | 4 | ||||
-rw-r--r-- | graphics/xli/Makefile | 5 | ||||
-rw-r--r-- | graphics/xpaint/Makefile | 4 | ||||
-rw-r--r-- | graphics/xpm/Makefile | 5 | ||||
-rw-r--r-- | graphics/xv/Makefile | 6 |
14 files changed, 48 insertions, 15 deletions
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index c94f6475f81..1337e7ea21b 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/10/09 12:52:35 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2006/12/27 13:37:38 joerg Exp $ PKGNAME= MesaDemos-${MESA_VERSION} COMMENT= OpenGL examples and Demos @@ -32,4 +32,7 @@ do-install: -rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV} +.include "../../x11/libXi/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index d449e2e72bb..1c9218b1ee5 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2006/12/27 13:37:38 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+ @@ -18,5 +18,6 @@ BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut .endif # GLUT_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index faba310cbe9..7f947c3ec00 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/08/10 17:44:11 drochner Exp $ +# $NetBSD: Makefile,v 1.35 2006/12/27 13:37:38 joerg Exp $ DISTNAME= gtkglext-1.2.0 PKGREVISION= 2 @@ -19,8 +19,11 @@ PKGCONFIG_OVERRIDE= gdkglext.pc.in PKGCONFIG_OVERRIDE+= gtkglext.pc.in LIBS+= -lm +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/pango/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile index cb9daf75560..f8b00fd25cc 100644 --- a/graphics/plotmtv/Makefile +++ b/graphics/plotmtv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:51 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:38 joerg Exp $ DISTNAME= Plotmtv1.4.1 PKGNAME= plotmtv-1.4.1 @@ -22,4 +22,6 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/Tests/run.sh ${WRKSRC}/Tests/run.csh \ ${PREFIX}/share/examples/plotmtv +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile index efb0a37ef0a..3b688dd7e63 100644 --- a/graphics/tgif/Makefile +++ b/graphics/tgif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2006/10/04 21:44:47 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= tgif-4.1.45 @@ -26,6 +26,8 @@ post-patch:: @${CP} ${OS_TEMPLATE} ${WRKSRC}/Tgif.tmpl .include "../../graphics/jpeg/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/viewfax/Makefile b/graphics/viewfax/Makefile index f523956eaa9..5d0daf88554 100644 --- a/graphics/viewfax/Makefile +++ b/graphics/viewfax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:40 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= viewfax-2.4 @@ -20,4 +20,6 @@ USE_IMAKE= yes pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/libdata/viewfax +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile index 365cce5068d..040da49f401 100644 --- a/graphics/wmphoto/Makefile +++ b/graphics/wmphoto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= wmphoto-0.3a @@ -20,5 +20,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmphoto ${INSTALL_DATA} ${WRKSRC}/HINTS ${PREFIX}/share/doc/wmphoto +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile index 6698e2636ba..3c9de007ead 100644 --- a/graphics/xart/Makefile +++ b/graphics/xart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= xart19980415 @@ -22,5 +22,8 @@ post-extract: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index f68cf5d423a..2896a275725 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xbmbrowser5.1 PKGNAME= xbmbrowser-5.1 @@ -12,5 +12,8 @@ COMMENT= View complete directories of X bitmaps and X pixmaps USE_TOOLS+= gmake USE_IMAKE= YES +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xgraph/Makefile b/graphics/xgraph/Makefile index 6674ebe46d1..42429134e65 100644 --- a/graphics/xgraph/Makefile +++ b/graphics/xgraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/09/03 00:56:29 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= xgraph-11.3.2-hack.9 @@ -12,4 +12,6 @@ COMMENT= Tool to draw a graph on an X11 display USE_IMAKE= yes +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 7dc152ec450..bccfc80e908 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/04/17 13:46:36 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xli-2005-02-27 PKGNAME= xli-1.17.0 @@ -15,4 +15,7 @@ INSTALLATION_DIRS+= lib/X11/app-defaults .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index a6926649723..9d0f963c9bd 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.57 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xpaint-2.7.8.1 PKGREVISION= 2 @@ -20,7 +20,7 @@ SUBST_FILES.foo= Local.config configure SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" \ -e "s|@PREFIX@|${PREFIX}|g" \ -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" \ - -e "s|@XPMDIR@|${BUILDLINK_PREFIX.xpm}|g" + -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g" pre-configure: cd ${WRKSRC} && ./configure xaw3dg diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index ce6d49bc7df..88fe7131620 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2006/12/18 10:13:38 joerg Exp $ +# $NetBSD: Makefile,v 1.53 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xpm-3.4k PKGREVISION= 7 @@ -45,4 +45,7 @@ post-install: .endif +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index be33a992b63..bdd9cd1cfc2 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2006/09/09 02:42:02 obache Exp $ +# $NetBSD: Makefile,v 1.67 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xv-3.10a PKGREVISION= 12 @@ -51,6 +51,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |