libXpm major is now 5. Also remove regexp support in preparation for

ELF conversion.
svn path=/head/; revision=13144
2024-11-27 00:57:50 +00:00 · 1998-09-15 11:13:39 +00:00 · 1998-09-15 11:13:39 +00:00 · 03d5b496f6 · 2021-03-31 03:12:20 +00:00
commit 03d5b496f6
parent 4cb2429954
137 changed files with 276 additions and 277 deletions
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@ -3,7 +3,7 @@
 # Date created:         Thu Aug  1 09:10:22 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1998/04/29 11:12:11 tg Exp $
+# $Id: Makefile,v 1.7 1998/06/06 22:56:17 jseger Exp $
 #

 DISTNAME=	xephem-3.1
@ -15,7 +15,7 @@ MASTER_SITES=	ftp://iraf.noao.edu/contrib/xephem/xephem-3.1/ \

 MAINTAINER=	erich@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5.:${PORTSDIR}/graphics/xpm

 REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@ -3,7 +3,7 @@
 # Date created:        11 July 1998
 # Whom:                Rich Neswold <rneswold@mcs.net>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/20 03:56:55 steve Exp $
 #

 DISTNAME=	wmmixer
@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	rneswold@mcs.net

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 FETCH_BEFORE_ARGS=	-t
 NO_INSTALL_MANPAGES=	1
--- a/audio/xtuner/Makefile
+++ b/audio/xtuner/Makefile
@ -3,7 +3,7 @@
 # Date created:		19 December 96
 # Whom:			Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/30 09:46:27 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/07 23:56:11 asami Exp $
 #

 DISTNAME=	Xtuner-2.1
@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE

 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	YES
 NO_INSTALL_MANPAGES=	YES
--- a/databases/xmbase-grok/Makefile
+++ b/databases/xmbase-grok/Makefile
@ -3,7 +3,7 @@
 # Date created:		Sat Aug 30 13:29:42 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1998/01/27 00:44:49 fenner Exp $
+# $Id: Makefile,v 1.4 1998/07/27 23:24:07 asami Exp $
 #

 DISTNAME=	xmbase-grok-1.3.2.sbin
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	apps/database/flatfile

 MAINTAINER=	andreas@FreeBSD.ORG

-LIB_DEPENDS=      Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm.5:${PORTSDIR}/graphics/xpm

 WRKSRC=		${WRKDIR}/${PKGNAME}
 REQUIRES_MOTIF=	yes
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@ -3,7 +3,7 @@
 # Date created:			Tue Sep  2 15:46:09 CEST 1997
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1998/08/07 23:56:13 asami Exp $
+# $Id: Makefile,v 1.7 1998/09/06 19:24:48 andreas Exp $
 #

 DISTNAME=	xmysql-1.8
@ -15,7 +15,7 @@ MASTER_SITES=	http://www.tcx.se/Contrib/ \
 MAINTAINER=	andreas@FreeBSD.ORG

 BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql321
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms

 USE_X_PREFIX=	yes
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@ -3,7 +3,7 @@
 # Date created:			Di   2 Sep 1997 16:29:27 CEST
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.7 1998/08/07 23:56:13 asami Exp $
+# $Id: Makefile,v 1.8 1998/09/06 19:25:20 andreas Exp $
 #

 DISTNAME=	xmysqladmin-0.4.4
@ -16,7 +16,7 @@ MASTER_SITES=	http://www.tcx.se/Contrib/ \
 MAINTAINER=	andreas@FreeBSD.ORG

 BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql321
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms

 WRKSRC=		${WRKDIR}/xmysqladmin
--- a/deskutils/xinvest/Makefile
+++ b/deskutils/xinvest/Makefile
@ -3,7 +3,7 @@
 # Date created:		1 Ag 1997
 # Whom:			Pedro Giffuni (orig)
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/17 10:11:29 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/07 22:17:54 asami Exp $
 #

 DISTNAME=	xinvest-2.5.1
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= applications

 MAINTAINER=	ports@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@ -3,7 +3,7 @@
 # Date created:		18 November 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.3 1998/05/15 05:13:47 mph Exp $
+# $Id: Makefile,v 1.4 1998/05/25 21:02:56 fenner Exp $
 #

 DISTNAME=	cooledit-3.6.2
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	apps/editors/X

 MAINTAINER=	brett@peloton.physics.montana.edu

-LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mail-author --disable-static
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@ -3,7 +3,7 @@
 # Date created:				7 April 1996
 # Whom:	Daniel Eischen <deischen@iworks.InterWorks.org>
 #
-# $Id: Makefile,v 1.12 1998/07/28 06:34:31 hoek Exp $
+# $Id: Makefile,v 1.13 1998/08/05 09:30:49 asami Exp $
 #

 DISTNAME=	nedit-5.0.2
@ -14,7 +14,7 @@ DISTFILES=	nedit_source.tar.gz nedit.app-defaults

 MAINTAINER=	deischen@iworks.InterWorks.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 REQUIRES_MOTIF=	yes
 USE_X_PREFIX=	yes
--- a/editors/offix-editor/Makefile
+++ b/editors/offix-editor/Makefile
@ -3,7 +3,7 @@
 # Date created:      28 Jun 1997
 # Whom:              Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/06 12:18:24 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:30:49 asami Exp $
 #

 DISTNAME=	Editor-2.4
@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	desktop_managers/OffiX
 MAINTAINER=	ruslan@shevchenko.kiev.ua

 LIB_DEPENDS=	Dnd\\.1\\.:${PORTSDIR}/x11/libdnd \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
--- a/editors/xed/Makefile
+++ b/editors/xed/Makefile
@ -3,7 +3,7 @@
 # Date created:		28 Jul 1996
 # Whom:			shanee
 #
-# $Id: Makefile,v 1.6 1997/10/26 23:57:10 fenner Exp $
+# $Id: Makefile,v 1.7 1998/07/27 23:24:16 asami Exp $
 #

 DISTNAME=	xed1.3
@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z

 MAINTAINER=	shanee@augusta.de

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 XMKMF=		xmkmf
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.15 1998/06/03 19:29:58 gj Exp $
+# $Id: Makefile,v 1.16 1998/06/04 19:21:46 gj Exp $
 #

 DISTNAME=	xemacs-20.4
@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MULEDISTFILE}

 MAINTAINER=	me@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png

--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.15 1998/06/03 19:29:58 gj Exp $
+# $Id: Makefile,v 1.16 1998/06/04 19:21:46 gj Exp $
 #

 DISTNAME=	xemacs-20.4
@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MULEDISTFILE}

 MAINTAINER=	me@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png

--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.15 1998/06/03 19:29:58 gj Exp $
+# $Id: Makefile,v 1.16 1998/06/04 19:21:46 gj Exp $
 #

 DISTNAME=	xemacs-20.4
@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MULEDISTFILE}

 MAINTAINER=	me@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png

--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@ -3,7 +3,7 @@
 # Date created:		5 Dec 1997
 # Whom:			Kazuyuki IENAGA <ienaga@jsys.co.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/26 15:00:21 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/08/17 09:35:02 hoek Exp $
 #

 DISTNAME=	xemacs-20.4
@ -19,7 +19,7 @@ DISTFILES+=	xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \
 MAINTAINER?=	kiri@kiri.toba-cmt.ac.jp

 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
 		compface\\.1\\.:${PORTSDIR}/mail/faces \
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.15 1998/06/03 19:29:58 gj Exp $
+# $Id: Makefile,v 1.16 1998/06/04 19:21:46 gj Exp $
 #

 DISTNAME=	xemacs-20.4
@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MULEDISTFILE}

 MAINTAINER=	me@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png

--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@ -3,7 +3,7 @@
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
 #
-# $Id: Makefile,v 1.58 1998/06/07 21:56:05 se Exp $
+# $Id: Makefile,v 1.59 1998/07/27 23:24:20 asami Exp $
 #

 DATE=		980517
@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	ALPHA/wine/development

 MAINTAINER=	se@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 WRKSRC=		${WRKDIR}/wine${DATE}
 GNU_CONFIGURE=	yes
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@ -3,7 +3,7 @@
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
 #
-# $Id: Makefile,v 1.58 1998/06/07 21:56:05 se Exp $
+# $Id: Makefile,v 1.59 1998/07/27 23:24:20 asami Exp $
 #

 DATE=		980517
@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	ALPHA/wine/development

 MAINTAINER=	se@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 WRKSRC=		${WRKDIR}/wine${DATE}
 GNU_CONFIGURE=	yes
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@ -3,7 +3,7 @@
 # Date created:         8 Feb 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1998/07/09 14:40:58 dburr Exp $
+# $Id: Makefile,v 1.4 1998/07/09 14:43:10 dburr Exp $
 #

 DISTNAME=	xmame-0.33b6.1
@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	dburr@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	YES
 MAKEFILE=	makefile.unix
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@ -3,7 +3,7 @@
 # Date created:		1 Ag 1997
 # Whom:			Pedro Giffuni (orig)
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/17 10:11:29 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/07 22:17:54 asami Exp $
 #

 DISTNAME=	xinvest-2.5.1
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= applications

 MAINTAINER=	ports@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@ -3,7 +3,7 @@
 # Date created:		4 Jan 1998
 # Whom:			Ian Struble <ian@broken.net>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/04/22 14:07:50 mph Exp $

 DISTNAME=	xquote-1.1
 CATEGORIES=	misc
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= applications

 MAINTAINER=	mph@freebsd.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 REQUIRES_MOTIF=		yes

--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@ -3,7 +3,7 @@
 # Date created:				2 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:30:51 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/07 23:56:19 asami Exp $
 #

 DISTNAME=		3Dc-0.8.1
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	games/strategy

 MAINTAINER=		andy@icc.surw.chel.su

-LIB_DEPENDS=		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=		Xpm.5:${PORTSDIR}/graphics/xpm \
 			Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d

 USE_X_PREFIX=		yes
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.21 1998/05/08 13:59:14 andreas Exp $
+# $Id: Makefile,v 1.22 1998/08/31 18:58:30 andreas Exp $
 #

 DISTNAME=	crossfire-${MAJ}.${MIN}.${PL}
@ -21,7 +21,7 @@ DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 MAINTAINER=	andreas@FreeBSD.ORG

 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.21 1998/05/08 13:59:14 andreas Exp $
+# $Id: Makefile,v 1.22 1998/08/31 18:58:30 andreas Exp $
 #

 DISTNAME=	crossfire-${MAJ}.${MIN}.${PL}
@ -21,7 +21,7 @@ DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 MAINTAINER=	andreas@FreeBSD.ORG

 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.21 1998/05/08 13:59:14 andreas Exp $
+# $Id: Makefile,v 1.22 1998/08/31 18:58:30 andreas Exp $
 #

 DISTNAME=	crossfire-${MAJ}.${MIN}.${PL}
@ -21,7 +21,7 @@ DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 MAINTAINER=	andreas@FreeBSD.ORG

 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@ -3,7 +3,7 @@
 # Date created:		Jun 20 1997
 # Whom:			ada@bsd.org
 #
-# $Id: Makefile,v 1.9 1998/06/10 18:54:36 mph Exp $
+# $Id: Makefile,v 1.10 1998/08/19 03:27:11 jseger Exp $
 #

 DISTNAME=	freeciv-1.7.0
@ -12,7 +12,7 @@ MASTER_SITES=	ftp://www.freeciv.org/pub/freeciv/

 MAINTAINER=	ada@bsd.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=      	yes
 NO_INSTALL_MANPAGES=	yes
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@ -3,7 +3,7 @@
 # Date created:		Jun 20 1997
 # Whom:			ada@bsd.org
 #
-# $Id: Makefile,v 1.9 1998/06/10 18:54:36 mph Exp $
+# $Id: Makefile,v 1.10 1998/08/19 03:27:11 jseger Exp $
 #

 DISTNAME=	freeciv-1.7.0
@ -12,7 +12,7 @@ MASTER_SITES=	ftp://www.freeciv.org/pub/freeciv/

 MAINTAINER=	ada@bsd.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=      	yes
 NO_INSTALL_MANPAGES=	yes
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@ -3,7 +3,7 @@
 # Date created:				13 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.3 1998/07/27 23:24:42 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/05 09:30:56 asami Exp $
 #

 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src
@ -13,7 +13,7 @@ MASTER_SITES=		ftp://ftp.devolution.com/pub/maelstrom/

 MAINTAINER=		andy@icc.surw.chel.su

-LIB_DEPENDS=		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=		Xpm.5:${PORTSDIR}/graphics/xpm

 USE_X_PREFIX=		yes
 WRKSRC=			${WRKDIR}/Maelstrom
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@ -3,7 +3,7 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1998/08/12 06:29:28 asami Exp $
+# $Id: Makefile,v 1.17 1998/08/23 21:20:06 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -23,7 +23,7 @@ BROKEN=		qt version?

 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas

 USE_QT=		yes
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1997/07/12 16:53:36 max Exp $
+# $Id: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack3-tty/Makefile
+++ b/games/nethack3-tty/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1997/07/12 16:53:36 max Exp $
+# $Id: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack3/Makefile
+++ b/games/nethack3/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1997/07/12 16:53:36 max Exp $
+# $Id: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1997/07/12 16:53:36 max Exp $
+# $Id: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1997/07/12 16:53:36 max Exp $
+# $Id: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@ -3,7 +3,7 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1998/08/12 06:29:28 asami Exp $
+# $Id: Makefile,v 1.17 1998/08/23 21:20:06 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -23,7 +23,7 @@ BROKEN=		qt version?

 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas

 USE_QT=		yes
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1997/07/12 16:53:36 max Exp $
+# $Id: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1997/07/12 16:53:36 max Exp $
+# $Id: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@ -3,7 +3,7 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1998/08/12 06:29:28 asami Exp $
+# $Id: Makefile,v 1.17 1998/08/23 21:20:06 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -23,7 +23,7 @@ BROKEN=		qt version?

 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas

 USE_QT=		yes
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1997/07/12 16:53:36 max Exp $
+# $Id: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/wmtimebomb/Makefile
+++ b/games/wmtimebomb/Makefile
@ -3,7 +3,7 @@
 # Date created:		10 August 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/08/10 07:57:57 tg Exp $

 DISTNAME=	wmtimebomb.6
 PKGNAME=	wmtimebomb-0.1.6
@ -12,7 +12,7 @@ MASTER_SITES=	http://www.gpf.or.th/~mhz/wmtimebomb/

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm
 BUILD_DEPENDS=	${PREFIX}/lib/libWMaker.a:${PORTSDIR}/x11-wm/windowmaker

 WRKSRC=		${WRKDIR}/wmtimebomb
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@ -3,7 +3,7 @@
 # Date created:		12 September 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.5 1997/12/25 22:29:18 asami Exp $
+# $Id: Makefile,v 1.6 1998/07/28 00:39:25 obrien Exp $
 #

 DISTNAME=	xbill-2.0
@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	obrien@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes

--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@ -3,7 +3,7 @@
 # Date created:		31 January 1995
 # Whom:			janek
 #
-# $Id: Makefile,v 1.8 1997/01/03 09:37:00 obrien Exp $
+# $Id: Makefile,v 1.9 1997/11/26 19:12:54 vanilla Exp $

 DISTNAME=	xboing2.4
 PKGNAME=	xboing-2.4
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	games

 MAINTAINER=	janek@gaja.ipan.lublin.pl

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 WRKSRC= ${WRKDIR}/xboing
--- a/games/xcogitate/Makefile
+++ b/games/xcogitate/Makefile
@ -3,7 +3,7 @@
 # Date created:				15 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.3 1998/07/27 23:24:53 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/05 09:30:58 asami Exp $
 #

 DISTNAME=	xcogitate-1.02
@ -12,7 +12,7 @@ MASTER_SITES=	http://www.freebsd.org/~mph/distfiles/

 MAINTAINER=	andy@icc.surw.chel.su

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/XCOGITATE_SOURCE
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@ -3,7 +3,7 @@
 # Date created:         2 Jun 1998
 # Whom:                 Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id: Makefile,v 1.2 1998/07/05 23:08:31 steve Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:30:58 asami Exp $
 #

 DISTNAME=	xconq-7.2.2
@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.cygnus.com/pub/xconq/

 MAINTAINER=	croyle@gelemna.ft-wayne.in.us

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@ -3,7 +3,7 @@
 # Date created:        28 December 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/07/02 13:00:23 tg Exp $
 #

 DISTNAME=	xdeblo_v1.0
@ -14,7 +14,7 @@ DISTFILES=	xdeblock.tgz

 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
--- a/games/xeyesplus/Makefile
+++ b/games/xeyesplus/Makefile
@ -3,7 +3,7 @@
 # Date created:         20 Oct 1996
 # Whom:                 Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.4 1997/01/03 09:37:12 obrien Exp $
+# $Id: Makefile,v 1.5 1997/04/02 01:51:11 fenner Exp $
 #

 DISTNAME=		xeyes+2.01
@ -13,7 +13,7 @@ MASTER_SITES=		ftp://ftp.eos.hokudai.ac.jp/pub/X11/contrib/misc/

 MAINTAINER=		nakai@mlab.t.u-tokyo.ac.jp

-LIB_DEPENDS=		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=		Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 August 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1998/05/28 07:39:14 tg Exp $
+# $Id: Makefile,v 1.8 1998/08/05 09:30:59 asami Exp $
 #

 DISTNAME=	xgalaga-2.0
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	games

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 HAS_CONFIGURE=	yes
 USE_X_PREFIX=	yes
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@ -3,7 +3,7 @@
 # Date created:		09 January 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1997/02/21 15:41:27 tg Exp $
+# $Id: Makefile,v 1.5 1998/08/05 09:30:59 asami Exp $
 #

 DISTNAME=	xminehunter-0.4
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	games

 MAINTAINER=	tg@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xminehunter
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@ -3,7 +3,7 @@
 # Date created:				2 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.3 1998/07/27 23:25:09 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/05 09:31:00 asami Exp $
 #

 DISTNAME=	xnibbles-1.0BETA3
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.tjhsst.edu/xnibbles/

 MAINTAINER=	andy@icc.surw.chel.su

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 ALL_TARGET=	linux
 USE_GMAKE=	yes
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@ -3,7 +3,7 @@
 # Date created:				16 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/07/27 23:25:12 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/25 00:44:06 asami Exp $
 #

 DISTNAME=		xoids-1.5
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	games

 MAINTAINER=		andy@icc.surw.chel.su

-LIB_DEPENDS=		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=		Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=		yes
 MAN6=			xoids.6
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@ -3,7 +3,7 @@
 # Date created:		3 May 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.3 1995/09/23 08:52:40 joerg Exp $
+# $Id: Makefile,v 1.4 1996/11/18 11:26:23 asami Exp $
 #

 DISTNAME=	xonix-1.4
@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.inf.tu-dresden.de/pub/people/wunsch/xonix/

 MAINTAINER=	joerg@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=      yes

--- a/games/xpuzzletama/Makefile
+++ b/games/xpuzzletama/Makefile
@ -3,7 +3,7 @@
 # Date created:        18 January 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/05 12:27:38 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/05 12:31:09 asami Exp $
 #

 DISTNAME=	xpuzzletama
@ -14,7 +14,7 @@ DISTFILES=	PuzzleTama-ver1.5.tar.gz

 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp

-LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm.5:${PORTSDIR}/graphics/xpm

 CONFIGURE_ENV=  X11BASE=${X11BASE}
 USE_IMAKE=      yes
--- a/games/xquarto/Makefile
+++ b/games/xquarto/Makefile
@ -3,7 +3,7 @@
 # Date created:				9 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/13 09:32:01 tg Exp $
+# $Id: Makefile,v 1.2 1998/07/27 23:25:20 asami Exp $
 #

 DISTNAME=	xquarto-1.0
@ -12,13 +12,12 @@ MASTER_SITES=	http://www.math.kth.se/~mjo/games/xquarto/

 MAINTAINER=	andy@icc.surw.chel.su

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 MAN6=		xquarto.6

-do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/src/xquarto ${PREFIX}/bin
-	@ ${INSTALL_DATA} ${WRKSRC}/src/xquarto.man ${PREFIX}/man/man6/xquarto.6
+pre-configure:
+	@echo "MANSUFFIX=6" >>${WRKSRC}/src/Imakefile

 .include <bsd.port.mk>
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@ -3,7 +3,7 @@
 # Date created:		27 July 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/08/04 11:45:49 tg Exp $
 #

 DISTNAME=	xscrabble
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.belgarath.demon.co.uk/programs/

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@ -3,7 +3,7 @@
 # Date created:               9 Oct 1996
 # Whom:                 Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.7 1997/11/20 02:10:57 fenner Exp $
+# $Id: Makefile,v 1.8 1998/08/05 09:31:02 asami Exp $
 #

 DISTNAME=       xshisen-1.36
@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.win.or.jp/pub/doc-sources/fj.sources/1996/feb/

 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 # runs fine on ssh connection
 #IS_INTERACTIVE=	YES	# Has to create an app-defaults file
--- a/games/xsok/Makefile
+++ b/games/xsok/Makefile
@ -3,7 +3,7 @@
 # Date created:         07 Feb 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/02/09 08:10:57 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:31:02 asami Exp $
 #

 DISTNAME=       xsok-1.02
@ -15,7 +15,7 @@ EXTRACT_SUFX=	-src.tar.gz

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_X_PREFIX=	yes
 MAN6=		xsok.6x
--- a/games/xsokoban/Makefile
+++ b/games/xsokoban/Makefile
@ -3,7 +3,7 @@
 # Date created:        16 November 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.2 1996/11/20 12:38:49 asami Exp $
+# $Id: Makefile,v 1.3 1998/04/18 12:45:08 itojun Exp $
 #

 DISTNAME=	xsokoban-3.3c
@ -12,7 +12,7 @@ MASTER_SITES=   ftp://ftp.pmg.lcs.mit.edu/pub/xsokoban/

 MAINTAINER=     Nakai@technologist.com

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xsokoban
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@ -3,7 +3,7 @@
 # Date created:		22 January 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/02/13 18:38:09 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/07/27 23:25:28 asami Exp $
 #

 DISTNAME=	xsoldier-0.96
@ -12,7 +12,7 @@ MASTER_SITES=	http://www.surfline.ne.jp/hachi/xsoldier/

 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@ -3,7 +3,7 @@
 # Date created:        3 June 1998
 # Whom:                Eckart "Isegrim" Hofmann
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/30 13:16:13 ghelmer Exp $
+# $Id: Makefile,v 1.2 1998/07/02 00:39:00 asami Exp $
 #

 DISTNAME=	xteddy-1.0
@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.leo.org:/pub/comp/usenet/comp.sources.x/xteddy/

 MAINTAINER=	Isegrim@Wunder-Nett.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 NO_CDROM=	"Can only be distributed for free"

--- a/graphics/aero/Makefile
+++ b/graphics/aero/Makefile
@ -3,7 +3,7 @@
 # Date created:         Mon Aug 28 13:35:31 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.9 1998/08/05 09:31:07 asami Exp $
+# $Id: Makefile,v 1.10 1998/08/07 23:56:24 asami Exp $
 #

 DISTNAME=	aero_1.7.0_src
@ -15,7 +15,7 @@ MAINTAINER=	erich@FreeBSD.org

 BUILD_DEPENDS=	${X11BASE}/lib/libfwf.a:${PORTSDIR}/x11-toolkits/FWF
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray
-LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm.5:${PORTSDIR}/graphics/xpm

 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/aero/src
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@ -3,7 +3,7 @@
 # Date created:		Sun Sep  7 17:55:07 EDT 1997
 # Whom:			Randall Hopper <rhh@ct.picker.com>
 #
-# $Id: Makefile,v 1.8 1998/08/07 23:56:24 asami Exp $
+# $Id: Makefile,v 1.9 1998/09/14 20:10:51 markm Exp $
 #

 DISTNAME=	fxtv-0.47
@ -15,7 +15,7 @@ MAINTAINER=	rhh@ct.picker.com

 LIB_DEPENDS=	tiff34.1:${PORTSDIR}/graphics/tiff34 \
 		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d    \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 # This program does not actually depend on the below, but they are pretty
 # useful if you are into digital video recording and playback.
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
+# $Id: Makefile,v 1.37 1998/08/07 23:56:25 asami Exp $
 #

 DISTNAME=	gimp-1.0.0
@ -15,7 +15,7 @@ DISTFILES=	gimp-1.0.0.tar.gz gimp-data-extras-1.0.0.tar.gz

 MAINTAINER=	erich@FreeBSD.org

-LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	Xpm.5:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
+# $Id: Makefile,v 1.37 1998/08/07 23:56:25 asami Exp $
 #

 DISTNAME=	gimp-1.0.0
@ -15,7 +15,7 @@ DISTFILES=	gimp-1.0.0.tar.gz gimp-data-extras-1.0.0.tar.gz

 MAINTAINER=	erich@FreeBSD.org

-LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	Xpm.5:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
+# $Id: Makefile,v 1.37 1998/08/07 23:56:25 asami Exp $
 #

 DISTNAME=	gimp-1.0.0
@ -15,7 +15,7 @@ DISTFILES=	gimp-1.0.0.tar.gz gimp-data-extras-1.0.0.tar.gz

 MAINTAINER=	erich@FreeBSD.org

-LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	Xpm.5:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
+# $Id: Makefile,v 1.37 1998/08/07 23:56:25 asami Exp $
 #

 DISTNAME=	gimp-1.0.0
@ -15,7 +15,7 @@ DISTFILES=	gimp-1.0.0.tar.gz gimp-data-extras-1.0.0.tar.gz

 MAINTAINER=	erich@FreeBSD.org

-LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	Xpm.5:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
+# $Id: Makefile,v 1.37 1998/08/07 23:56:25 asami Exp $
 #

 DISTNAME=	gimp-1.0.0
@ -15,7 +15,7 @@ DISTFILES=	gimp-1.0.0.tar.gz gimp-data-extras-1.0.0.tar.gz

 MAINTAINER=	erich@FreeBSD.org

-LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	Xpm.5:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.36 1998/08/05 09:31:09 asami Exp $
+# $Id: Makefile,v 1.37 1998/08/07 23:56:25 asami Exp $
 #

 DISTNAME=	gimp-1.0.0
@ -15,7 +15,7 @@ DISTFILES=	gimp-1.0.0.tar.gz gimp-data-extras-1.0.0.tar.gz

 MAINTAINER=	erich@FreeBSD.org

-LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+=	Xpm.5:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@ -3,7 +3,7 @@
 # Date created:		19 February 1995
 # Whom:			jmz
 #
-# $Id: Makefile,v 1.7 1995/04/11 02:00:42 jmz Exp $
+# $Id: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp $
 #

 DISTNAME=	pixmap2.6
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	applications/pixmap

 MAINTAINER=	jmz@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 WRKSRC=		${WRKDIR}/pixmap
 USE_IMAKE=	yes
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@ -3,7 +3,7 @@
 # Date created:		06 September 1995
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1996/11/18 09:53:47 asami Exp $
+# $Id: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp $
 #

 DISTNAME=	xbmbrowser5.1
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	utilities

 MAINTAINER=	tg@FreeBSD.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 USE_GMAKE=	yes
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@ -3,7 +3,7 @@
 # Date created:		4 January 1995
 # Whom:			roberto
 #
-# $Id: Makefile,v 1.20 1998/07/06 08:45:11 thepish Exp $
+# $Id: Makefile,v 1.21 1998/08/07 23:56:27 asami Exp $
 #

 DISTNAME=	xfig.3.2.2
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	applications/drawing_tools/xfig

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
 RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@ -3,7 +3,7 @@
 # Date created:		4 January 1995
 # Whom:			roberto
 #
-# $Id: Makefile,v 1.20 1998/07/06 08:45:11 thepish Exp $
+# $Id: Makefile,v 1.21 1998/08/07 23:56:27 asami Exp $
 #

 DISTNAME=	xfig.3.2.2
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	applications/drawing_tools/xfig

 MAINTAINER=	ports@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
 RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@ -3,7 +3,7 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.20 1998/04/17 00:54:06 jseger Exp $
+# $Id: Makefile,v 1.21 1998/05/04 20:23:30 jseger Exp $
 #

 DISTNAME=       xpaint-2.5.4
@ -14,7 +14,7 @@ MAINTAINER=	jseger@FreeBSD.org

 LIB_DEPENDS=    jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm   \
+		Xpm.5:${PORTSDIR}/graphics/xpm   \
 		png\\.2\\.:${PORTSDIR}/graphics/png

 WRKSRC=		${WRKDIR}/xpaint
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@ -3,7 +3,7 @@
 # Date created:         02 Feb 1996
 # Whom:                 chuckr@glue.umd.edu
 #
-# $Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp $
+# $Id: Makefile,v 1.13 1998/08/05 09:31:17 asami Exp $
 #

 DISTNAME=       xpdf-0.7a
@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.aimnet.com/pub/users/derekn/xpdf/

 MAINTAINER=	chuckr@glue.umd.edu

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gzip
--- a/japanese/nethack/Makefile
+++ b/japanese/nethack/Makefile
@ -3,7 +3,7 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.18 1997/09/14 21:35:22 max Exp $
+# $Id: Makefile,v 1.19 1997/11/29 15:48:14 max Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -16,7 +16,7 @@ PATCHFILES=	jnethack-1.0.5.19970924.gz

 MAINTAINER=	max@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@ -3,7 +3,7 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.18 1997/09/14 21:35:22 max Exp $
+# $Id: Makefile,v 1.19 1997/11/29 15:48:14 max Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -16,7 +16,7 @@ PATCHFILES=	jnethack-1.0.5.19970924.gz

 MAINTAINER=	max@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@ -3,7 +3,7 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.18 1997/09/14 21:35:22 max Exp $
+# $Id: Makefile,v 1.19 1997/11/29 15:48:14 max Exp $
 #

 DISTNAME=	nethack-3.2.2
@ -16,7 +16,7 @@ PATCHFILES=	jnethack-1.0.5.19970924.gz

 MAINTAINER=	max@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
--- a/japanese/wine/Makefile
+++ b/japanese/wine/Makefile
@ -3,7 +3,7 @@
 # Date created:		14 Jan 1998
 # Whom:			Takashi Uozu <j1594016@ed.kagu.sut.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/13 22:21:16 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/07/27 21:18:03 asami Exp $

 DISTNAME=	ja-Wine-971130
 PKGNAME=	ja-wine-97.11.30
@ -15,7 +15,7 @@ DISTFILES=	Wine-971130.tar.gz Wine971130-jp.tar.gz

 MAINTAINER=	Takashi Uozu <j1594016@ed.kagu.sut.ac.jp>

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 BROKEN=		fetch

--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@ -3,7 +3,7 @@
 # Date created:		15 August 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/11/04 08:08:47 tg Exp $
 #

 DISTNAME=	asmail-0.50
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://afterstep.foo.net/pub/AfterStep/apps/asmail/ \

 MAINTAINER=	brett@peloton.physics.montana.edu

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes

--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@ -3,7 +3,7 @@
 # Date created:        7 Jun 1998
 # Whom:                rom
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/08 10:58:00 dburr Exp $
 #

 DISTNAME=	wmmail-0.59
@ -12,7 +12,7 @@ MASTER_SITES=	http://earth.gaianet.net/~scorpio/

 MAINTAINER=	rom_glsa@ein-hashofet.co.il

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes

--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@ -5,7 +5,7 @@
 # With some 
 # modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.8 1997/11/17 18:47:51 max Exp $
+# $Id: Makefile,v 1.9 1998/03/14 20:29:39 vanilla Exp $
 #

 DISTNAME=	xfaces-3.3
@ -19,7 +19,7 @@ MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE

 BUILD_DEPENDS= 	${X11BASE}/lib/libaudio.a:${PORTSDIR}/audio/nas
 LIB_DEPENDS=	compface\\.1\\.:${PORTSDIR}/mail/faces \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	YES

--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@ -4,7 +4,7 @@
 # Date created:		30 June 1996
 # Whom:			gena
 #
-# $Id: Makefile,v 1.12 1998/08/05 09:31:22 asami Exp $
+# $Id: Makefile,v 1.13 1998/08/07 23:56:30 asami Exp $
 #

 DISTNAME=       xfmail-1.3
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://burka.netvision.net.il/pub/xfmail/

 MAINTAINER=	gena@NetVision.net.il

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.88\\.1:${PORTSDIR}/x11-toolkits/xforms

 USE_X_PREFIX=	yes
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@ -3,7 +3,7 @@
 # Date created:				23 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/07/05 12:46:22 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/25 00:44:31 asami Exp $
 #

 DISTNAME=		xmailbox-2.5
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	applications

 MAINTAINER=		andy@icc.surw.chel.su

-LIB_DEPENDS=		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=		Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=		yes
 MAN1=			xmailbox.1
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@ -3,7 +3,7 @@
 # Date created:         2 April 1997
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/08/29 08:25:21 obrien Exp $
+# $Id: Makefile,v 1.3 1997/09/09 09:26:31 asami Exp $

 DISTNAME=	xpbiff
 PKGNAME?=	xpbiff-1.27
@ -13,7 +13,7 @@ DISTFILES=	xpbiff-1.27-with-YOUBIN.tar.gz.uu

 MAINTAINER=	sanpei@yy.cs.keio.ac.jp

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@ -4,7 +4,7 @@
 # Date created:			09 Aug 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.11 1998/08/03 09:09:48 ache Exp $
+# $Id: Makefile,v 1.12 1998/08/03 10:06:58 ache Exp $
 #

 DISTNAME=	youbin-2.13
@ -14,7 +14,7 @@ MASTER_SITES=	ftp://nuis.nuie.nagoya-u.ac.jp/info/nagoya-u/ \

 MAINTAINER=	max@FreeBSD.ORG

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 USE_IMAKE=	yes
 PREFIX=         ${LOCALBASE}
--- a/misc/xquote/Makefile
+++ b/misc/xquote/Makefile
@ -3,7 +3,7 @@
 # Date created:		4 Jan 1998
 # Whom:			Ian Struble <ian@broken.net>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/04/22 14:07:50 mph Exp $

 DISTNAME=	xquote-1.1
 CATEGORIES=	misc
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= applications

 MAINTAINER=	mph@freebsd.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 REQUIRES_MOTIF=		yes

--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@ -3,7 +3,7 @@
 # Date created:		Sun Sep  7 17:55:07 EDT 1997
 # Whom:			Randall Hopper <rhh@ct.picker.com>
 #
-# $Id: Makefile,v 1.8 1998/08/07 23:56:24 asami Exp $
+# $Id: Makefile,v 1.9 1998/09/14 20:10:51 markm Exp $
 #

 DISTNAME=	fxtv-0.47
@ -15,7 +15,7 @@ MAINTAINER=	rhh@ct.picker.com

 LIB_DEPENDS=	tiff34.1:${PORTSDIR}/graphics/tiff34 \
 		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d    \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 # This program does not actually depend on the below, but they are pretty
 # useful if you are into digital video recording and playback.
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@ -3,7 +3,7 @@
 # Date created:         Sun Apr 14 09:23:59 MET DST 1996
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.14 1998/04/15 22:18:10 jseger Exp $
+# $Id: Makefile,v 1.15 1998/05/04 20:23:05 jseger Exp $
 #

 DISTNAME=	knews-1.0b.0
@ -12,7 +12,7 @@ MASTER_SITES=	http://www.matematik.su.se/~kjj/

 MAINTAINER=	andreas@FreeBSD.ORG

-LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=    Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png
 RUN_DEPENDS=    newsp:${PORTSDIR}/print/mp
--- a/palm/xcopilot/Makefile
+++ b/palm/xcopilot/Makefile
@ -3,7 +3,7 @@
 # Date created:         July 17 1997
 # Whom:                 Nick Sayer <nsayer@quack.kfu.com>
 #
-# $Id: Makefile,v 1.3 1998/01/01 17:29:10 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/05 09:30:50 asami Exp $
 #

 DISTNAME=       xcopilot-v0.4
@ -17,7 +17,7 @@ PATCH_DIST_STRIP= -p1

 MAINTAINER=     nsayer@quack.kfu.com

-LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm.5:${PORTSDIR}/graphics/xpm

 USE_X_PREFIX=	yes

--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
+# $Id: Makefile,v 1.19 1998/08/07 23:56:46 asami Exp $
 #

 DISTNAME=	lyx-0.12.1pre6
@ -19,7 +19,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
+# $Id: Makefile,v 1.19 1998/08/07 23:56:46 asami Exp $
 #

 DISTNAME=	lyx-0.12.1pre6
@ -19,7 +19,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
+# $Id: Makefile,v 1.19 1998/08/07 23:56:46 asami Exp $
 #

 DISTNAME=	lyx-0.12.1pre6
@ -19,7 +19,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
+# $Id: Makefile,v 1.19 1998/08/07 23:56:46 asami Exp $
 #

 DISTNAME=	lyx-0.12.1pre6
@ -19,7 +19,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.18 1998/08/01 09:07:02 andreas Exp $
+# $Id: Makefile,v 1.19 1998/08/07 23:56:46 asami Exp $
 #

 DISTNAME=	lyx-0.12.1pre6
@ -19,7 +19,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@ -3,7 +3,7 @@
 # Date created:		4 Mar 1998
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.5 1998/09/09 07:09:37 tg Exp $
+# $Id: Makefile,v 1.6 1998/09/15 05:39:20 asami Exp $
 #

 DISTNAME=	mgv-3.1.0
@ -12,7 +12,7 @@ MASTER_SITES=	http://www.trends.net/~mu/srcs/

 MAINTAINER=	handy@physics.montana.edu

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 BROKEN=		fetch

--- a/print/offix-printer/Makefile
+++ b/print/offix-printer/Makefile
@ -3,7 +3,7 @@
 # Date created:      28 Jun 1997
 # Whom:              Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/06 12:30:47 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:31:37 asami Exp $
 #

 DISTNAME=	Printer-2.4
@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	desktop_managers/OffiX
 MAINTAINER=	ruslan@shevchenko.kiev.ua

 LIB_DEPENDS=	Dnd\\.1\\.:${PORTSDIR}/x11/libdnd \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+		Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@ -3,7 +3,7 @@
 # Date created:		9 August 1996
 # Whom:			chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.17 1998/04/30 16:35:27 kuriyama Exp $
+# $Id: Makefile,v 1.18 1998/05/04 20:23:15 jseger Exp $
 #

 DISTNAME=	transfig.3.2
@ -15,7 +15,7 @@ DISTFILES=	transfig.3.2.tar.gz transfig.3.2.ja_JP.EUC.ps.gz

 MAINTAINER=	chuckr@freebsd.org

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm

--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@ -3,7 +3,7 @@
 # Date created:         7 August 1995
 # Whom:                 torstenb
 #
-# $Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp $
+# $Id: Makefile,v 1.16 1998/08/05 09:31:38 asami Exp $
 #

 DISTNAME=       Mosaic-src-2.7b5
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/

 LIB_DEPENDS=    jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		Xpm.5:${PORTSDIR}/graphics/xpm \

 REQUIRES_MOTIF=	yes
 WRKSRC=		${WRKDIR}/Mosaic-src
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@ -3,7 +3,7 @@
 # Date created:        4 September 1998
 # Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/09/06 07:46:22 vanilla Exp $
 #

 DISTNAME=	eyeclock-1.0
@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	kiri@pis.toba-cmt.ac.jp

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 ALL_TARGET=	eyeclock
 USE_X_PREFIX=	yes
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@ -3,7 +3,7 @@
 # Date created:        1 July 1998
 # Whom:                Rich Neswold <rneswold@mcs.net>
 #
-# $Id: Makefile,v 1.1.1.1 1998/07/12 23:14:12 steve Exp $
+# $Id: Makefile,v 1.2 1998/08/07 22:28:04 asami Exp $
 #

 DISTNAME=	wmtime-1.0b2
@ -12,7 +12,7 @@ MASTER_SITES=	http://www.xs4all.nl/~warp/files/

 MAINTAINER=	rneswold@mcs.net

-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm

 WRKSRC=		${WRKDIR}/wmtime.app/wmtime
 USE_IMAKE=	yes
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@ -3,7 +3,7 @@
 # Date created:                17 August 1997
 # Whom:                        lukin@okbmei.msk.su
 #
-# $Id: Makefile,v 1.2 1997/11/04 05:48:10 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/07 22:33:10 asami Exp $
 #

 DISTNAME=	ASFiles-1.0
@ -14,7 +14,7 @@ MASTER_SITES=	http://w3.one.net/~roz/software/x11/windowmaker/
 MAINTAINER=	lukin@okbmei.msk.su

 BUILD_DEPENDS=	${PREFIX}/lib/libDnd.a:${PORTSDIR}/x11/libdnd
-LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm.5:${PORTSDIR}/graphics/xpm

 GNU_CONFIGURE=	yes
 MAN1=	files.1
--- a/Show More
+++ b/Show More