[Midnightbsd-cvs] mports: bsd.mport.mk: Since we only support xorg, why the hell bother
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Apr 14 01:52:24 EDT 2008
Log Message:
-----------
Since we only support xorg, why the hell bother with testing for it!
Modified Files:
--------------
mports/Mk:
bsd.mport.mk (r1.90 -> r1.91)
-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.90
retrieving revision 1.91
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.90 -r1.91
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -1448,10 +1448,6 @@
.endif
.endif
-# We only support xorg.
-X_WINDOW_SYSTEM ?= xorg
-
-
#
# One of the includes may have changed CPIO
#
@@ -1751,7 +1747,6 @@
LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype
.endif
-.if defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xorg
X_IMAKE_PORT= ${PORTSDIR}/devel/imake
X_LIBRARIES_PORT= ${PORTSDIR}/x11/xorg-libraries
X_CLIENTS_PORT= ${PORTSDIR}/x11/xorg-apps
@@ -1769,9 +1764,6 @@
X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1
X_FONTS_ALIAS_PORT= ${PORTSDIR}/x11-fonts/font-alias
X_MANUALS_PORT= ${PORTSDIR}/x11/xorg-manpages
-.else
-IGNORE= cannot install: bad X_WINDOW_SYSTEM setting; valid values are 'xorg'
-.endif
.if defined(USE_IMAKE)
BUILD_DEPENDS+= imake:${X_IMAKE_PORT} \
@@ -1784,12 +1776,8 @@
. if defined(USE_LINUX)
RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs
. else
-. if ${X_WINDOW_SYSTEM:L} == xorg
BUILD_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
RUN_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
-. else
-LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT}
-. endif
. endif
.endif
@@ -1843,9 +1831,7 @@
.endif
.if defined(USE_XORG) || defined(XORG_CAT)
-. if ${X_WINDOW_SYSTEM} == "xorg"
.include "${PORTSDIR}/Mk/bsd.xorg.mk"
-. endif
.endif
.if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
More information about the Midnightbsd-cvs
mailing list