- Remove support for xfree86-3

PR:		ports/106666
Submitted by:	vd
With hat:	portmgr

6 files changed, 8 insertions, 67 deletions

diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 68db8d99cd0a..4a605488d72e 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -45,19 +45,10 @@ pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|manm|mann|g'
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-4
-INSTALLDIRS+=	DPS/clients/makepsres DPS/demos/texteroids
-MANN+=		makepsres.man
-.endif
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PLIST_SUB+=	WITH_XORG=""
-PLIST_SUB+=	WITH_XFREE4=""
-.else
-PLIST_SUB+=	WITH_XORG="@comment "
-
 .if ${X_WINDOW_SYSTEM:L} == xorg
-INSTALLDIRS+=	DPS/lib/dpstk DPS/lib/psres DPS/clients/pswrap
+INSTALLDIRS+=	DPS/clients/makepsres DPS/clients/pswrap DPS/demos/texteroids \
+		DPS/lib/dpstk
+MANN+=		makepsres.man
 PLIST_SUB+=	WITH_XFREE4=""
 .else
 PLIST_SUB+=	WITH_XFREE4="@comment "
@@ -73,6 +64,4 @@ do-install:
 		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endfor
 
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11/dgs/pkg-plist b/x11/dgs/pkg-plist
index 14ac52bdf239..d92e10bc038f 100644
--- a/x11/dgs/pkg-plist
+++ b/x11/dgs/pkg-plist
@@ -6,36 +6,6 @@ bin/dpsnx.agent
 %%WITH_XFREE4%%bin/pswrap
 %%WITH_XFREE4%%bin/texteroids
 bin/xepsf
-%%WITH_XORG%%include/DPS/ColorSB.h
-%%WITH_XORG%%include/DPS/ColorSBP.h
-%%WITH_XORG%%include/DPS/DPSScrollW.h
-%%WITH_XORG%%include/DPS/DPSScrollWP.h
-%%WITH_XORG%%include/DPS/FontCreatP.h
-%%WITH_XORG%%include/DPS/FontCreato.h
-%%WITH_XORG%%include/DPS/FontSB.h
-%%WITH_XORG%%include/DPS/FontSBP.h
-%%WITH_XORG%%include/DPS/FontSamplP.h
-%%WITH_XORG%%include/DPS/FontSample.h
-%%WITH_XORG%%include/DPS/PSres.h
-%%WITH_XORG%%include/DPS/XDPS.h
-%%WITH_XORG%%include/DPS/XDPSlib.h
-%%WITH_XORG%%include/DPS/XDPSproto.h
-%%WITH_XORG%%include/DPS/dpsNXargs.h
-%%WITH_XORG%%include/DPS/dpsXclient.h
-%%WITH_XORG%%include/DPS/dpsXcommon.h
-%%WITH_XORG%%include/DPS/dpsXpreview.h
-%%WITH_XORG%%include/DPS/dpsXshare.h
-%%WITH_XORG%%include/DPS/dpsXuserpath.h
-%%WITH_XORG%%include/DPS/dpsclient.h
-%%WITH_XORG%%include/DPS/dpsconfig.h
-%%WITH_XORG%%include/DPS/dpsexcept.h
-%%WITH_XORG%%include/DPS/dpsfriends.h
-%%WITH_XORG%%include/DPS/dpsops.h
-%%WITH_XORG%%include/DPS/psops.h
-%%WITH_XORG%%lib/libdps.a
-%%WITH_XORG%%lib/libdps.la
-%%WITH_XORG%%lib/libdps.so
-%%WITH_XORG%%lib/libdps.so.0
 %%WITH_XFREE4%%lib/libdpstk.a
 %%WITH_XFREE4%%lib/libdpstk.la
 %%WITH_XFREE4%%lib/libdpstk.so
@@ -114,7 +84,6 @@ share/ghostscript/5.50/gs_typ32.ps
 share/ghostscript/5.50/gs_typ42.ps
 share/ghostscript/5.50/gs_type1.ps
 share/ghostscript/5.50/gs_wan_e.ps
-%%WITH_XORG%%@dirrm include/DPS
 @dirrmtry share/ghostscript/5.50/doc
 @dirrmtry share/ghostscript/5.50/examples
 @dirrmtry share/ghostscript/5.50
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 25af64c5fb51..aedf75af2e2c 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -33,10 +33,6 @@ MAN8=		gdkxft_sysinstall.8
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-IGNORE=		"requires XFree86-4.x or later to run"
-.endif
-
 .if ${HAVE_GNOME:Mlibglade}!="" && ${HAVE_GNOME:Mlibcapplet}!=""
 USE_GNOME+=	gnomeprefix libglade libcapplet
 PKGNAMESUFFIX=	-gnome
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 2b47ae01f044..68ab4c820836 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -14,13 +14,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Multilingual X11 terminal emulator
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 lthack
 USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	configure kiklib/configure mkf/configure
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--with-imagelib=gdk-pixbuf --enable-utmp \
-		--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig"
+		--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig" \
+		--with-type-engines="xcore,xft"
 CONFIGURE_ENV=	LIBS=-L${LOCALBASE}/lib CFLAGS=-I${LOCALBASE}/include
 
 OPTIONS=	FRIBIDI	"Use Fribidi for BiDi rendering" off \
@@ -86,14 +89,6 @@ INSTALLS_SHLIB=	yes
 
 MAN1=	mlterm.1 mlclient.1
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PKGNAMESUFFIX=	-noaa
-CONFIGURE_ARGS+=	--with-type-engines=xcore
-.else
-CONFIGURE_ARGS+=	--with-type-engines="xcore,xft"
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-.endif
-
 post-configure:
 	@${CP} ${LIBTOOL} ${WRKSRC}
 	@${REINPLACE_CMD} -e "s,@CGI_BIN@,${PREFIX}/libexec/w3mmlconfig," \
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index d9fdc4a38732..4ab2ffce6945 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -105,9 +105,7 @@ pre-extract:
 .endif
 
 post-configure:
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 	${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile
-.endif
 
 PLIST_FILES=	bin/xlock lib/X11/app-defaults/XLock
 
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index fb67e3827f70..2012ae63b5c4 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -24,10 +24,4 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		xvattr.1
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-IGNORE=		requires Xv Extension
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>