[Midnightbsd-cvs] mports: Makefile: Fix the xorg-drivers bug with the meta-port.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Tue Oct 16 20:04:43 EDT 2007


Log Message:
-----------
Fix the xorg-drivers bug with the meta-port.  xorg-drivers needs to run make config to know its dependancies.  However, make package ran before that happened, putting the wrong dependancies into the xorg package.  Moved all the depends to build time depends.

Modified Files:
--------------
    mports/x11/xorg:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/xorg/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lx11/xorg/Makefile -Lx11/xorg/Makefile -u -r1.4 -r1.5
--- x11/xorg/Makefile
+++ x11/xorg/Makefile
@@ -19,17 +19,17 @@
 
 NO_BUILD=	yes
 
-RUN_DEPENDS+=	${LOCALBASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri
+BUILD_DEPENDS+=	${LOCALBASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri
 
 # data
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
 		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
 
 # doc
-RUN_DEPENDS+=	${LOCALBASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs
+BUILD_DEPENDS+=	${LOCALBASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs
 
 # app, lib, font, driver, proto
-RUN_DEPENDS+=	${LOCALBASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \
 		${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
 		${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \
 		${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \
@@ -37,7 +37,7 @@
 		${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 
 .if defined(XORG_COMPLETE)
-RUN_DEPENDS+=	Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
+BUILD_DEPENDS+=	Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
 		Xdmx:${PORTSDIR}/x11-servers/xorg-dmx \
 		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
 .endif


More information about the Midnightbsd-cvs mailing list