Drop dependency on libXp (from Imake)

* libXp was used by Xaw8, but it had been obsolated, and in pkgsrc,
  x11/libXaw/buildlink3.mk had been switched to pick up Xaw7 by default.
* With x11/xorg-cf-files, libXp was offered with XawClientLibs,
  but updated to 1.0.4, it was removed.
* And pkgsrc had been switched to use always xorg-cf-files and imake from pkgsrc,
  so all platforms should not require libXp from libXaw with Imake.

Bump PKGREVISION.

36 files changed, 72 insertions, 110 deletions

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 5111fda8dc2..e43a4689028 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2012/02/15 15:33:27 hans Exp $
+# $NetBSD: Makefile,v 1.88 2012/05/03 09:55:29 obache Exp $
 
 DISTNAME=	nas-1.9.1.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nas/}
 
@@ -90,6 +90,4 @@ pre-configure:
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 43783a150f7..28785642fa7 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2011/09/04 22:05:39 dholland Exp $
+# $NetBSD: Makefile,v 1.26 2012/05/03 09:55:29 obache Exp $
 
 DISTNAME=	xcdplayer-2.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
@@ -21,7 +21,6 @@ pre-configure:
 	${CP} ${WRKSRC}/xcdplayer.1 ${WRKSRC}/xcdplayer.man
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile
index 490d6f049df..25ba1dc34fa 100644
--- a/comms/xtel/Makefile
+++ b/comms/xtel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2012/02/16 18:00:20 hans Exp $
+# $NetBSD: Makefile,v 1.26 2012/05/03 09:55:29 obache Exp $
 #
 
 DISTNAME=	xtel-3.3.0
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	comms x11
 MASTER_SITES=	http://pficheux.free.fr/xtel/download/
 
@@ -44,7 +44,5 @@ BUILDLINK_TRANSFORM+=	rm:-lucb
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index bea9b40bb11..13e6ab5c74d 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2011/03/06 10:22:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2012/05/03 09:55:29 obache Exp $
 
 DISTNAME=	spim-8.0
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://pages.cs.wisc.edu/~larus/SPIM/
 
@@ -46,6 +47,5 @@ post-install:
 		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/xfinans/Makefile b/finance/xfinans/Makefile
index 9c865733da0..a0a4a52e1da 100644
--- a/finance/xfinans/Makefile
+++ b/finance/xfinans/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2009/07/08 16:37:59 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2012/05/03 09:55:29 obache Exp $
 #
 
 DISTNAME=		xfinans-5.9
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		finance x11
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=apps/financial/accounting/}
 
@@ -36,5 +36,4 @@ post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/xfinans.0
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/spider/Makefile b/games/spider/Makefile
index 8abfd4bb173..047ae328dd1 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2012/05/03 09:55:29 obache Exp $
 
 DISTNAME=	spider
 PKGNAME=	spider-1.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/
 
@@ -15,6 +15,5 @@ USE_IMAKE=	yes
 INSTALL_TARGET=	install install.doc install.man
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index 29591b8cb95..76d31cc6567 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/02/19 21:47:06 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2012/05/03 09:55:30 obache Exp $
 
 DISTNAME=	xemeraldia-0.3
 PKGNAME=	xemeraldia-0.31
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1995/mar/
 
@@ -29,6 +29,5 @@ CONF_FILES_PERMS+=	/dev/null ${PREFIX}/${GAMES_DIR}/xemeraldia/xemeraldia.scores
 			${GAMES_USER} ${GAMES_GROUP} ${GAMEMODE}
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 5e622a795f9..8e0f1a496d2 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2008/11/10 17:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2012/05/03 09:55:30 obache Exp $
 #
 
 DISTNAME=	xscrabble-1.0
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -45,5 +45,4 @@ do-install:
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index e2f51d45d95..6da7d73957d 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.55 2012/03/05 04:36:04 dholland Exp $
+# $NetBSD: Makefile,v 1.56 2012/05/03 09:55:30 obache Exp $
 #
 
 DISTNAME=	xart19980415
 PKGNAME=	xart-19980415
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://linux01.gwdg.de/~rhohen/linux/
 EXTRACT_SUFX=	.tgz
@@ -28,6 +28,5 @@ post-extract:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index de85fe68804..b7052ba2eaa 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2008/11/10 17:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2012/05/03 09:55:30 obache Exp $
 
 DISTNAME=		xbmbrowser5.1
 PKGNAME=		xbmbrowser-5.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=utilities/}
 
@@ -16,6 +16,5 @@ USE_IMAKE=		YES
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/kinput2/Makefile b/inputmethod/kinput2/Makefile
index 2aff591d4b9..3108e5c2346 100644
--- a/inputmethod/kinput2/Makefile
+++ b/inputmethod/kinput2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2011/09/13 07:28:48 mef Exp $
+# $NetBSD: Makefile,v 1.22 2012/05/03 09:55:30 obache Exp $
 
 DISTNAME=	kinput2-v3.1
 PKGNAME=	kinput2-3.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/
 
@@ -28,7 +28,6 @@ do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile
index 76308f24efb..77e5587235d 100644
--- a/mail/xmailwatcher/Makefile
+++ b/mail/xmailwatcher/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2009/12/10 23:50:04 abs Exp $
+# $NetBSD: Makefile,v 1.14 2012/05/03 09:55:30 obache Exp $
 
 DISTNAME=		xmailwatcher
 PKGNAME=		${DISTNAME}-1.6
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dcs.ed.ac.uk/home/gdmr/X11/
 
@@ -13,6 +13,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_IMAKE=		yes
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdrill/Makefile b/misc/kdrill/Makefile
index 25cb24a0f8e..eee16faf8f4 100644
--- a/misc/kdrill/Makefile
+++ b/misc/kdrill/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/01/09 11:55:35 obache Exp $
+# $NetBSD: Makefile,v 1.19 2012/05/03 09:55:30 obache Exp $
 #
 
 DISTNAME=	kdrill5.11.6
 PKGNAME=	kdrill-5.11.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	japanese misc
 MASTER_SITES=	http://www.bolthole.com/kdrill/
 
@@ -34,5 +34,4 @@ post-install:
 		${DESTDIR}${PREFIX}/share/kdrill/kanjidic.gz
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/xrn/Makefile b/news/xrn/Makefile
index 90cf49def5d..e357a010b1d 100644
--- a/news/xrn/Makefile
+++ b/news/xrn/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2010/02/11 23:32:50 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2012/05/03 09:55:31 obache Exp $
 #
 
 DISTNAME=	9.01
 PKGNAME=	xrn-9.01
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	news x11
 MASTER_SITES=	ftp://sipb.mit.edu/pub/xrn/
 EXTRACT_SUFX=	.tgz
@@ -28,6 +28,5 @@ pre-install:
 	done
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index 9855ed52ea2..5140aa6ec62 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2008/11/10 17:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2012/05/03 09:55:31 obache Exp $
 #
 
 DISTNAME=	xdu-3.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://sd.wareonearth.com/~phil/xdu/
 PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/xdu/
@@ -23,6 +23,5 @@ PATCH_DIST_STRIP.xdu-3.0.dirname.patch	= -p1
 PATCH_DIST_STRIP.xdu-3.0.i18n.patch	= -p1
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfm/Makefile b/sysutils/xfm/Makefile
index 8d85d94832c..5038a7f08d7 100644
--- a/sysutils/xfm/Makefile
+++ b/sysutils/xfm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/03/07 09:03:14 obache Exp $
+# $NetBSD: Makefile,v 1.17 2012/05/03 09:55:31 obache Exp $
 
 DISTNAME=	xfm-1.4.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 
@@ -19,6 +19,4 @@ USE_IMAKE=	YES
 
 .include "../../x11/Xaw3d/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xmeter/Makefile b/sysutils/xmeter/Makefile
index 1f020f01d19..53ddb2897ce 100644
--- a/sysutils/xmeter/Makefile
+++ b/sysutils/xmeter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/11/10 17:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2012/05/03 09:55:31 obache Exp $
 #
 
 DISTNAME=	xmeter-1.15
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=misdirected/}
 
@@ -16,6 +16,5 @@ WRKSRC=		${WRKDIR}
 USE_IMAKE=	yes
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index deb25b2dd10..3d0a0d2d5e7 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/06/04 13:52:21 tsutsui Exp $
+# $NetBSD: Makefile,v 1.24 2012/05/03 09:55:31 obache Exp $
 #
 
 DISTNAME=	emiclock-2.0.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 time
 MASTER_SITES=	${MASTER_SITE_FREEBSD}
 
@@ -37,5 +37,4 @@ post-install:
 		${DESTDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock
 
 .include "../../mk/xaw.buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnyaclock/Makefile b/time/gnyaclock/Makefile
index d5a6320eaf6..718e2acc0f1 100644
--- a/time/gnyaclock/Makefile
+++ b/time/gnyaclock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2009/09/02 08:34:15 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2012/05/03 09:55:31 obache Exp $
 #
 
 DISTNAME=	gnya
 PKGNAME=	gnyaclock-20001218
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	time x11
 MASTER_SITES=	http://www.is.titech.ac.jp/~sadayosi/lab/h-takasi/
 EXTRACT_SUFX=	.shar
@@ -25,7 +25,6 @@ do-install:
 	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/gnyaclock.1
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/titrax/Makefile b/time/titrax/Makefile
index c58d6224c60..16437fbccab 100644
--- a/time/titrax/Makefile
+++ b/time/titrax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2011/01/17 12:52:15 he Exp $
+# $NetBSD: Makefile,v 1.25 2012/05/03 09:55:31 obache Exp $
 #
 
 DISTNAME=		titrax-1.98
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11 time
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=office/}
 
@@ -31,6 +31,5 @@ post-patch:
 INSTALLATION_DIRS=	libexec/titrax
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xalarm/Makefile b/time/xalarm/Makefile
index bcdeaaf5fd0..4ee34d2f1ae 100644
--- a/time/xalarm/Makefile
+++ b/time/xalarm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/07/07 20:00:27 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/05/03 09:55:31 obache Exp $
 
 DISTNAME=	xalarm-3.06
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	time
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 EXTRACT_SUFX=	.tar.gz
@@ -56,7 +56,6 @@ pre-configure:
 		-e 's|@KILL@|${KILL}|' ${FILESDIR}/fns.h.in > ${WRKSRC}/fns.h
 	${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/
 
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xcal/Makefile b/time/xcal/Makefile
index b8b6e6d3fbd..e317d4221de 100644
--- a/time/xcal/Makefile
+++ b/time/xcal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/07/07 19:55:43 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2012/05/03 09:55:32 obache Exp $
 #
 
 DISTNAME=		xcal41
 PKGNAME=		xcal-4.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11 time
 MASTER_SITES=		ftp://ftp.hillside.co.uk/xcal/
 EXTRACT_SUFX=		.tar.Z
@@ -23,6 +23,5 @@ post-extract:
 	done
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xtimer/Makefile b/time/xtimer/Makefile
index fc651138dae..8deedfce02a 100644
--- a/time/xtimer/Makefile
+++ b/time/xtimer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/11/10 17:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/05/03 09:55:32 obache Exp $
 
 DISTNAME=	xtimer-8089
 PKGNAME=	xtimer-0.8089
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 time
 MASTER_SITES=	http://www.bsddiary.net/xtimer/
 
@@ -15,6 +15,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_IMAKE=	yes
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 630fb9cb562..49bbff700cc 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:51 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2012/05/03 09:55:32 obache Exp $
 #
 
 DISTNAME=		Xaw-XPM-1.1
 PKGNAME=		Xaw-Xpm-1.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=libs/X/}
 
@@ -30,7 +30,6 @@ post-install:
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/hanterm/Makefile b/x11/hanterm/Makefile
index 519e0cb95ce..5f2d7fca74e 100644
--- a/x11/hanterm/Makefile
+++ b/x11/hanterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2008/11/10 17:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2012/05/03 09:55:32 obache Exp $
 
 DISTNAME=	hanterm-3.1.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11 korean
 MASTER_SITES=	http://download.kldp.net/hanterm/hanterm/3.1.6/
 
@@ -14,6 +14,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_IMAKE=	YES
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 8772647d0f8..93b22718d4d 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2012/01/13 16:53:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2012/05/03 09:55:32 obache Exp $
 
 DISTNAME=	kterm-6.2.0
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 
@@ -32,5 +32,4 @@ post-patch:
 .endif
 
 .include "../../mk/xaw.buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index db8bd6bf0be..3a46ebdd852 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2008/11/10 17:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/03 09:55:32 obache Exp $
 
 DISTNAME=	xaniroc
 PKGNAME=	xaniroc-1.02
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.42.org/pub/orphan/
 EXTRACT_SUFX=	.src.tar.Z
@@ -18,6 +18,5 @@ post-extract:
 	${MV} ${WRKSRC}/manpage.1 ${WRKSRC}/xaniroc.man
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 8e3ff46a1ac..d548914de47 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2012/05/03 09:55:32 obache Exp $
 
 DISTNAME=	xcolors
 PKGNAME=	xcolors-1.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/
 
@@ -24,6 +24,5 @@ CPPFLAGS+=	-DRGB_TXT=\"${X11BASE}/lib/X11/rgb.txt\"
 .endif
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xless/Makefile b/x11/xless/Makefile
index 073af26ca3b..50c81208aaa 100644
--- a/x11/xless/Makefile
+++ b/x11/xless/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/07/07 17:22:27 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2012/05/03 09:55:32 obache Exp $
 
 DISTNAME=	xless-1.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/} \
 		ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
@@ -18,6 +18,5 @@ USE_IMAKE=	yes
 INSTALLATION_DIRS=	lib/X11
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index b9d87b2274f..fb89716685e 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/05/03 09:55:32 obache Exp $
 #
 
 DISTNAME=	xlupe-1.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://core.de/~coto/projects/xlupe/
 
@@ -17,6 +17,5 @@ USE_IMAKE=	yes
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 91863e8813a..2406a820e20 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2012/05/03 09:55:33 obache Exp $
 
 DISTNAME=	xmascot2.6a
 PKGNAME=	xmascot-2.6a
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://cclub-flying.dsl.gr.jp/products/xmascot/
 
@@ -19,6 +19,5 @@ USE_IMAKE=	yes
 INSTALL_MAKE_FLAGS+=	LANG=ja_JP.eucJP
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index f528e8f0060..90dc6c66cfe 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/04/16 04:19:16 dholland Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/03 09:55:33 obache Exp $
 
 DISTNAME=	xmx-2.1alpha.pl7
 PKGNAME=	xmx-2.1a7
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.brown.edu/pub/xmx/
 
@@ -25,6 +25,4 @@ USE_IMAKE=	yes
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xp/Makefile b/x11/xp/Makefile
index 3418300e3c6..c6d48d769c7 100644
--- a/x11/xp/Makefile
+++ b/x11/xp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2011/03/17 23:38:28 zafer Exp $
+# $NetBSD: Makefile,v 1.15 2012/05/03 09:55:33 obache Exp $
 
 DISTNAME=	xp-1.2b10
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	# ftp://ftp.ncl.ac.uk/pub/users/ngmt/X11/
 
@@ -14,6 +14,5 @@ USE_IMAKE=	yes
 MAKE_FLAGS+=	MANPATH=${PREFIX}/${PKGMANDIR}
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpostit/Makefile b/x11/xpostit/Makefile
index 7a37c68a522..6f1403267b6 100644
--- a/x11/xpostit/Makefile
+++ b/x11/xpostit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/05/03 09:55:33 obache Exp $
 #
 
 DISTNAME=	xpostit3.3.1
 PKGNAME=	xpostit-3.3.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
@@ -18,6 +18,5 @@ WRKSRC=		${WRKDIR}/xpostit
 USE_IMAKE=	yes
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile
index b96f573ddc9..0511ed32b02 100644
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/07/07 16:53:43 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2012/05/03 09:55:33 obache Exp $
 
 DISTNAME=	xscribble
 PKGNAME=	xscribble-20000616
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://www.handhelds.org/download/projects/xscribble/
 EXTRACT_SUFX=	.tgz
@@ -31,7 +31,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/classifiers/*.cl ${DESTDIR}${PREFIX}/share/examples/xscribble
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 30bc0dd3590..30535b04c4f 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2011/03/07 08:52:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2012/05/03 09:55:33 obache Exp $
 #
 
 DISTNAME=	xvkbd-3.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://homepage3.nifty.com/tsato/xvkbd/
 
@@ -26,5 +27,4 @@ BUILDLINK_TRANSFORM+=	l:Xaw3d:neXtaw
 .endif
 
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"