summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-clients/Makefile6
-rw-r--r--x11/XFree86-4-documents/Makefile7
-rw-r--r--x11/XFree86-4-libraries/Makefile3
-rw-r--r--x11/XFree86-4-manuals/Makefile7
-rw-r--r--x11/XFree86-4/Makefile6
-rw-r--r--x11/XFree86-contrib/Makefile2
-rw-r--r--x11/XFree86/Makefile4
-rw-r--r--x11/dgs/Makefile2
-rw-r--r--x11/emu/Makefile10
-rw-r--r--x11/gdkxft/Makefile2
-rw-r--r--x11/kde4-baseapps/Makefile2
-rw-r--r--x11/kde4-runtime/Makefile2
-rw-r--r--x11/kde4-workspace/Makefile2
-rw-r--r--x11/kdebase3/Makefile2
-rw-r--r--x11/kdebase4-runtime/Makefile2
-rw-r--r--x11/kdebase4-workspace/Makefile2
-rw-r--r--x11/kdebase4/Makefile2
-rw-r--r--x11/kdelibs3/Makefile6
-rw-r--r--x11/kdelibs4/Makefile6
-rw-r--r--x11/mlterm/Makefile2
-rw-r--r--x11/wrapper/Makefile6
-rw-r--r--x11/x3270/Makefile12
-rw-r--r--x11/xgrab/Makefile9
-rw-r--r--x11/xlockmore/Makefile2
-rw-r--r--x11/xorg-clients/Makefile6
-rw-r--r--x11/xorg-libraries/Makefile4
-rw-r--r--x11/xorg/Makefile7
-rw-r--r--x11/xvattr/Makefile4
28 files changed, 77 insertions, 50 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 0d2f9a4c..818c614 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -74,5 +74,11 @@ post-install:
.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+
.include "${FILESDIR}/manpages"
+
.include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 694cb69..1bde9b2 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -17,7 +17,6 @@ DISTFILES= X430src-1.tgz \
MAINTAINER= x11@FreeBSD.org
COMMENT= XFree86-4 documentation
-XFREE86_VERSION= 4
USE_IMAKE= YES
PROJECTROOT= -DProjectRoot=${PREFIX}
DIST_SUBDIR= xc
@@ -36,4 +35,8 @@ do-configure:
${MAKE} includes ; \
${MAKE} depend)
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 2422d61..599518c 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -60,6 +60,9 @@ DebuggableLibraries?= NO
.include "Makefile.inc"
.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
# BuildXF86DRI is false for FreeBSD < 4.1
.if ${OSVERSION} < 410000
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 9cf48d4..065d593 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -18,7 +18,6 @@ COMMENT= XFree86-4 man pages
CONFLICTS= xorg-manpages-*
-XFREE86_VERSION= 4
USE_IMAKE= YES
EXTRACT_TARGET= xc/doc/man \
xc/extras/ogl-sample/main/doc/man
@@ -37,5 +36,11 @@ do-configure:
${MAKE} depend)
.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+
.include "${FILESDIR}/manpages"
+
.include <bsd.port.post.mk>
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 0f9d8a2..595b13a 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -50,4 +50,8 @@ DEPENDS_TARGET="package"
do-install: # empty
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11/XFree86-contrib/Makefile b/x11/XFree86-contrib/Makefile
index 8d149ae..4f00a0b 100644
--- a/x11/XFree86-contrib/Makefile
+++ b/x11/XFree86-contrib/Makefile
@@ -28,7 +28,7 @@ MAN1= ico.1 listres.1 showfont.1 viewres.1 xbiff.1 xcalc.1 \
.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} != 3
+.if ${X_WINDOW_SYSTEM:L} != xfree86-3
IGNORE= "Only for XFree86 version 3"
.endif
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 28e021b..6aff6a5 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -86,6 +86,10 @@ post-extract:
.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-3
+IGNORE= is part of XFree86-3
+.endif
+
.if !defined(BUILD_XDIST) && !exists(${FILESDIR}/config)
IS_INTERACTIVE= yes # configure script asks questions
.endif
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index f21468f..73bf612 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -37,7 +37,7 @@ MANN= dpsexec.man makepsres.man xepsf.man
.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} > 3
+.if ${X_WINDOW_SYSTEM:L} != xfree86-3
IGNORE= "is included in XFree86 4.x and above"
.endif
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index f59055e..409f3a9 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -18,14 +18,6 @@ COMMENT= A terminal emulator for the X Window System
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/emu
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS+= xmkmf:${PORTSDIR}/x11/XFree86-4
-.else
-BUILD_DEPENDS+= xmkmf:${PORTSDIR}/x11/XFree86
-.endif
-
.if !defined(DISPLAY) || ${DISPLAY} == ""
IGNORE= Requires an active X session (and DISPLAY variable) to run xrdb. Please compile this while running X.
.endif
@@ -35,4 +27,4 @@ MAN1= emu.1
pre-configure:
cd ${WRKSRC}/client ; ${LN} -s ../doc/emu.man .
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index bf784f3..f743daf 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -33,7 +33,7 @@ MAN8= gdkxft_sysinstall.8
.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} < 4
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
IGNORE= "requires XFree86-4.x or later to run"
.endif
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 67c989a..db61c6e 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient
USE_KDELIBS_VER=3
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 67c989a..db61c6e 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient
USE_KDELIBS_VER=3
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 67c989a..db61c6e 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient
USE_KDELIBS_VER=3
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 67c989a..db61c6e 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient
USE_KDELIBS_VER=3
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 67c989a..db61c6e 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient
USE_KDELIBS_VER=3
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 67c989a..db61c6e 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient
USE_KDELIBS_VER=3
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 67c989a..db61c6e 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient
USE_KDELIBS_VER=3
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 2d4b2dc..3415a7e 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -19,7 +19,7 @@ COMMENT= Base set of libraries needed by KDE programs
CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.*
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
artsc.0:${PORTSDIR}/audio/arts \
cups.2:${PORTSDIR}/print/cups-base \
@@ -30,8 +30,8 @@ LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
xml2.5:${PORTSDIR}/textproc/libxml2 \
xslt.2:${PORTSDIR}/textproc/libxslt \
pcre.0:${PORTSDIR}/devel/pcre
-RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
- ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
+ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
USE_GETTEXT= yes
USE_QT_VER= 3
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 2d4b2dc..3415a7e 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -19,7 +19,7 @@ COMMENT= Base set of libraries needed by KDE programs
CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.*
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
artsc.0:${PORTSDIR}/audio/arts \
cups.2:${PORTSDIR}/print/cups-base \
@@ -30,8 +30,8 @@ LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
xml2.5:${PORTSDIR}/textproc/libxml2 \
xslt.2:${PORTSDIR}/textproc/libxslt \
pcre.0:${PORTSDIR}/devel/pcre
-RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
- ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
+ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
USE_GETTEXT= yes
USE_QT_VER= 3
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 34dafa2..0a7647a 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -32,7 +32,7 @@ MAN1= mlterm.1 mlclient.1
.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} == 3
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
PKGNAMESUFFIX= -noaa
.else
CONFIGURE_ARGS+= --enable-anti-alias
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
index 0e97505..0e66b66 100644
--- a/x11/wrapper/Makefile
+++ b/x11/wrapper/Makefile
@@ -30,4 +30,8 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper-4 ${PREFIX}/bin
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 3331f72..be99f70 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -14,14 +14,10 @@ MASTER_SITE_SUBDIR= applications
MAINTAINER= Yonatan@xpert.com
COMMENT= 3270 Terminal emulator
-USE_IMAKE= yes
-
-.include <bsd.port.pre.mk>
+BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
+USE_IMAKE= yes
WRKSRC= ${WRKDIR}/x3270-3.1.1
MAN1= x3270.1 x3270if.1 x3270-script.1 ibm_hosts.1
@@ -47,4 +43,4 @@ post-configure:
-e 's,%%CC%%,${CC},' \
${WRKSRC}/Makefile
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 6dcbd44..503a0f7 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -17,14 +17,11 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= jmz@FreeBSD.org
COMMENT= An X11 image grabber
+BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT}
+
USE_X_PREFIX= yes
USE_IMAKE= yes
-.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
# "make depend" blows up
@@ -36,4 +33,4 @@ IGNORE= Requires an active X session (and DISPLAY variable) to run xrdb. Pleas
MAN1= xgrab.1 xgrabsc.1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 99cce7b..45a8735 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -65,7 +65,7 @@ CONFIGURE_ENV+= XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}"
CONFIGURE_ARGS+= --disable-allow-root
.endif
-.if ${XFREE86_VERSION} >= 4
+.if ${X_WINDOW_SYSTEM:L} != xfree86-3
post-configure:
${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile
.endif
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 67ee40b..835834a 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -59,5 +59,11 @@ post-install:
.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+
.include "${FILESDIR}/manpages"
+
.include <bsd.port.post.mk>
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 470f61b..b9d0c8b 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -57,6 +57,10 @@ post-install:
.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
# BuildXF86DRI is false for FreeBSD < 4.1
.if ${OSVERSION} < 410000
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 0623a927..2b5707c 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -7,7 +7,6 @@
PORTNAME= xorg
PORTVERSION= 6.7.0
-PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
@@ -54,4 +53,8 @@ DEPENDS_TARGET="package"
do-install: # empty
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index b2dc649..ce8f278 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -26,8 +26,8 @@ MAN1= xvattr.1
.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} == 3
-IGNORE= "Require Xv Extension"
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
+IGNORE= "Requires Xv Extension"
.endif
.include <bsd.port.post.mk>
OpenPOWER on IntegriCloud