fix build and WANTLIB after libXp removal

2010-04-24 20:18:39 +00:00 · 2010-04-24 20:18:39 +00:00 · 91db013e33
commit 91db013e33
parent beb6da8f8a
59 changed files with 192 additions and 184 deletions
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.35 2009/09/10 22:17:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.36 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	interactive astronomical ephemeris
 DISTNAME=	xephem-3.2.3
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	astro
 MASTER_SITES=	http://www.phil.uu.nl/~lievisse/distfiles/

@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=   no modifications, no fee
 PERMIT_PACKAGE_FTP=     no modifications
 PERMIT_DISTFILES_CDROM= no fee
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		ICE SM X11 Xau Xdmcp Xext Xp Xt c m \
+WANTLIB=		ICE SM X11 Xau Xdmcp Xext Xt c m \
 			pthread-stubs xcb

 USE_MOTIF=	any
--- a/astro/xephem/patches/patch-GUI_xephem_Imakefile
+++ b/astro/xephem/patches/patch-GUI_xephem_Imakefile
@ -1,12 +0,0 @@
-$OpenBSD: patch-GUI_xephem_Imakefile,v 1.1 2002/07/31 06:06:52 pvalchev Exp $
--- GUI/xephem/Imakefile.orig	Sun Jul 14 21:34:42 2002
-+++ GUI/xephem/Imakefile	Sun Jul 14 21:34:52 2002
-@@ -63,7 +63,7 @@ OBJS =			\
- SRCS = 	$(OBJS:.o=.c)
- 
- XCOMM Sometimes you need -lXp after -lXm
-          XMLIB = -lXm
-+          XMLIB = -lXm -lXp
-         DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
-  EXTRA_INCLUDES = -I../../libastro
-   LOCAL_LDFLAGS = -L../../libastro
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.23 2009/08/10 06:29:52 kili Exp $
+# $OpenBSD: Makefile,v 1.24 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	CD player for X11
 DISTNAME=	xcdplayer-2.2
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	audio

 MASTER_SITES=	${MASTER_SITE_R5CONTRIB}
@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c \
+WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c \
 			pthread-stubs xcb

 USE_X11=	Yes
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.36 2009/12/20 21:00:24 kili Exp $
+# $OpenBSD: Makefile,v 1.37 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	Motif CD player

 DISTNAME=	xmcd-2.6
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	audio
 HOMEPAGE=	http://www.amb.org/xmcd/

@ -12,7 +12,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xp Xpm Xt c curses \
+WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xpm Xt c curses \
 		m termlib

 MASTER_SITES=	http://www.phil.uu.nl/~lievisse/distfiles/
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2010/04/15 13:56:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	communication package for X11

 DISTNAME=	Seyon-2.14b
-PKGNAME=	seyon-2.14bp2
+PKGNAME=	seyon-2.14bp3
 CATEGORIES=	comms x11

 MASTER_SITES=	ftp://sipb.mit.edu/pub/seyon/
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs xcb

 CONFIGURE_STYLE=imake

--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2010/01/23 10:29:45 landry Exp $
+# $OpenBSD: Makefile,v 1.14 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	X amateur station tracking and info reporting

 DISTNAME=	xastir-1.8.2
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=    	comms hamradio geo

 HOMEPAGE=	http://www.xastir.org/
@ -37,7 +37,7 @@ CONFIGURE_ARGS=		--with-shapelib					\
 			--with-bdb-libdir=$(LOCALBASE)/lib/db4		\
 			--with-bdb-incdir=$(LOCALBASE)/include/db4

-WANTLIB=	ICE SM c pthread freetype Xt Xpm Xext m Xp X11 z	\
+WANTLIB=	ICE SM c pthread freetype Xt Xpm Xext m X11 z	\
 		proj pthread-stubs tiff xcb iconv

 LIB_DEPENDS=	curl::net/curl						\
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.51 2009/12/16 14:33:47 kili Exp $
+# $OpenBSD: Makefile,v 1.52 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	Data Display Debugger, graphical front-end for GDB, etc

 DISTNAME=	ddd-3.3.12
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ddd/}

@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	ICE SM X11 Xaw Xau Xdmcp Xext Xmu Xp Xpm Xt c m z stdc++ \
+WANTLIB=	ICE SM X11 Xaw Xau Xdmcp Xext Xmu Xpm Xt c m z stdc++ \
 		Xft Xrender expat fontconfig freetype ncurses \
 		pthread-stubs xcb jpeg png

--- a/devel/jdk/1.5/Makefile
+++ b/devel/jdk/1.5/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2009/08/10 06:31:07 kili Exp $
+# $OpenBSD: Makefile,v 1.60 2010/04/24 20:18:39 naddy Exp $

 SHARED_ONLY=		Yes
 ONLY_FOR_ARCHS= 	amd64 i386
@ -7,8 +7,8 @@ COMMENT-main=		Java2(TM) Standard Edition Dev Kit v${V}
 COMMENT-jre=		Java2(TM) Standard Edition Runtime Environment v${V}
 V=			1.5.0.16
 PKGNAME=		jdk-${V}
-PKGNAME-main=		jdk-${V}p1
-PKGNAME-jre=		jre-${V}p1
+PKGNAME-main=		jdk-${V}p2
+PKGNAME-jre=		jre-${V}p2

 CATEGORIES=		devel devel/jdk java

@ -44,7 +44,7 @@ BUILD_DEPENDS=		::archivers/gtar \
 			::archivers/bzip2
 USE_MOTIF=		openmotif
 MODULES=		converters/libiconv
-WANTLIB=		X11 Xext Xi Xp Xt Xtst c m ossaudio pthread \
+WANTLIB=		X11 Xext Xi Xt Xtst c m ossaudio pthread \
 			pthread-stubs xcb stdc++ z

 WANTLIB-main=		${WANTLIB} Xmu
--- a/devel/jdk/1.5/patches/patch-j2se_make_sun_awt_mawt_gmk
+++ b/devel/jdk/1.5/patches/patch-j2se_make_sun_awt_mawt_gmk
@ -0,0 +1,20 @@
+$OpenBSD: patch-j2se_make_sun_awt_mawt_gmk,v 1.3 2010/04/24 20:18:39 naddy Exp $
+--- j2se/make/sun/awt/mawt.gmk.orig	Sat Apr 24 16:30:25 2010
+++ j2se/make/sun/awt/mawt.gmk	Sat Apr 24 16:41:02 2010
+@@ -144,7 +144,7 @@ else
+     ifeq ($(TRUE_PLATFORM), NetBSD)
+ 	LIBXM += -Wl,-R$(MOTIF_LIB)
+     endif
+-    LIBXM = -L$(MOTIF_LIB) -lXm -lXp
+    LIBXM = -L$(MOTIF_LIB) -lXm
+ 
+     ifeq ($(LINUX_OR_BSD), true)
+ 	LIBXT = -lXt
+@@ -239,6 +239,7 @@ ifeq ($(LINUX_OR_BSD), true)
+   X11DIR ?= /usr/X11R6
+   LOCALDIR ?= /usr/local
+   CPPFLAGS += -I$(X11DIR)/include -I$(X11DIR)/include/X11/extensions \
+              -I$(X11DIR)/include/freetype2 \
+               -DX11DIR=\"$(X11DIR)\" -DLOCALDIR=\"$(LOCALDIR)\"
+ endif
+ 
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.22 2009/08/10 06:31:08 kili Exp $
+# $OpenBSD: Makefile,v 1.23 2010/04/24 20:18:39 naddy Exp $

 COMMENT=		simple to use text editor for X11

 DISTNAME=		aXe-6.1.2
-PKGNAME=		${DISTNAME:L}p1
+PKGNAME=		${DISTNAME:L}p2
 CATEGORIES=		editors

 PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c \
+WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c \
 			pthread-stubs xcb

 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=editors/}
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.50 2010/02/27 15:03:39 jasper Exp $
+# $OpenBSD: Makefile,v 1.51 2010/04/24 20:18:39 naddy Exp $
 # $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $

 COMMENT=		X11/Motif GUI text editor

 DISTNAME=		nedit-5.5
-PKGNAME=		${DISTNAME}p9
+PKGNAME=		${DISTNAME}p10
 P_V=			0.1
 DISTFILES=		${DISTNAME}-src${EXTRACT_SUFX} \
 			nedit_patterns-${P_V}.tgz:1
@ -29,7 +29,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xmu Xp Xpm Xrender Xt
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xmu Xpm Xrender Xt
 WANTLIB += c expat fontconfig freetype m z

 MODULES=		converters/libiconv
--- a/editors/nedit/patches/patch-makefiles_Makefile_openbsd
+++ b/editors/nedit/patches/patch-makefiles_Makefile_openbsd
@ -1,8 +1,8 @@
-$OpenBSD: patch-makefiles_Makefile_openbsd,v 1.8 2007/10/27 14:01:38 mbalmer Exp $
+$OpenBSD: patch-makefiles_Makefile_openbsd,v 1.9 2010/04/24 20:18:39 naddy Exp $
 --- makefiles/Makefile.openbsd.orig	Sat Nov 22 06:03:39 2003
 +++ makefiles/Makefile.openbsd	Sat Oct 27 07:31:57 2007
@@ -1,6 +1,6 @@
- # $Id: patch-makefiles_Makefile_openbsd,v 1.8 2007/10/27 14:01:38 mbalmer Exp $
+ # $Id: patch-makefiles_Makefile_openbsd,v 1.9 2010/04/24 20:18:39 naddy Exp $
 -CC=cc
 -AR=ar
 +CC?=cc
@ -22,7 +22,7 @@ $OpenBSD: patch-makefiles_Makefile_openbsd,v 1.8 2007/10/27 14:01:38 mbalmer Exp
 ARFLAGS=-ur
 -LIBS= -L/usr/X11R6/lib -lXm -lXpm -lXp -lXext -lXt -lSM -lICE -lX11 -lm
 +MOTIFLIB?=-L${LOCALBASE} -lXm
-+LIBS=-L${X11BASE}/lib ${MOTIFLIB} -lXft -lXpm -lXp -lXext -lXt -lSM -lICE -lX11 -lfontconfig -lfreetype -lexpat -lm -lXau -lXdmcp -lXrender -lXmu -lz -liconv 
+LIBS=-L${X11BASE}/lib ${MOTIFLIB} -lXft -lXpm -lXext -lXt -lSM -lICE -lX11 -lfontconfig -lfreetype -lexpat -lm -lXau -lXdmcp -lXrender -lXmu -lz -liconv 
 
 include Makefile.common
 
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2009/08/10 06:31:09 kili Exp $
+# $OpenBSD: Makefile,v 1.19 2010/04/24 20:18:39 naddy Exp $


 COMMENT=	X11 based RTF editor
 V=		2.17
 DISTNAME=	ted-$V
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	editors textproc print
 HOMEPAGE=	http://www.nllgg.nl/Ted/
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
-WANTLIB=		ICE SM X11 Xext Xmu Xpm Xp Xt c m pthread-stubs xcb z
+WANTLIB=		ICE SM X11 Xext Xmu Xpm Xt c m pthread-stubs xcb z

 MAINTAINER=	Marc Espie <espie@openbsd.org>

--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2009/08/10 06:31:09 kili Exp $
+# $OpenBSD: Makefile,v 1.17 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	MIPS R2000/R3000 simulator

 DISTNAME=	spim-7.3
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	emulators

 HOMEPAGE=	http://www.cs.wisc.edu/~larus/spim.html
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=     may not bundle with commercial product
 PERMIT_DISTFILES_CDROM= may not sell
 PERMIT_DISTFILES_FTP=   may not bundle with commercial product

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c m \
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m \
 		pthread-stubs xcb

 MASTER_SITES=	http://www.cs.wisc.edu/~larus/SPIM/
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/10 06:31:42 kili Exp $
+# $OpenBSD: Makefile,v 1.21 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	challenging double decked solitaire game

 DISTNAME=	spider
-PKGNAME=	spider-1.1p3
+PKGNAME=	spider-1.1p4
 CATEGORIES=	games

 MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/
@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs xcb

 CONFIGURE_STYLE=imake
 INSTALL_TARGET=	install install.doc
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2009/08/10 06:31:43 kili Exp $
+# $OpenBSD: Makefile,v 1.24 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	Athena port of xminesweeper

 DISTNAME=	xmine-1.0.3-Xaw
-PKGNAME=	xmine-1.0.3p1
+PKGNAME=	xmine-1.0.3p2
 CATEGORIES=	games

 MAINTAINER=	Paul Janzen <pjanzen@openbsd.org>
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM Xau Xdmcp X11 Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM Xau Xdmcp X11 Xext Xmu Xpm Xt c pthread-stubs xcb

 LIB_DEPENDS=    Xaw3d.::x11/Xaw3d

--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/10 06:31:43 kili Exp $
+# $OpenBSD: Makefile,v 1.21 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	Windows minesweeper

 DISTNAME=	xminesweep3.0
-PKGNAME=	xminesweep-3.0p1
+PKGNAME=	xminesweep-3.0p2
 CATEGORIES=	games

 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	no fee
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs xcb

 CONFIGURE_STYLE=imake
 USE_X11=	Yes
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2009/08/26 00:15:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	win land without colliding with 'flyers' and 'eaters'

 DISTNAME=	xonix-1.4
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	games

 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/ \
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c m
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m

 CONFIGURE_STYLE=imake
 USE_X11=	Yes
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2009/08/10 06:31:43 kili Exp $
+# $OpenBSD: Makefile,v 1.26 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	X11 solitaire with 14 variations

 DISTNAME=	xpat2-1.07
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	games

 MASTER_SITES=	http://www.ibiblio.org/pub/linux/games/solitaires/
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs xcb

 USE_X11=	Yes

--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2010/04/15 07:11:54 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	X11 version of the popular board game

 V=		2.12
 DISTNAME=	xscrabble-${V}
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	games

 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c pthread-stubs \
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs \
 		xcb z

 LIB_DEPENDS=	bz2.>=10::archivers/bzip2
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2009/08/10 06:31:45 kili Exp $
+# $OpenBSD: Makefile,v 1.19 2010/04/24 20:18:39 naddy Exp $
 # $FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp $

 COMMENT=	view complete directories of X bitmaps and X pixmaps

 DISTNAME=	xbmbrowser5.1
-PKGNAME=	xbmbrowser-5.1p1
+PKGNAME=	xbmbrowser-5.1p2
 CATEGORIES=	graphics

 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt pthread-stubs xcb c
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt pthread-stubs xcb c

 CONFIGURE_STYLE=imake
 USE_X11=	Yes
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.43 2010/01/04 15:41:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	CAD drawing program for X11

 VERSION=	3.2.5b
 DISTNAME=	xfig.${VERSION}.full
-PKGNAME=	xfig-${VERSION}p3
+PKGNAME=	xfig-${VERSION}p4
 CATEGORIES=	graphics x11

 HOMEPAGE=	http://www.xfig.org/
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB += ICE SM X11 Xmu Xp Xpm Xt c m pthread-stubs xcb z
+WANTLIB += ICE SM X11 Xmu Xpm Xt c m pthread-stubs xcb z

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mcj/}

--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2009/08/10 06:31:45 kili Exp $
+# $OpenBSD: Makefile,v 1.43 2010/04/24 20:18:39 naddy Exp $

 COMMENT=		simple paint program

 DISTNAME=		xpaint-2.7.8.1
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		graphics x11

 HOMEPAGE=		http://sf-xpaint.sourceforge.net/
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c m \
+WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m \
 			pthread-stubs xcb z

 FAKE=			lib
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2009/08/10 06:32:05 kili Exp $
+# $OpenBSD: Makefile,v 1.20 2010/04/24 20:18:39 naddy Exp $

 COMMENT-canna=		X input method for Japanese, canna support
 COMMENT-canna-wnn=	X input method for Japanese, canna and wnn support
 COMMENT-wnn=		X input method for Japanese, wnn support

 DISTNAME=	kinput2-v3
-PKGNAME=	ja-kinput2-3.0p1
+PKGNAME=	ja-kinput2-3.0p2
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/
 CATEGORIES=	japanese x11

@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c pthread-stubs xcb

 MAINTAINER=	SUZUKI Hitoshi <sigh@kuzirabekon.econ.nagasaki-u.ac.jp>

--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2009/08/10 06:32:05 kili Exp $
+# $OpenBSD: Makefile,v 1.27 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	Japanese-capable xterm

 VERSION=	6.2.0
 DISTNAME=	kterm-${VERSION}
-PKGNAME=	ja-kterm-${VERSION}p4
+PKGNAME=	ja-kterm-${VERSION}p5
 CATEGORIES=	japanese x11

 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt curses c \
+WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt curses c \
 		pthread-stubs util xcb

 MASTER_SITES0=	ftp://ftp.kame.net/pub/kame/misc/
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2009/08/10 06:32:43 kili Exp $
+# $OpenBSD: Makefile,v 1.31 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	mail image display for X11

 DISTNAME=	xfaces-3.3
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 CATEGORIES=	mail

 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/xfaces/ \
@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP=	No
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	No

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c m \
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m \
 		pthread-stubs xcb

 LIB_DEPENDS=	compface::mail/faces
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2009/08/10 06:32:43 kili Exp $
+# $OpenBSD: Makefile,v 1.20 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	display from/subject from incoming mails using X11

 DISTNAME=	xlbiff-3.0
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	mail x11

 MASTER_SITES=	${MASTER_SITE_R5CONTRIB}
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c pthread-stubs \
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs \
 		xcb

 CONFIGURE_STYLE=imake
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.27 2009/12/16 14:46:57 kili Exp $
+# $OpenBSD: Makefile,v 1.28 2010/04/24 20:18:39 naddy Exp $
 # $FreeBSD: ports/math/grace/Makefile,v 1.18 2001/04/25 05:59:19 lkoeller Exp $
 # Original from: Lars Koeller <Lars.Koeller@Uni-Bielefeld.de>

 COMMENT=	GRaphing, Advanced Computation and Exploration of data

 DISTNAME=	grace-5.1.15
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	math

 HOMEPAGE=	http://plasma-gate.weizmann.ac.il/Grace/
@ -49,7 +49,7 @@ ERRORS+=	"Fatal: Flavors 'no_x11' and 'xmhtml' are mutually exclusive."
 REGRESS_IS_INTERACTIVE=	x11
 USE_X11=		Yes
 USE_MOTIF=		openmotif
-WANTLIB+=		ICE SM X11 Xext Xmu Xp Xpm Xt
+WANTLIB+=		ICE SM X11 Xext Xmu Xpm Xt
 .  if ${FLAVOR:L:Mxmhtml}
 LIB_DEPENDS+=		XmHTML.>=1::www/xmhtml
 CONFIGURE_ARGS+=	--enable-xmhtml
--- a/misc/gpsd/Makefile
+++ b/misc/gpsd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2009/12/16 14:59:40 kili Exp $
+# $OpenBSD: Makefile,v 1.32 2010/04/24 20:18:39 naddy Exp $

 COMMENT-main=		service daemon that monitors one or more GPSes
 COMMENT-motif=		motif-based test apps using gpsd
@ -8,7 +8,7 @@ COMMENT-python=		python bindings for gpsd
 VERSION=		2.38
 DISTNAME=		gpsd-${VERSION}
 PKGNAME-main=		gpsd-${VERSION}p0
-PKGNAME-motif=		gpsd-motif-${VERSION}p2
+PKGNAME-motif=		gpsd-motif-${VERSION}p3
 PKGNAME-php=		gpsd-php-${VERSION}
 PKGNAME-python=		gpsd-python-${VERSION}p1
 SHARED_LIBS=		gps	18.0
@ -45,7 +45,7 @@ BUILD_DEPENDS=		::textproc/libxslt \
 CONFIGURE_ARGS+=	--without-x
 .else
 MULTI_PACKAGES+=	-motif
-WANTLIB-motif=		ICE Xaw8 Xau Xdmcp Xext Xft Xmu Xp Xpm Xrender X11 SM Xt \
+WANTLIB-motif=		ICE Xaw7 Xau Xdmcp Xext Xft Xmu Xpm Xrender X11 SM Xt \
 			c m pthread expat fontconfig freetype iconv jpeg png \
 			pthread-stubs xcb z
 LIB_DEPENDS-motif=	Xm::x11/openmotif gps::misc/gpsd
--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/10 06:33:02 kili Exp $
+# $OpenBSD: Makefile,v 1.21 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	X11 viewer for text files

 DISTNAME=	xless-1.7
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	misc	

 PERMIT_PACKAGE_CDROM=	Yes
@ -11,7 +11,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xpm Xt c pthread-stubs xcb

 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/} \
 		ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
--- a/misc/xtimer/Makefile
+++ b/misc/xtimer/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2009/08/10 06:33:02 kili Exp $
+# $OpenBSD: Makefile,v 1.20 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	super simple digital timer for X11

 DISTNAME=	xtimer-8089
-PKGNAME=	xtimer-0.8089p1
+PKGNAME=	xtimer-0.8089p2
 CATEGORIES=	misc

 MASTER_SITES=	http://www.bsddiary.net/xtimer/
@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs xcb

 CONFIGURE_STYLE=imake
 USE_X11=	Yes
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/04/10 13:42:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2010/04/24 20:18:39 naddy Exp $

 COMMENT-gui =		enhanced TightVNC client GUI and wrappers
 COMMENT-main =		enhanced TightVNC client
@ -8,7 +8,7 @@ V =			1.0.26
 DISTNAME =		ssvnc-$V.src
 PKGNAME =		ssvnc-$V
 FULLPKGNAME-gui =	ssvnc-$Vp1
-FULLPKGNAME-main =	ssvnc-viewer-$V
+FULLPKGNAME-main =	ssvnc-viewer-$Vp0

 CATEGORIES =		net x11

@ -35,7 +35,7 @@ NO_REGRESS =	Yes

 MODULES =	x11/tk

-WANTLIB-main =		ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xmu Xp Xt c z
+WANTLIB-main =		ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xmu Xt c z
 LIB_DEPENDS-main =	jpeg.>=62.::graphics/jpeg

 WANTLIB-gui =		c crypto
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2009/10/26 17:33:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2010/04/24 20:18:39 naddy Exp $

 COMMENT-main=	cross-platform remote desktop access
 COMMENT-viewer=	client for cross-platform remote desktop access

 VERSION=	1.3.10
 PKGNAME-main=	tightvnc-${VERSION}
-PKGNAME-viewer=	tightvnc-viewer-${VERSION}
+PKGNAME-viewer=	tightvnc-viewer-${VERSION}p0
 DISTNAME=	tightvnc-${VERSION}_unixsrc
 CATEGORIES=	net

@ -35,7 +35,7 @@ NO_REGRESS=	Yes

 WANTLIB=		X11 Xau Xdmcp Xext c z

-WANTLIB-viewer=		${WANTLIB} ICE SM Xaw Xmu Xp Xpm Xt 
+WANTLIB-viewer=		${WANTLIB} ICE SM Xaw Xmu Xpm Xt 
 LIB_DEPENDS-viewer=	jpeg.>=62.::graphics/jpeg

 WANTLIB-main=		${WANTLIB} m
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2009/08/10 06:33:44 kili Exp $
+# $OpenBSD: Makefile,v 1.18 2010/04/24 20:18:39 naddy Exp $
 # $FreeBSD: Makefile,v 1.12 1996/12/01 01:23:22 obrien Exp $

 COMMENT=	X11 front-end program for the archie network search service

 DISTNAME=	xarchie-2.0.10
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	net

 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs xcb

 CONFIGURE_STYLE=imake
 USE_X11=	Yes
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2010/04/15 13:27:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	X11 front-end for ghostscript

 DISTNAME=	ghostview-1.5
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	print

 MASTER_SITES=	${MASTER_SITE_GNU:=ghostview/}
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt c m pthread-stubs xcb
+WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c m pthread-stubs xcb

 RUN_DEPENDS=    :ghostscript-*:print/ghostscript/gnu

--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.31 2009/08/10 06:34:08 kili Exp $
+# $OpenBSD: Makefile,v 1.32 2010/04/24 20:18:39 naddy Exp $

 COMMENT= 	PostScript and PDF previewer

 DISTNAME=	gv-3.5.8
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	print

 HOMEPAGE=	http://wwwthep.physik.uni-mainz.de/~plass/gv/
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB += ICE SM X11 Xau Xdmcp Xext Xmu Xp Xpm Xt c m pthread-stubs xcb
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt c m pthread-stubs xcb

 LIB_DEPENDS=	Xaw3d.>=6.1::x11/Xaw3d
 RUN_DEPENDS=	:ghostscript-*:print/ghostscript/gnu
--- a/textproc/xpdf/Makefile
+++ b/textproc/xpdf/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.68 2009/12/16 14:00:23 kili Exp $
+# $OpenBSD: Makefile,v 1.69 2010/04/24 20:18:39 naddy Exp $

 COMMENT-main=	PDF viewer for X11
 COMMENT-utils=	PDF conversion tools

 DISTNAME=	xpdf-3.02
-PKGNAME-main=	xpdf-3.02.4
+PKGNAME-main=	xpdf-3.02.4p0
 PKGNAME-utils=	xpdf-utils-3.02.4
 CATEGORIES=	textproc x11

@ -43,7 +43,7 @@ RUN_DEPENDS-main=	${RUN_DEPENDS-utils} \
 			:${FULLPKGNAME-utils}:textproc/xpdf,-utils

 WANTLIB-utils=		c m pthread stdc++ z
-WANTLIB-main=		${WANTLIB-utils} ICE SM X11 Xext Xp Xpm Xt freetype
+WANTLIB-main=		${WANTLIB-utils} ICE SM X11 Xext Xpm Xt freetype

 NO_REGRESS=	Yes

--- a/www/amaya/browser/Makefile
+++ b/www/amaya/browser/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/10 06:34:56 kili Exp $
+# $OpenBSD: Makefile,v 1.21 2010/04/24 20:18:39 naddy Exp $
 #
 # Many variables moved to ../Makefile.inc

@ -6,14 +6,14 @@ COMMENT=		test-bed browser/authoring tool of the W3C

 AMAYA_VERSION=		5.1
 DISTNAME=		amaya-src-${AMAYA_VERSION}
-PKGNAME=		amaya-${AMAYA_VERSION}p4
+PKGNAME=		amaya-${AMAYA_VERSION}p5

 HOMEPAGE=		http://www.w3.org/Amaya/

 FLAVORS=		motif gtk
 FLAVOR?=		motif

-WANTLIB=		ICE SM X11 Xext Xp Xt c expat m pthread-stubs xcb z
+WANTLIB=		ICE SM X11 Xext Xt c expat m pthread-stubs xcb z

 USE_X11=		Yes

--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2008/02/01 21:38:26 steven Exp $
+# $OpenBSD: Makefile,v 1.27 2010/04/24 20:18:39 naddy Exp $

 COMMENT=	3D Athena Widget set that looks like Motif

 DISTNAME=	Xaw3d-1.5
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 SHARED_LIBS=	Xaw3d 11.0
 CATEGORIES=	x11

@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xext Xmu Xp Xpm Xt Xau Xdmcp
+WANTLIB=		ICE SM X11 Xext Xmu Xpm Xt Xau Xdmcp

 USE_X11=	Yes

--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.22 2010/04/15 14:34:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	quick start-up utility for applications on an X11 display

-PKGNAME=	bricons-3.0p1
+PKGNAME=	bricons-3.0p2
 DISTNAME=	bricons-athena-3.0
 CATEGORIES=	x11

@ -12,7 +12,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c

 MASTER_SITES=	${MASTER_SITE_R5CONTRIB}

--- a/x11/e17/e/Makefile
+++ b/x11/e17/e/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2010/04/24 15:10:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.19 2010/04/24 20:18:40 naddy Exp $

 COMMENT =		the enlightened window manager
 DISTNAME =		enlightenment-0.16.999.061
-PKGNAME =		${DISTNAME}p1v0
+PKGNAME =		${DISTNAME}p2v0

 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
@ -13,7 +13,7 @@ PERMIT_DISTFILES_FTP =	Yes
 MODULES =		devel/gettext

 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xinerama Xp Xrandr Xrender Xss Xtst c crypto dbus-1
+WANTLIB += Xinerama Xrandr Xrender Xss Xtst c crypto dbus-1
 WANTLIB += ecore ecore_con ecore_evas ecore_file ecore_imf ecore_imf_evas
 WANTLIB += ecore_input ecore_ipc ecore_job ecore_txt ecore_x eet
 WANTLIB += eina embryo evas expat fontconfig freetype jpeg m pthread
--- a/x11/e17/ecore/Makefile
+++ b/x11/e17/ecore/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2010/01/11 15:00:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2010/04/24 20:18:40 naddy Exp $

 COMMENT =		core event/X abstraction layer
 DISTNAME =		ecore-0.9.9.061
-PKGNAME =               ${DISTNAME}v0
+PKGNAME =               ${DISTNAME}p0v0

 SO_VERSION =		0.1
 # NOTE: Must bump minor version if any shlib's are removed from the
@ -21,7 +21,7 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes

 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xinerama Xp Xrandr Xrender Xss Xtst c crypto eet eina
+WANTLIB += Xinerama Xrandr Xrender Xss Xtst c crypto eet eina
 WANTLIB += expat fontconfig freetype jpeg m pthread pthread-stubs
 WANTLIB += ssl xcb z

--- a/x11/e17/edje/Makefile
+++ b/x11/e17/edje/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2010/01/15 08:38:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2010/04/24 20:18:40 naddy Exp $

 COMMENT =		complex graphical design & layout library
 DISTNAME =		edje-0.9.92.061
-PKGNAME =		${DISTNAME}p0v0
+PKGNAME =		${DISTNAME}p1v0

 SHARED_LIBS +=		edje                 0.1 \
 			edje-ver-svn-02      0.1
@ -14,7 +14,7 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes

 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xinerama Xp Xrandr Xrender Xss Xtst c crypto eet eina
+WANTLIB += Xinerama Xrandr Xrender Xss Xtst c crypto eet eina
 WANTLIB += evas expat fontconfig freetype jpeg m pthread pthread-stubs
 WANTLIB += ssl xcb z

--- a/x11/emiclock/Makefile
+++ b/x11/emiclock/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2008/07/25 23:32:12 fgsch Exp $
+# $OpenBSD: Makefile,v 1.19 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	hyper-animated face analog clock for X11

 DISTNAME=	emiclock-2.0.2
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	x11

 MASTER_SITES=	http://download.vector.co.jp/pack/unix/personal/tokei/
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	may not modify/package
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_PACKAGE_CDROM=	may not modify/package

-WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xp Xpm Xt c m
+WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xpm Xt c m

 USE_X11=	Yes
 NO_REGRESS=	Yes
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2008/02/01 21:55:23 steven Exp $
+# $OpenBSD: Makefile,v 1.20 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	animate your root-cursor

 DISTNAME=	xaniroc
-PKGNAME=	xaniroc-1.02p0
+PKGNAME=	xaniroc-1.02p1
 CATEGORIES=	x11

 MASTER_SITES=	ftp://ftp.42.org/pub/orphan/
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	no license
 PERMIT_DISTFILES_CDROM=	no license
 PERMIT_DISTFILES_FTP=	no license

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c m
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m

 USE_X11=	Yes
 CONFIGURE_STYLE=	imake
--- a/x11/xbae/Makefile
+++ b/x11/xbae/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2009/12/16 15:09:19 kili Exp $
+# $OpenBSD: Makefile,v 1.9 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	Motif-based table widget

 DISTNAME=	xbae-4.60.4
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6

 SHARED_LIBS=	Xbae 4.60

@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xp Xpm Xrender Xt jpeg m png
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xpm Xrender Xt jpeg m png
 WANTLIB += expat fontconfig freetype z iconv pthread-stubs xcb

 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xbae/}
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2008/02/01 21:55:23 steven Exp $
+# $OpenBSD: Makefile,v 1.19 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	find color values by graphical color mixing

 DISTNAME=	xcoloredit
-PKGNAME=	xcoloredit-1.2p0
+PKGNAME=	xcoloredit-1.2p1
 CATEGORIES=	x11

 MASTER_SITES=	${MASTER_SITE_R5CONTRIB}
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c

 USE_X11=	Yes
 CONFIGURE_STYLE=	imake
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2008/06/13 05:11:35 matthieu Exp $
+# $OpenBSD: Makefile,v 1.21 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	display all (ok, most of) the colors in the universe

 DISTNAME=	xcolors
-PKGNAME=	xcolors-1.3p1
+PKGNAME=	xcolors-1.3p2
 CATEGORIES=	x11

 MASTER_SITES=	ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/ \
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xp Xpm Xt c m 
+WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xpm Xt c m 

 USE_X11=	Yes
 WRKDIST=	${WRKDIR}/xcolors
--- a/x11/xdu/Makefile
+++ b/x11/xdu/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2009/05/19 14:03:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2010/04/24 20:18:40 naddy Exp $

 COMMENT=		graphic disk usage viewer

 DISTNAME=		xdu-3.0
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=     	x11

 # custom
@ -12,7 +12,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xp Xpm Xt c
+WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c

 HOMEPAGE=		http://sd.wareonearth.com/~phil/xdu/

--- a/x11/xfm/Makefile
+++ b/x11/xfm/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2010/01/03 22:53:32 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	X11 File Manager

 DISTNAME=	xfm-1.4.3
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 CATEGORIES=	x11

 HOMEPAGE=	http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xmu Xp Xpm Xt c
+WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt c

 MASTER_SITES=	${HOMEPAGE}

--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2008/02/02 09:18:54 steven Exp $
+# $OpenBSD: Makefile,v 1.23 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	X11 image grabber

 DISTNAME=	xgrabsc.2_41
-PKGNAME=	xgrab-2.41p0
+PKGNAME=	xgrab-2.41p1
 CATEGORIES=	x11

 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=		ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt c
+WANTLIB=		ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c

 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2008/02/02 09:18:54 steven Exp $
+# $OpenBSD: Makefile,v 1.18 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	simple logout button

 DISTNAME=	xlogout-1.1
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	x11

 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt c 
+WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c 

 MASTER_SITES=	ftp://ftp.tu-darmstadt.de/pub/X11/other/
 EXTRACT_SUFX=	.tar.Z
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2008/02/02 09:18:54 steven Exp $
+# $OpenBSD: Makefile,v 1.20 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	moving mascot on your X11 screen

 DISTNAME=	xmascot2.6a
-PKGNAME=	xmascot-2.6ap0
+PKGNAME=	xmascot-2.6ap1
 CATEGORIES=	x11

 HOMEPAGE=	http://cclub-flying.dsl.gr.jp/products/xmascot/
@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP=	no license
 PERMIT_DISTFILES_CDROM=	no license
 PERMIT_DISTFILES_FTP=	no license

-WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt c m 
+WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c m 

 MASTER_SITES=	${HOMEPAGE}

--- a/x11/xmbdfed/Makefile
+++ b/x11/xmbdfed/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2009/12/20 22:09:44 kili Exp $
+# $OpenBSD: Makefile,v 1.20 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	Motif tool for editing X11 bitmap fonts

 VERSION=	4.7
 DISTNAME=	xmbdfed-${VERSION}
-PKGNAME=	${DISTNAME}.1p1
+PKGNAME=	${DISTNAME}.1p2
 CATEGORIES=	x11
 HOMEPAGE=	http://crl.nmsu.edu/~mleisher/xmbdfed.html

@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xext Xmu Xp Xpm Xt c freetype m z
+WANTLIB=		ICE SM X11 Xext Xmu Xpm Xt c freetype m z

 MASTER_SITES=	http://crl.nmsu.edu/~mleisher/
 EXTRACT_SUFX=	.tar.bz2
--- a/x11/xmbdfed/patches/patch-Makefile
+++ b/x11/xmbdfed/patches/patch-Makefile
@ -1,9 +1,9 @@
-$OpenBSD: patch-Makefile,v 1.3 2009/12/20 22:09:44 kili Exp $
+$OpenBSD: patch-Makefile,v 1.4 2010/04/24 20:18:40 naddy Exp $
 --- Makefile.orig	Tue Feb 17 16:24:06 2004
 +++ Makefile	Sun Apr  1 19:08:14 2007
@@ -22,8 +22,8 @@
 #
- # $Id: patch-Makefile,v 1.3 2009/12/20 22:09:44 kili Exp $
+ # $Id: patch-Makefile,v 1.4 2010/04/24 20:18:40 naddy Exp $
 #
 -CC = gcc
 -CFLAGS = -g -Wall
@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.3 2009/12/20 22:09:44 kili Exp $
 
 +INCS= -I${X11BASE}/include -I${LOCALBASE}/include ${FTYPE_INCS}
 +LIBS= -L${X11BASE}/lib -L${LOCALBASE}/lib \
-+      ${MOTIFLIB} -lm -lXp -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE ${FTYPE_LIBS}
+      ${MOTIFLIB} -lm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE ${FTYPE_LIBS}
 +
 all: xmbdfed
 
--- a/x11/xpostit/Makefile
+++ b/x11/xpostit/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2008/02/02 09:18:54 steven Exp $
+# $OpenBSD: Makefile,v 1.21 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	PostIt (R) messages onto your X11 screen

 DISTNAME=	xpostit3.3.1
-PKGNAME=	xpostit-3.3.1p0
+PKGNAME=	xpostit-3.3.1p1
 CATEGORIES=	x11

 # Not all servers archie could find actually still have it.  Alas, some
@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt c
+WANTLIB=	ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c

 USE_X11=	Yes
 CONFIGURE_STYLE=	imake
--- a/x11/xpostitPlus/Makefile
+++ b/x11/xpostitPlus/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2008/02/02 09:18:54 steven Exp $
+# $OpenBSD: Makefile,v 1.19 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	PostIt (R) messages onto your X11 screen

 DISTNAME=	XPostitPlus-2.3
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	x11

 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=office/}
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=		ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt c 
+WANTLIB=		ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c 

 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2008/02/02 09:18:54 steven Exp $
+# $OpenBSD: Makefile,v 1.6 2010/04/24 20:18:40 naddy Exp $

 COMMENT=	stylus character recognition tool for X11

 DISTNAME=	xscribble
-PKGNAME=	xscribble-20000616p2
+PKGNAME=	xscribble-20000616p3
 CATEGORIES=	x11

 HOMEPAGE=	http://www.handhelds.org/projects/xscribble.html
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	X11 Xau Xdmcp Xext ICE Xt Xtst Xmu c Xp m SM Xpm Xaw
+WANTLIB=	X11 Xau Xdmcp Xext ICE Xt Xtst Xmu c m SM Xpm Xaw

 MASTER_SITES=	ftp://ftp.handhelds.org/projects/xscribble/

--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2009/03/07 15:37:39 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2010/04/24 20:18:40 naddy Exp $

 COMMENT=		virtual keyboard for X Window System

 DISTNAME=		xvkbd-2.8
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		x11
 HOMEPAGE=		http://homepage3.nifty.com/tsato/xvkbd/

@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB += ICE SM X11 Xau Xdmcp Xext Xmu Xp Xpm Xt Xtst c
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt Xtst c

 MASTER_SITES=		${HOMEPAGE}