Index: head/astro/xephem/Makefile
===================================================================
--- head/astro/xephem/Makefile	(revision 513045)
+++ head/astro/xephem/Makefile	(revision 513046)
@@ -1,67 +1,69 @@
 # Created by: erich@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	xephem
 PORTVERSION=	3.7.7
 PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	http://www.clearskyinstitute.com/xephem/
 
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Interactive astronomical ephemeris program
 
+DEPRECATED=	Depends on deprecated libXp
+
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		gmake groff jpeg motif tar:tgz ssl
+USES=		gmake groff jpeg motif tar:tgz ssl xorg
 USE_XORG=	xp xt xext xmu x11 xft
 
 LDFLAGS+=	-lfontconfig
 
 MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 
 RESTRICTED=	Personal use only
 
 # XXX needs to be the same as DISTFILES
 XEPHEMSRC=	${PORTNAME}-${PORTVERSION}.tgz
 
 .include <bsd.port.pre.mk>
 
 .for file in ${XEPHEMSRC}
 .if !exists(${DISTDIR}/${file})
 IGNORE=	because of licensing restrictions, you must manually fetch ${file}\
 	from http://www.clearskyinstitute.com/xephem/,\
 	place it in ${DISTDIR} and then run make again
 .endif
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/Makefile
 	@${FIND} ${WRKSRC}/../.. -name Makefile -type f | \
 		${XARGS} ${REINPLACE_CMD} -e 's|CC = gcc|CC?= ${CC}|g ; \
 		s|CFLAGS =|CFLAGS+=|g ; \
 		s|LDFLAGS =|LDFLAGS+=|g ; \
 		s|-O2 ||g'
 
 pre-build:
 	@${ECHO_CMD} 'XEphem.ShareDir: ${PREFIX}/lib/X11/xephem' \
 		> ${WRKSRC}/XEphem.ad
 
 pre-install:
 	@${FIND} ${WRKSRC}/../.. -name Makefile.bak -type f -delete
 	@${CP} ${WRKSRC}/xephem.man ${STAGEDIR}${PREFIX}/man/man1/xephem.1
 	@${FIND} ${WRKSRC} -name "*.pl" -exec ${SED} -i "" -e 's|/usr/bin/perl|/usr/local/bin/perl|' {} \;
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xephem ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XEphem.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XEphem
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xephem
 	@cd ${WRKSRC}; ${COPYTREE_SHARE} \
 		"auxil catalogs fifos fits gallery help lo" \
 		${STAGEDIR}${PREFIX}/lib/X11/xephem
 
 .include <bsd.port.post.mk>
Index: head/audio/xmcd/Makefile
===================================================================
--- head/audio/xmcd/Makefile	(revision 513045)
+++ head/audio/xmcd/Makefile	(revision 513046)
@@ -1,75 +1,77 @@
 # Created by: Gennady Sorokopud <gena@NetVision.net.il>
 # $FreeBSD$
 
 PORTNAME=	xmcd
 PORTVERSION=	3.3.2
 PORTREVISION=	19
 CATEGORIES=	audio
 MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Motif CD player
 
+DEPRECATED=	Depends on deprecated libXp
+
 LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
 		libFLAC.so:audio/flac
 RUN_DEPENDS+=	lame:audio/lame
 
-USES=		imake motif ncurses
+USES=		imake motif ncurses xorg
 USE_XORG=	x11 xext xaw xmu xp xpm xt sm ice
 PLIST_SUB+=	RELEASE=${OSREL:R:R} ARCH=${ARCH:S/powerpc64/powerpc/} OPSYS=${OPSYS}
 SUB_FILES=	pkg-message
 
 CFLAGS+=	-D_WANT_SEMUN
 
 LIBBINDIR=	${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/powerpc64/powerpc/}
 
 BROKEN_aarch64=		Fails to compile: many undefined symbols in xorg.cf
 BROKEN_armv6=		Fails to install: strip: xmcd/bin-FreeBSD_12-armv6/cda failed: No such file or directory
 BROKEN_armv7=		Fails to install: strip: xmcd/bin-FreeBSD_12-armv7/cda failed: No such file or directory
 BROKEN_mips64=		Fails to compile: many undefined symbols in xorg.cf
 
 pre-patch:
 	@${CP} ${WRKSRC}/xmcd_d/XMcd.ad ${WRKSRC}/xmcd_d/XMcd.ad.in
 
 post-patch:
 	@${SED} -e "s;@PREFIX@;${STAGDIR}${PREFIX};g" ${WRKSRC}/xmcd_d/XMcd.ad.in \
 		> ${WRKSRC}/xmcd_d/XMcd.ad
 
 post-configure:
 	@${REINPLACE_CMD} \
 		-e 's: BINDIR .*:BINDIR=${STAGEDIR}${PREFIX}/bin:' \
 		-e 's: LIBDIR .*:LIBDIR=${STAGEDIR}${PREFIX}/lib/X11:' \
 		-e 's: MANDIR .*:MANDIR=${STAGEDIR}${PREFIX}/man/man1:' \
 		-e 's: MANSUFFIX .*:MANSUFFIX=1:' \
 		-e 's/^Makefile::/^Makefile:/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} \
 		-e 's/^XBINPERM=4711/XBINPERM=711/' \
 		-e "s/^(id \| fgrep 'uid=0(root)')/true/" >/dev/null 2>&1 \
 		${WRKSRC}/install.sh
 
 post-install:
 	${STRIP_CMD} ${LIBBINDIR}/cda ${LIBBINDIR}/gobrowser \
 		${LIBBINDIR}/has_alsa ${LIBBINDIR}/xmcd
 	${INSTALL_DATA} ${WRKSRC}/xmcd_d/XMcd.ad \
 		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XMcd
 	${RM} ${STAGEDIR}${PREFIX}/bin/xmcd
 	${RM} ${STAGEDIR}${PREFIX}/bin/cda
 	${LN} -sf .xmcd_start ${STAGEDIR}${PREFIX}/bin/xmcd
 	${LN} -sf .xmcd_start ${STAGEDIR}${PREFIX}/bin/cda
 	${REINPLACE_CMD} \
 		-e 's:^BINDIR=.*:XMCDLIB=${PREFIX}/bin:' \
 		-e 's:^XMCDLIB=.*:XMCDLIB=${PREFIX}/lib/X11/xmcd:' \
 		-e 's:^DISCOGDIR=.*:DISCOGDIR=${PREFIX}/lib/X11/xmcd/discog:' \
 		-e 's:XMCD_LIBDIR=.*:XMCD_LIBDIR=${PREFIX}/lib/X11/xmcd:' \
 		${STAGEDIR}${PREFIX}/lib/X11/xmcd/scripts/genidx \
 		${STAGEDIR}${PREFIX}/bin/.xmcd_start
 	${REINPLACE_CMD} \
 		-e 's:${STAGEDIR}::' \
 		${STAGEDIR}${PREFIX}/lib/X11/xmcd/discog/discog.html \
 		${STAGEDIR}${PREFIX}/lib/X11/xmcd/config/config.sh \
 		${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/powerpc64/powerpc/}/README
 	${FIND} ${STAGEDIR}${PREFIX} -name \*.bak -delete
 	${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
 
 .include <bsd.port.mk>
Index: head/audio/xmmix/Makefile
===================================================================
--- head/audio/xmmix/Makefile	(revision 513045)
+++ head/audio/xmmix/Makefile	(revision 513046)
@@ -1,25 +1,27 @@
 # Created by: Erik Cederstrand <erich@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xmmix
 PORTVERSION=	1.2.2
 PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.twaren.net/BSD/OpenBSD/distfiles/ \
 		http://freebsd.nsu.ru/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Motif-based audio mixer
 
+DEPRECATED=	Depends on deprecated libXp
+
 WRKSRC=		${WRKDIR}/xmmix-1.2
 
-USES=		imake motif
+USES=		imake motif xorg
 USE_XORG=	x11 xext sm ice xt xp
 
 PLIST_FILES=	bin/xmmix lib/X11/app-defaults/XMmix lib/X11/xmmix.hlp \
 		man/man1/xmmix.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMmix.ad
 
 .include <bsd.port.mk>
Index: head/biology/ncbi-toolkit/Makefile
===================================================================
--- head/biology/ncbi-toolkit/Makefile	(revision 513045)
+++ head/biology/ncbi-toolkit/Makefile	(revision 513046)
@@ -1,79 +1,81 @@
 # Created by: tonym
 # $FreeBSD$
 
 PORTNAME=	ncbi-toolkit
 DISTVERSION=	2017.01.06	# containing BLAST v2.2.27 (? is this true)
 PORTREVISION=	3
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/old/${PORTVERSION:S/.//g}/
 DISTNAME=	ncbi
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	NCBI development toolkit, including BLAST 2 and GenBank/Entrez support
 
+DEPRECATED=	Depends on deprecated libXp
+
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgmp.so:math/gmp \
 		libgnutls.so:security/gnutls \
 		libhogweed.so:security/nettle \
 		libidn2.so:dns/libidn2 \
 		libnettle.so:security/nettle \
 		libp11-kit.so:security/p11-kit \
 		libpng.so:graphics/png \
 		libtasn1.so:security/libtasn1 \
 		libtspi.so:security/trousers \
 		libunistring.so:devel/libunistring \
 		libXp.so:x11/libXp
 
-USES=		gettext-runtime iconv jpeg motif
+USES=		gettext-runtime iconv jpeg motif xorg
 USE_XORG=	x11 xau xext xft xmu xrender xt
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/make/makedis.csh
 	@${REINPLACE_CMD} -e \
 		'/^NCBI_CC/s|=.*|= ${CC}| ; \
 		 /^NCBI_LDFLGS1/s|=.*|= ${LDFLAGS}| ; \
 		 /^NCBI_OPTFLAG/s|= .*|= ${CFLAGS}| ; \
 		 s|-I/usr/X11R6/include||g ; \
 		 s|-L/usr/X11R6/lib||g ; \
 		 s|/usr/local|${LOCALBASE}|g ; \
 		 s|-Wl,-Bstatic|| ; \
 		 s|-Wl,-Bdynamic||' ${WRKSRC}/platform/freebsd.ncbi.mk
 	@${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' \
 		${WRKSRC}/make/makeall.unx ${WRKSRC}/make/makenet.unx
 
 # the ncbi-toolkit provides a shell script to drive the build
 # and we use it
 
 do-build:
 	@cd ${WRKDIR} && ./${DISTNAME}/make/makedis.csh
 
 # the ncbi-toolkit does not provide an install target
 # we thus roll our own
 
 do-install:
 	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} * ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}
 	cd ${WRKSRC}/lib && ${INSTALL_DATA} *.a \
 		${STAGEDIR}${PREFIX}/lib/${DISTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${DISTNAME}/connect
 	cd ${WRKSRC}/include && ${INSTALL_DATA} *.h \
 		${STAGEDIR}${PREFIX}/include/${DISTNAME}
 	cd ${WRKSRC}/include/connect && ${INSTALL_DATA} *.h \
 		${STAGEDIR}${PREFIX}/include/${DISTNAME}/connect
 	cd ${WRKSRC}/doc/man && ${INSTALL_MAN} * \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/data && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} '-not ( -name man -o -path ./man\/* )')
 
 .include <bsd.port.mk>
Index: head/deskutils/xmdiary/Makefile
===================================================================
--- head/deskutils/xmdiary/Makefile	(revision 513045)
+++ head/deskutils/xmdiary/Makefile	(revision 513046)
@@ -1,24 +1,26 @@
 # Created by: mi@aldan.ziplink.net
 # $FreeBSD$
 
 PORTNAME=	xmdiary
 PORTVERSION=	3.0.3
 PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	XCONTRIB/office
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Personal and group calendar utility
 
+DEPRECATED=	Depends on deprecated libXp
+
 NO_CDROM=	Do not sell for profit
-USES=		imake motif
+USES=		imake motif xorg
 USE_XORG=	x11 xext xp xpm xt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/malloc\.h/stdlib.h/' \
 		${WRKSRC}/tools/LstLinked.c ${WRKSRC}/tools/System.c \
 		${WRKSRC}/xtools/xitClipboard.c ${WRKSRC}/xtools/xitInfoFile.c
 	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		-e 's|CcCmd gcc|CcCmd ${CC}|' '${WRKSRC}/XDiary.tmpl'
 
 .include <bsd.port.mk>
Index: head/ftp/llnlxdir/Makefile
===================================================================
--- head/ftp/llnlxdir/Makefile	(revision 513045)
+++ head/ftp/llnlxdir/Makefile	(revision 513046)
@@ -1,20 +1,22 @@
 # Created by: Dima Ruban <dima@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	llnlxdir
 PORTVERSION=	2.1.2
 PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	https://computing.llnl.gov/resources/xdir/
 DISTNAME=	llnlxdir2_1_2
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Motif FTP client with drag-and-drop file transfer
 
+DEPRECATED=	Depends on deprecated libXp
+
 PLIST_FILES=	bin/xdir lib/X11/app-defaults/XDir man/man1/xdir.1.gz
 
 WRKSRC=		${WRKDIR}/llnlxdir2_1_2/sources
-USES=		imake motif tar:Z
+USES=		imake motif tar:Z xorg
 USE_XORG=	ice sm x11 xext xp xt
 
 .include <bsd.port.mk>
Index: head/ftp/llnlxftp/Makefile
===================================================================
--- head/ftp/llnlxftp/Makefile	(revision 513045)
+++ head/ftp/llnlxftp/Makefile	(revision 513046)
@@ -1,24 +1,26 @@
 # Created by: Dima Ruban <dima@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	llnlxftp
 PORTVERSION=	2.1
 PORTREVISION=	4
 CATEGORIES=	ftp
 MASTER_SITES=	https://computing.llnl.gov/resources/xdir/
 DISTNAME=	llnlxftp2.1
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Motif FTP client
 
+DEPRECATED=	Depends on deprecated libXp
+
 PLIST_FILES=	bin/xftp lib/X11/app-defaults/XFtp \
 		man/man1/xftp.1.gz
 WRKSRC=		${WRKDIR}/llnlxftp2.1/sources
-USES=		imake motif tar:Z
+USES=		imake motif tar:Z xorg
 USE_XORG=	ice sm x11 xext xp xt
 
 CFLAGS+=	-Wno-implicit-int \
 		-Wno-implicit-function-declaration \
 		-Wno-return-type
 
 .include <bsd.port.mk>
Index: head/graphics/SciPlot/Makefile
===================================================================
--- head/graphics/SciPlot/Makefile	(revision 513045)
+++ head/graphics/SciPlot/Makefile	(revision 513046)
@@ -1,46 +1,48 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	SciPlot
 PORTVERSION=	1.36
 PORTREVISION=	4
 CATEGORIES=	graphics math
 MASTER_SITES=	XCONTRIB/widgets
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Full-featured Xt widget to display 2D data in a graph
 
+DEPRECATED=	Depends on deprecated libXp
+
 LICENSE=	GPLv2
 
-USES=		imake motif
+USES=		imake motif xorg
 USE_XORG=	xp xt x11
 MAKE_ENV=	EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
 USE_LDCONFIG=	yes
 
 INCLUDES=	SciPlot.h SciPlotP.h SciPlotUtil.h
 LIBNAME=	lib${PORTNAME:tl}	# Remove :tl for libSciPlot
 PLIST_SUB=	LIBNAME=${LIBNAME}
 
 PORTDOCS=	README SciPlot.html SciPlotDemo.html SciPlotProg.html
 EXDATA=		data.txt
 EXBINS=		realtime sciplot
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${INCLUDES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/${LIBNAME}.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/${LIBNAME}.so.0 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${LIBNAME}.so.0 ${STAGEDIR}${PREFIX}/lib/${LIBNAME}.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXDATA:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${EXBINS:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/misc/xtar/Makefile
===================================================================
--- head/misc/xtar/Makefile	(revision 513045)
+++ head/misc/xtar/Makefile	(revision 513046)
@@ -1,35 +1,37 @@
 # Created by: Andreas Kohout <shanee@rabbit.augusta.de>
 # $FreeBSD$
 
 PORTNAME=	xtar
 PORTVERSION=	1.4
 PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	XCONTRIB/utilities
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View and manipulate contents of a tar file
 
-USES=		motif
+DEPRECATED=	Depends on deprecated libXp
+
+USES=		motif xorg
 USE_XORG=	ice sm x11 xext xp xt
 MAKEFILE=	Makefile.noimake
 ALL_TARGET=	${PORTNAME}
 MAKE_ARGS=	XINC="-I${LOCALBASE}/include" XMLIB="${MOTIFLIB}" \
 		APPDIR="${PREFIX}/lib/X11/app-defaults" \
 		BINDIR="${PREFIX}/bin" LIBDIR="${PREFIX}/lib/X11/xtar" \
 		MANDIR="${MAN1PREFIX}/man/man1" OPTIMISATION="${CFLAGS}" \
 		ANSIFLAG=-ansi CC="${CC}" RANLIB=:
 
 PLIST_FILES=	bin/xtar lib/X11/xtar/xtar.doc lib/X11/app-defaults/XTar \
 		man/man1/xtar.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,(APP|BIN|LIB|MAN)DIR),DESTDIR)$$(&,' \
 		${WRKSRC}/Makefile.noimake
 	@${REINPLACE_CMD} -e 's/pipe\.c/& regexpr.c/' \
 		${WRKSRC}/common/Makefile.noimake
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/multimedia/mpeg2play/Makefile
===================================================================
--- head/multimedia/mpeg2play/Makefile	(revision 513045)
+++ head/multimedia/mpeg2play/Makefile	(revision 513046)
@@ -1,27 +1,29 @@
 # Created by: "Philippe Charnier" <charnier@lirmm.fr>
 # $FreeBSD$
 
 PORTNAME=	mpeg2play
 PORTVERSION=	1.1b
 PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to play mpeg-2 movies on X displays
 
-USES=		imake motif
+DEPRECATED=	Depends on deprecated libXp
+
+USES=		imake motif xorg
 USE_XORG=	x11 xext xp xt
 ALL_TARGET=	mpeg2play
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpeg2play ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Mpeg2play ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/science/afni/Makefile
===================================================================
--- head/science/afni/Makefile	(revision 513045)
+++ head/science/afni/Makefile	(revision 513046)
@@ -1,169 +1,171 @@
 # $FreeBSD$
 
 PORTNAME=		afni
 DISTVERSIONPREFIX=	AFNI_
 DISTVERSION=		19.1.20
 PORTREVISION=	2
 CATEGORIES=		science biology graphics perl5 python
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Advanced Functional Neuro Imaging
 
+DEPRECATED=	Depends on deprecated libXp
+
 LICENSE=	GPLv2
 
 BROKEN_sparc64=	Does not compile: "undefined reference to '_mcount'"
 
 BUILD_DEPENDS=	gm4:devel/m4 \
 		R:math/R
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libf2c.so:lang/f2c \
 		libgsl.so:math/gsl \
 		libnetcdff.so:science/netcdf-fortran \
 		libxml2.so:textproc/libxml2 \
 		libXm.so:x11-toolkits/open-motif \
 		libnetpbm.so:graphics/netpbm
 RUN_DEPENDS=	endian:sysutils/endian \
 		mpeg_encode:multimedia/mpeg_encode \
 		qhull:math/qhull5 \
 		R:math/R
 
 USES=		compiler:openmp gettext gl gmake gnome iconv jpeg:run motif \
-		perl5 python shebangfix tar:xz
+		perl5 python shebangfix tar:xz xorg
 USE_GNOME=	glib20
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	scripts_install/* \
 		python_scripts/afni_python/*.py \
 		jzosky/*.py \
 		jzosky/lib_RetroTS/*.py \
 		discoraj/ClusterExplorer/*.py \
 		roopchansinghv/PsychoPy-NeuroFeedback-Demo/*.py \
 		roopchansinghv/PsychoPy-NeuroFeedback-Demo/*/*.py \
 		pkundu/*.py \
 		pkundu/meica.libs/*.py \
 		pkundu/meica.libs/*/*.py \
 		pkundu/meica.libs/*/*/*.py
 
 USE_GL=		gl glu
 USE_XORG=	x11 xext xi xmu xp xt
 MAKE_ENV=	CC="${CC}" R_SHARE_DIR=${LOCALBASE}/lib/R/share
 MAKE_JOBS_UNSAFE=yes
 
 WRKSRC_SUBDIR=	src
 ALL_TARGET=	vastness suma
 
 ###########################################################################
 # Install parameters
 
 SUB_FILES=	pkg-message afni.cshrc afni.profile
 
 INSTALL_WRKSRC=	${WRKSRC}/BSD
 INSTALL_TMP=	${INSTALL_WRKSRC}-temp
 PRESTAGE=	${WRKSRC}/prestage
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 CONFLICTS=	im-[0-9]* \
 		nifticlib-[0-9]* \
 		open-usp-tukubai-[0-9]*
 
 X11R6_FILES=	coxplot/Makefile \
 		coxplot/Makefile.f2c \
 		3DEdge/src/Makefile \
 		SUMA/SUMA_Makefile \
 		edt_blur.c \
 		suma_datasets.c \
 		SUMA/SUMA_Load_Surface_Object.c \
 		SUMA/SUMA_MiscFunc.c \
 		SUMA/SUMA_ParseCommands.c \
 		SUMA/GLUT/libglut/glut_event.c \
 		SUMA/SUMA_Surface_IO.c
 
 post-extract:
 .for f in ${X11R6_FILES}
 	@${REINPLACE_CMD} \
 		-e 's|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-E 's|AFNI_[0-9_]+|${PORTVERSION}|g' ${WRKSRC}/AFNI_label.h
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 	@${RM} ${WRKSRC}/3DEdge/src/Makefile.orig
 
 # shebangfix misses /bin/python on 10.1
 #	@${REINPLACE_CMD} -e "s|/bin/python|${PYTHON_CMD}|g" \
 #		${WRKSRC}/python_scripts/afni_python/lib_fat_Rfactor.py
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s|-lglib|-lglib-2.0|g" \
 		${WRKSRC}/SUMA/SUMA_Makefile
 	@${REINPLACE_CMD} \
 		-e 's|os\.path\.dirname(sys\.argv\[0\])|"${DATADIR}"|g' \
 		${WRKSRC}/pkundu/meica.py
 	@${REINPLACE_CMD} \
 		-e 's|g_info|afni_g_info|g' \
 		${WRKSRC}/rickr/Dimon.c \
 		${WRKSRC}/rickr/Dimon1.c \
 		${WRKSRC}/afni_history_rickr.c \
 		${WRKSRC}/mri_dicom_stuff.c \
 		${WRKSRC}/mri_process_siemens.c \
 		${WRKSRC}/mri_read_dicom.c \
 		${WRKSRC}/to3d.c \
 		${WRKSRC}/mri_dicom_stuff.h
 
 do-install:
 	# AFNI install just dumps everything into one flat directory
 	# Preserve original install dir and make a sacrificial temp copy
 	# to be pruned and rearranged for easy staging
 	@${RM} -r ${INSTALL_TMP}
 	@${CP} -R ${INSTALL_WRKSRC} ${INSTALL_TMP}
 
 	# Clean up and organize files into ${PRESTAGE}, destroying
 	# temp copy in the process
 	@${RM} -rf ${PRESTAGE}
 	@${MKDIR} ${PRESTAGE}/bin \
 		${PRESTAGE}/scripts \
 		${PRESTAGE}/lib \
 		${PRESTAGE}/include \
 		${PRESTAGE}/trash \
 		${PRESTAGE}/doc \
 		${PRESTAGE}/share
 	@${RM}	${INSTALL_TMP}/libf2c.a
 	@${MV}	${INSTALL_TMP}/meica.libs \
 		${INSTALL_TMP}/shiny \
 		${INSTALL_TMP}/lib_RetroTS \
 		${INSTALL_TMP}/afniInterfaceRT \
 		${INSTALL_TMP}/funstuff \
 		${INSTALL_TMP}/AFNI.*rc \
 		${INSTALL_TMP}/afnigui* \
 		${PRESTAGE}/share
 	@${MV}	${INSTALL_TMP}/*.a \
 		${INSTALL_TMP}/*.so \
 		${PRESTAGE}/lib
 	@${MV}	${INSTALL_TMP}/*.h ${PRESTAGE}/include
 	@${CP}	${WRKDIR}/afni-AFNI_${PORTVERSION}/doc/README/* ${PRESTAGE}/doc
 	@for binary in `${FILE} ${INSTALL_TMP}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
 		${MV} $${binary} ${PRESTAGE}/bin ; \
 	done
 	@${MV}	${INSTALL_TMP}/* ${PRESTAGE}/scripts
 
 	# Install to STAGEDIR using proper ports tools
 	@${MKDIR} \
 		${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${PREFIX}/lib/afni \
 		${STAGEDIR}${PREFIX}/include/afni \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${PREFIX}/etc/mri
 	${INSTALL_PROGRAM} ${PRESTAGE}/bin/* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${PRESTAGE}/scripts/* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${PRESTAGE}/lib/* ${STAGEDIR}${PREFIX}/lib/afni
 	${INSTALL_DATA} ${PRESTAGE}/include/* ${STAGEDIR}${PREFIX}/include/afni
 	(cd ${PRESTAGE}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/afni.cshrc ${WRKDIR}/afni.profile \
 		${STAGEDIR}${PREFIX}/etc/mri
 
 do-install-DOCS-on:
 	${INSTALL_DATA} ${PRESTAGE}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/textproc/mgdiff/Makefile
===================================================================
--- head/textproc/mgdiff/Makefile	(revision 513045)
+++ head/textproc/mgdiff/Makefile	(revision 513046)
@@ -1,29 +1,31 @@
 # Created by: andreas@marvin.robin.de
 # $FreeBSD$
 
 PORTNAME=	mgdiff
 PORTVERSION=	1.0
 PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	XCONTRIB/applications
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Graphical front end to the UNIX diff command
 
+DEPRECATED=	Depends on deprecated libXp
+
 LICENSE=	MIT
 
-USES=		imake motif
+USES=		imake motif xorg
 USE_XORG=	ice sm x11 xext xmu xp xt
 
 DESKTOP_ENTRIES=	"mgdiff" "GUI front end to the UNIX diff command" \
 			"mgdiff-48x48" \
 			"mgdiff" "GNOME;GTK;Motif;Development;System;" \
 			false
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${FILESDIR}/mgdiff-48x48.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
Index: head/x11/libXp/Makefile
===================================================================
--- head/x11/libXp/Makefile	(revision 513045)
+++ head/x11/libXp/Makefile	(revision 513046)
@@ -1,21 +1,23 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libXp
 PORTVERSION=	1.0.3
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X print library
 
+DEPRECATED=	Deprecated upstream
+
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-XORG_CAT=	lib
+USES=		cpe xorg xorg-cat:lib
 USE_XORG=	x11 xext xau xorgproto
-USES+=	cpe
 CPE_PRODUCT=	libxp
 CPE_VENDOR=	x
 
 .include <bsd.port.mk>