Deprecate x11/libXp, it is deprecated upstream

Deprecate x11/libXp, since it is about to be deprecated upstream.  Do *not*
yet set a removal date for x11/libXp, this will be decided later, once most
dependencies are fixed.
Deprecate all ports depending on x11/libXp.
* astro/xephem
* audio/xmcd
* audio/xmmix
* biology/ncbi-toolkit
* deskutils/xmdiary
* ftp/llnlxdir
* ftp/llnlxftp
* graphics/SciPlot
* misc/xtar
* multimedia/mpeg2play
* science/afni
* textproc/mgdiff

Sprinkle USES=xorg as needed.

Discussed with:	bapt

13 files changed, 40 insertions, 14 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index c57aa1272cc7..23d8ba9d54e6 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -10,10 +10,12 @@ 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
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index c3209e52d708..8687393825aa 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -10,11 +10,13 @@ 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
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 2f35189aed2d..d076b91c9848 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -11,9 +11,11 @@ MASTER_SITES=	http://ftp.twaren.net/BSD/OpenBSD/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 \
diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index e026238b9dcb..1b39210097cd 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -12,6 +12,8 @@ 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 \
@@ -25,7 +27,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		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
diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile
index 63b18b039f02..b289a10767bb 100644
--- a/deskutils/xmdiary/Makefile
+++ b/deskutils/xmdiary/Makefile
@@ -10,8 +10,10 @@ 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:
diff --git a/ftp/llnlxdir/Makefile b/ftp/llnlxdir/Makefile
index f85900bf14fe..0cd20b26ab18 100644
--- a/ftp/llnlxdir/Makefile
+++ b/ftp/llnlxdir/Makefile
@@ -11,10 +11,12 @@ 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>
diff --git a/ftp/llnlxftp/Makefile b/ftp/llnlxftp/Makefile
index 30ac11eea57d..2dab7cf0a722 100644
--- a/ftp/llnlxftp/Makefile
+++ b/ftp/llnlxftp/Makefile
@@ -11,10 +11,12 @@ 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 \
diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index d8f1be45e452..0af5d7878032 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -10,9 +10,11 @@ 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
diff --git a/misc/xtar/Makefile b/misc/xtar/Makefile
index f9f3e7e827f5..bfdd76a4e93f 100644
--- a/misc/xtar/Makefile
+++ b/misc/xtar/Makefile
@@ -10,7 +10,9 @@ 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}
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index d673923fc1db..6c9840d7dd8e 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -10,7 +10,9 @@ 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
 
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 12b9a3f9baf9..deb2013893d4 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -9,6 +9,8 @@ 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'"
@@ -28,7 +30,7 @@ RUN_DEPENDS=	endian:sysutils/endian \
 		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
 
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 1c9feb4aa54e..d872737974b4 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -11,9 +11,11 @@ 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" \
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index ed06b3867e3d..27e0c9141ade 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -10,11 +10,13 @@ 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