aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--astro/xephem/Makefile4
-rw-r--r--audio/wmmixer/Makefile4
-rw-r--r--audio/xtuner/Makefile4
-rw-r--r--databases/xmbase-grok/Makefile4
-rw-r--r--databases/xmysql/Makefile4
-rw-r--r--databases/xmysqladmin/Makefile4
-rw-r--r--deskutils/xinvest/Makefile4
-rw-r--r--editors/cooledit/Makefile4
-rw-r--r--editors/nedit/Makefile4
-rw-r--r--editors/offix-editor/Makefile4
-rw-r--r--editors/xed/Makefile4
-rw-r--r--editors/xemacs-devel/Makefile4
-rw-r--r--editors/xemacs/Makefile4
-rw-r--r--editors/xemacs20/Makefile4
-rw-r--r--editors/xemacs21-mule/Makefile4
-rw-r--r--editors/xemacs21/Makefile4
-rw-r--r--emulators/wine-devel/Makefile4
-rw-r--r--emulators/wine/Makefile4
-rw-r--r--emulators/xmame/Makefile4
-rw-r--r--finance/xinvest/Makefile4
-rw-r--r--finance/xquote/Makefile4
-rw-r--r--games/3dc/Makefile4
-rw-r--r--games/crossfire-client/Makefile4
-rw-r--r--games/crossfire-server/Makefile4
-rw-r--r--games/crossfire/Makefile4
-rw-r--r--games/freeciv-gtk2/Makefile4
-rw-r--r--games/freeciv/Makefile4
-rw-r--r--games/maelstrom/Makefile4
-rw-r--r--games/nethack-qt/Makefile4
-rw-r--r--games/nethack/Makefile4
-rw-r--r--games/nethack3-tty/Makefile4
-rw-r--r--games/nethack3/Makefile4
-rw-r--r--games/nethack32/Makefile4
-rw-r--r--games/nethack33-nox11/Makefile4
-rw-r--r--games/nethack33-qt/Makefile4
-rw-r--r--games/nethack33/Makefile4
-rw-r--r--games/nethack34-nox11/Makefile4
-rw-r--r--games/nethack34-qt/Makefile4
-rw-r--r--games/nethack34/Makefile4
-rw-r--r--games/wmtimebomb/Makefile4
-rw-r--r--games/xbill/Makefile4
-rw-r--r--games/xboing/Makefile4
-rw-r--r--games/xcogitate/Makefile4
-rw-r--r--games/xconq/Makefile4
-rw-r--r--games/xdeblock/Makefile4
-rw-r--r--games/xeyesplus/Makefile4
-rw-r--r--games/xgalaga/Makefile4
-rw-r--r--games/xminehunter/Makefile4
-rw-r--r--games/xnibbles/Makefile4
-rw-r--r--games/xoids/Makefile4
-rw-r--r--games/xonix/Makefile4
-rw-r--r--games/xpuzzletama/Makefile4
-rw-r--r--games/xquarto/Makefile9
-rw-r--r--games/xscrabble/Makefile4
-rw-r--r--games/xshisen/Makefile4
-rw-r--r--games/xsok/Makefile4
-rw-r--r--games/xsokoban/Makefile4
-rw-r--r--games/xsoldier/Makefile4
-rw-r--r--games/xteddy/Makefile4
-rw-r--r--graphics/aero/Makefile4
-rw-r--r--graphics/fxtv/Makefile4
-rw-r--r--graphics/gimp-app-devel/Makefile4
-rw-r--r--graphics/gimp-app/Makefile4
-rw-r--r--graphics/gimp-devel/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gimp1/Makefile4
-rw-r--r--graphics/gimpshop/Makefile4
-rw-r--r--graphics/pixmap/Makefile4
-rw-r--r--graphics/xbmbrowser/Makefile4
-rw-r--r--graphics/xfig-devel/Makefile4
-rw-r--r--graphics/xfig/Makefile4
-rw-r--r--graphics/xpaint/Makefile4
-rw-r--r--graphics/xpdf/Makefile4
-rw-r--r--japanese/nethack/Makefile4
-rw-r--r--japanese/nethack32/Makefile4
-rw-r--r--japanese/nethack34/Makefile4
-rw-r--r--japanese/wine/Makefile4
-rw-r--r--mail/asmail/Makefile4
-rw-r--r--mail/wmmail/Makefile4
-rw-r--r--mail/xfaces/Makefile4
-rw-r--r--mail/xfmail/Makefile4
-rw-r--r--mail/xmailbox/Makefile4
-rw-r--r--mail/xpbiff/Makefile4
-rw-r--r--mail/youbin/Makefile4
-rw-r--r--misc/xquote/Makefile4
-rw-r--r--multimedia/fxtv/Makefile4
-rw-r--r--news/knews/Makefile4
-rw-r--r--palm/xcopilot/Makefile4
-rw-r--r--print/lyx-devel/Makefile4
-rw-r--r--print/lyx/Makefile4
-rw-r--r--print/lyx14/Makefile4
-rw-r--r--print/lyx15/Makefile4
-rw-r--r--print/lyx16/Makefile4
-rw-r--r--print/mgv/Makefile4
-rw-r--r--print/offix-printer/Makefile4
-rw-r--r--print/transfig/Makefile4
-rw-r--r--www/Mosaic/Makefile4
-rw-r--r--x11-clocks/eyeclock/Makefile4
-rw-r--r--x11-clocks/wmtime/Makefile4
-rw-r--r--x11-fm/asfiles/Makefile4
-rw-r--r--x11-fm/dfm/Makefile4
-rw-r--r--x11-fm/offix-files/Makefile4
-rw-r--r--x11-fm/xfm/Makefile4
-rw-r--r--x11-toolkits/FWF/Makefile4
-rw-r--r--x11-toolkits/tkstep80/Makefile4
-rw-r--r--x11-wm/afterstep-stable/Makefile4
-rw-r--r--x11-wm/afterstep/Makefile4
-rw-r--r--x11-wm/ctwm/Makefile4
-rw-r--r--x11-wm/fvwm/Makefile4
-rw-r--r--x11-wm/fvwm2-beta/Makefile4
-rw-r--r--x11-wm/fvwm2-devel/Makefile4
-rw-r--r--x11-wm/fvwm2-i18n/Makefile4
-rw-r--r--x11-wm/fvwm2/Makefile4
-rw-r--r--x11-wm/fvwm24/Makefile4
-rw-r--r--x11-wm/fvwm95-i18n/Makefile4
-rw-r--r--x11-wm/fvwm95/Makefile4
-rw-r--r--x11-wm/gwm/Makefile4
-rw-r--r--x11-wm/icewm/Makefile4
-rw-r--r--x11-wm/mlvwm/Makefile4
-rw-r--r--x11-wm/piewm/Makefile4
-rw-r--r--x11-wm/qvwm/Makefile4
-rw-r--r--x11-wm/tvtwm/Makefile4
-rw-r--r--x11-wm/windowmaker-i18n/Makefile4
-rw-r--r--x11-wm/windowmaker/Makefile4
-rw-r--r--x11-wm/wmx/Makefile4
-rw-r--r--x11-wm/xfce/Makefile4
-rw-r--r--x11-wm/xfce4/Makefile4
-rw-r--r--x11/bricons/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gnomelibs/Makefile4
-rw-r--r--x11/libgnome/Makefile4
-rw-r--r--x11/offix-execute/Makefile4
-rw-r--r--x11/wdm/Makefile4
-rw-r--r--x11/xdtm/Makefile4
-rw-r--r--x11/xfedor/Makefile4
-rw-r--r--x11/xlockmore/Makefile4
-rw-r--r--x11/xscreensaver/Makefile4
137 files changed, 276 insertions, 277 deletions
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 5e0cf8e3708..ab8c8fd1ef1 100644
--- 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
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index b8ed86aa92c..042fce076c6 100644
--- 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
diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile
index dfb83da7fe2..301bbe5b9ed 100644
--- 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
diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile
index a86f44f84bb..49e64d1c9ca 100644
--- 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
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index 27a34e8b62c..15e761a1370 100644
--- 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
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 0149249cdd3..16c345f4f5b 100644
--- 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
diff --git a/deskutils/xinvest/Makefile b/deskutils/xinvest/Makefile
index 270b31d5f12..851784fabc2 100644
--- 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
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 2990cc14b69..dc053940cfc 100644
--- 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
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index c0902a9082a..7a62a66fa58 100644
--- 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
diff --git a/editors/offix-editor/Makefile b/editors/offix-editor/Makefile
index 00478c60e9d..fdf570f8a4e 100644
--- 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
diff --git a/editors/xed/Makefile b/editors/xed/Makefile
index c80c2421728..b0e12263536 100644
--- 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
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 9b296b0f10a..48a3dcfeac5 100644
--- 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
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 9b296b0f10a..48a3dcfeac5 100644
--- 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
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index 9b296b0f10a..48a3dcfeac5 100644
--- 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
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index bfe90487d39..85ba72f9288 100644
--- 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 \
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 9b296b0f10a..48a3dcfeac5 100644
--- 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
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index ef497fabfda..05c2ea0127a 100644
--- 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
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index ef497fabfda..05c2ea0127a 100644
--- 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
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index a88bba4d3d4..1dc89a8f6e6 100644
--- 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
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index 270b31d5f12..851784fabc2 100644
--- 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
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index cb03848953d..e180d148890 100644
--- 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
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 488c623c8ff..076f5889cdb 100644
--- 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
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 2b830182fc7..41288a7b7bd 100644
--- 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
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 2b830182fc7..41288a7b7bd 100644
--- 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
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 2b830182fc7..41288a7b7bd 100644
--- 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
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index d4297856979..3809e75e47b 100644
--- 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
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index d4297856979..3809e75e47b 100644
--- 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
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index 1ce9372bf3e..b14ed2dcc66 100644
--- 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
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 9057cd15ed1..0b33f64115d 100644
--- 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
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 0f051f346e3..0e7bed61928 100644
--- 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
diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile
index 0f051f346e3..0e7bed61928 100644
--- 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
diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile
index 0f051f346e3..0e7bed61928 100644
--- 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
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 0f051f346e3..0e7bed61928 100644
--- 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
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index 0f051f346e3..0e7bed61928 100644
--- 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
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index 9057cd15ed1..0b33f64115d 100644
--- 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
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 0f051f346e3..0e7bed61928 100644
--- 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
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index 0f051f346e3..0e7bed61928 100644
--- 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
diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index 9057cd15ed1..0b33f64115d 100644
--- 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
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 0f051f346e3..0e7bed61928 100644
--- 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
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile
index 73c90ca271e..a580e4ff490 100644
--- 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
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 518c675bfc8..7682142ec1f 100644
--- 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
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 2a605284056..54ddda97215 100644
--- 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
diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile
index 3bf5c1c5e0b..009a1b92a97 100644
--- 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
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 4397bee5d0d..04c818e9d3f 100644
--- 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
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index 5fd1ca4b8e9..b9b6c0b6276 100644
--- 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
diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile
index 35f7e41464e..8146ff66a55 100644
--- 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
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index bea6a4090ea..896c3edccfc 100644
--- 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
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 2afc0c9c872..febd846cf2e 100644
--- 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
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index ed0d2190416..eb04799e776 100644
--- 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
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index 50e0e9a965e..22ee536d95a 100644
--- 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
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index 7a078a190da..40337bb380a 100644
--- 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
diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile
index d593ca8a72e..e29098689d6 100644
--- 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
diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile
index 73f87a232a1..648a1f8f15e 100644
--- 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>
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 443c53c1f17..2e0f4f9211c 100644
--- 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
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index 361cdb72e94..ffaa69a4c3b 100644
--- 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
diff --git a/games/xsok/Makefile b/games/xsok/Makefile
index 46e23293f02..6e827729e1b 100644
--- 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
diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile
index 3cef14d271f..f93b22d568f 100644
--- 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
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index cb34b2aacc2..120dcaf6b8b 100644
--- 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
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index e3ac9b4606d..e78fa96a776 100644
--- 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"
diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile
index cee1a7742bc..eb415de1346 100644
--- 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
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 71b0ab82a3a..838cfd57b89 100644
--- 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.
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 87f4b1cec17..c2d13217fb9 100644
--- 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
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 87f4b1cec17..c2d13217fb9 100644
--- 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
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 87f4b1cec17..c2d13217fb9 100644
--- 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
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 87f4b1cec17..c2d13217fb9 100644
--- 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
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 87f4b1cec17..c2d13217fb9 100644
--- 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
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 87f4b1cec17..c2d13217fb9 100644
--- 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
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 8026965c108..ef583a3283b 100644
--- 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
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 44baeb84997..f56757bd181 100644
--- 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
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index 8eb96921db5..7c4cc4c7dab 100644
--- 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
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 8eb96921db5..7c4cc4c7dab 100644
--- 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
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 13f12fcc71d..189421e70d1 100644
--- 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
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 6642711d0ec..d49f2b12d89 100644
--- 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
diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile
index 0b650d29a45..bbb99aee82e 100644
--- 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
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index 0b650d29a45..bbb99aee82e 100644
--- 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
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 0b650d29a45..bbb99aee82e 100644
--- 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
diff --git a/japanese/wine/Makefile b/japanese/wine/Makefile
index b64ab5dbb81..7414188f18c 100644
--- 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
diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index 21e36ff5957..f9ddff01948 100644
--- 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
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 1785018a04d..ac3f3fdb4de 100644
--- 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
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index 7f7c391426f..82f7aa7f4c0 100644
--- 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
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index dde7417d024..ca459c14e97 100644
--- 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
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 578f9721986..e9fc3254297 100644
--- 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
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index c83b8d423c0..e27f5aade0c 100644
--- 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
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index 6a52bc4c026..decf7984da8 100644
--- 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}
diff --git a/misc/xquote/Makefile b/misc/xquote/Makefile
index cb03848953d..e180d148890 100644
--- 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
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 71b0ab82a3a..838cfd57b89 100644
--- 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.
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 79a810f783f..0a839c33359 100644
--- 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
diff --git a/palm/xcopilot/Makefile b/palm/xcopilot/Makefile
index 05d52b5cd4a..e2f87f8739d 100644
--- 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
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 17290b0d1dd..06d7bec2021 100644
--- 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}"
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 17290b0d1dd..06d7bec2021 100644
--- 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}"
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 17290b0d1dd..06d7bec2021 100644
--- 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}"
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 17290b0d1dd..06d7bec2021 100644
--- 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}"
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 17290b0d1dd..06d7bec2021 100644
--- 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}"
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 58ceebaadf2..11bb52a29c0 100644
--- 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
diff --git a/print/offix-printer/Makefile b/print/offix-printer/Makefile
index b8eac252990..3367a2f60ce 100644
--- 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
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 422ed3ba716..94ca739e655 100644
--- 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
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index dc9e64676c9..726e4a0a199 100644
--- 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
diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index cae88a8d205..6f474ebce2b 100644
--- 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
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index fabbe318042..f328e1d05f5 100644
--- 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
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index 86e14722386..0e4e54849d4 100644
--- 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
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index e920fa84148..d7ab33b9dd4 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -3,7 +3,7 @@
# Date created: 25 May 1998
# Whom: Andrey Zakhvatov
#
-# $Id: Makefile,v 1.4 1998/08/07 23:56:49 asami Exp $
+# $Id: Makefile,v 1.5 1998/08/09 01:00:25 steve Exp $
#
DISTNAME= dfm-0.9.10
@@ -12,7 +12,7 @@ MASTER_SITES= http://www-c.informatik.uni-hannover.de/~kaiser/dfm/
MAINTAINER= andy@icc.surw.chel.su
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm \
xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes
diff --git a/x11-fm/offix-files/Makefile b/x11-fm/offix-files/Makefile
index 527fca66c32..7659436bf2b 100644
--- a/x11-fm/offix-files/Makefile
+++ b/x11-fm/offix-files/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 Jun 1997
# Whom: Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
#
-# $Id: Makefile,v 1.2 1998/08/05 09:31:44 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/07 22:33:11 asami Exp $
#
DISTNAME= Files-2.4
@@ -18,7 +18,7 @@ RUN_DEPENDS= execute:${PORTSDIR}/x11/offix-execute \
editor:${PORTSDIR}/editors/offix-editor
LIB_DEPENDS= Dnd\\.1\\.:${PORTSDIR}/x11/libdnd \
- Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+ Xpm.5:${PORTSDIR}/graphics/xpm
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index 2197e8e3939..5e93af3d074 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 December 1994
# Whom: jc@irbs.com John Capo
#
-# $Id: Makefile,v 1.8 1998/08/07 22:33:12 asami Exp $
+# $Id: Makefile,v 1.9 1998/08/10 00:03:11 steve Exp $
#
DISTNAME= xfm-1.3.2
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= applications
MAINTAINER= ports@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
diff --git a/x11-toolkits/FWF/Makefile b/x11-toolkits/FWF/Makefile
index 28c70852a25..00f54891e39 100644
--- a/x11-toolkits/FWF/Makefile
+++ b/x11-toolkits/FWF/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 July 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.11 1998/04/26 12:50:24 jseger Exp $
+# $Id: Makefile,v 1.12 1998/08/07 22:56:37 asami Exp $
#
DISTNAME= fwf-4.0
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=libs/X/fwf
MAINTAINER= jseger@FreeBSD.org
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/FWF
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index b3751b1a495..302e256ea02 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -3,7 +3,7 @@
# Date created: 06 November 1997
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.11 1998/08/07 22:56:47 asami Exp $
+# $Id: Makefile,v 1.12 1998/08/07 23:56:53 asami Exp $
#
DISTNAME= tk8.0p2
@@ -18,7 +18,7 @@ PATCHFILES= tk8.0p2-to-TkStep8.0p2-1.patch.gz
MAINTAINER= tg@FreeBSD.ORG
LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 \
- Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+ Xpm.5:${PORTSDIR}/graphics/xpm \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 8b59daf2013..63047f7fd45 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -3,7 +3,7 @@
# Date created: 1 May 1998
# Whom: Brett Taylor
#
-# $Id: Makefile,v 1.23 1998/07/14 02:42:18 mph Exp $
+# $Id: Makefile,v 1.24 1998/08/07 23:01:37 asami Exp $
#
DISTNAME= AfterStep-1.4.5.0
@@ -18,7 +18,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= brett@peloton.physics.montana.edu
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
WRKSRC= ${WRKDIR}/AfterStep
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 88996be81e1..7c62b322ada 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -3,7 +3,7 @@
# Date created: October 29th 1996
# Whom: jfitz@FreeBSD.ORG
#
-# $Id: Makefile,v 1.19 1998/08/05 09:31:40 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/07 23:01:37 asami Exp $
#
DISTNAME= AfterStep-1.0
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://afterstep.foo.net/pub/AfterStep/
MAINTAINER= jfitz@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_X_PREFIX= yes
INSTALL_TARGET= install install.man
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index b52200ac8b3..eafacdd56ac 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -3,7 +3,7 @@
# Date created: 13 November 1994
# Whom: torstenb
#
-# $Id: Makefile,v 1.15 1997/11/27 17:31:20 obrien Exp $
+# $Id: Makefile,v 1.16 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= ctwm-3.5
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://slhp1.epfl.ch/pub/
MAINTAINER= torstenb@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index f528efd2677..e7de35df7f2 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -3,7 +3,7 @@
# Date created: 12 May 1995
# Whom: me
#
-# $Id: Makefile,v 1.23 1998/04/04 07:36:46 asami Exp $
+# $Id: Makefile,v 1.24 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= fvwm-1.24r
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-1/ \
MAINTAINER= me@FreeBSD.org
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
NO_LATEST_LINK= yes
USE_IMAKE= yes
diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index b6a6deccaf8..8f875755230 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -3,7 +3,7 @@
# Date created: 20 Jan 1996
# Whom: peter
#
-# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
+# $Id: Makefile,v 1.13 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= fvwm-2.0.46
@@ -17,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
MAINTAINER= matusita@jp.freebsd.org
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
MAN1= FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index b6a6deccaf8..8f875755230 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: 20 Jan 1996
# Whom: peter
#
-# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
+# $Id: Makefile,v 1.13 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= fvwm-2.0.46
@@ -17,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
MAINTAINER= matusita@jp.freebsd.org
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
MAN1= FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index b6a6deccaf8..8f875755230 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -3,7 +3,7 @@
# Date created: 20 Jan 1996
# Whom: peter
#
-# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
+# $Id: Makefile,v 1.13 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= fvwm-2.0.46
@@ -17,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
MAINTAINER= matusita@jp.freebsd.org
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
MAN1= FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index b6a6deccaf8..8f875755230 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -3,7 +3,7 @@
# Date created: 20 Jan 1996
# Whom: peter
#
-# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
+# $Id: Makefile,v 1.13 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= fvwm-2.0.46
@@ -17,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
MAINTAINER= matusita@jp.freebsd.org
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
MAN1= FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index b6a6deccaf8..8f875755230 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -3,7 +3,7 @@
# Date created: 20 Jan 1996
# Whom: peter
#
-# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
+# $Id: Makefile,v 1.13 1998/08/07 23:01:38 asami Exp $
#
DISTNAME= fvwm-2.0.46
@@ -17,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
MAINTAINER= matusita@jp.freebsd.org
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
MAN1= FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 60f9bb15edc..f3c2b6b0aa8 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -3,7 +3,7 @@
# Date created: Sa 1 Feb 1997 14:46:05 MET
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.18 1998/08/05 09:31:43 asami Exp $
+# $Id: Makefile,v 1.19 1998/08/07 23:01:39 asami Exp $
#
DISTNAME= fvwm95-2.0.43a-Autoconf
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= andreas@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index 60f9bb15edc..f3c2b6b0aa8 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -3,7 +3,7 @@
# Date created: Sa 1 Feb 1997 14:46:05 MET
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.18 1998/08/05 09:31:43 asami Exp $
+# $Id: Makefile,v 1.19 1998/08/07 23:01:39 asami Exp $
#
DISTNAME= fvwm95-2.0.43a-Autoconf
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= andreas@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index a0a18dcf6c2..0c68b0d9b70 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 November 1996
# Whom: markm
#
-# $Id: Makefile,v 1.4 1998/04/28 14:50:48 mph Exp $
+# $Id: Makefile,v 1.5 1998/08/07 23:01:39 asami Exp $
#
DISTNAME= gwm-1.8c
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= window_managers/gwm
MAINTAINER= markm@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 4cb82311bc2..cf96b89a670 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 August 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.14 1998/08/07 23:01:39 asami Exp $
+# $Id: Makefile,v 1.15 1998/08/14 11:18:33 vanilla Exp $
#
DISTNAME= icewm-0.9.12
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .src.tar.gz
MAINTAINER= Nakai@technologist.com
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_X_PREFIX= yes
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index 19b82d6f216..1d94d2d683a 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 Januruary 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.8 1998/08/07 23:01:39 asami Exp $
+# $Id: Makefile,v 1.9 1998/08/25 00:44:33 asami Exp $
#
DISTNAME= mlvwm-0.8.6
@@ -14,7 +14,7 @@ DISTFILES= mlvwm-0.8.6.tar.gz mini-icons.tar.gz
MAINTAINER= Nakai@Mlab.t.u-tokyo.ac.jp
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
WRKSRC= ${WRKDIR}/mlvwm086
USE_IMAKE= yes
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 5d870f655cb..5b417901108 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -3,7 +3,7 @@
# Date created: 24 November 1994
# Whom: asami
#
-# $Id: Makefile,v 1.11 1997/12/25 22:29:50 asami Exp $
+# $Id: Makefile,v 1.12 1998/08/07 23:01:40 asami Exp $
#
DISTNAME= piewm
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index 441e808e594..948cf0a2fc7 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -3,7 +3,7 @@
# Date created: 2 January 1997
# Whom: Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.16 1998/07/03 23:20:14 steve Exp $
+# $Id: Makefile,v 1.17 1998/08/07 23:01:40 asami Exp $
#
DISTNAME= qvwm-1.0b10a
@@ -12,7 +12,7 @@ MASTER_SITES= http://www-masuda.is.s.u-tokyo.ac.jp/~kourai/qvwm/program/
MAINTAINER= Nakai@technologist.com
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
MAN1= qvwm.1
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 54ad79dcd78..05562f79504 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -3,7 +3,7 @@
# Date created: 5th December 1994
# Whom: gpalmer
#
-# $Id: Makefile,v 1.9 1996/11/18 09:55:32 asami Exp $
+# $Id: Makefile,v 1.10 1998/08/07 23:01:40 asami Exp $
#
DISTNAME= tvtwm
@@ -15,7 +15,7 @@ DISTFILES= tvtwm.pl11.tar.gz
MAINTAINER= gpalmer@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 669a0b7c2a4..204ef2e5c42 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -3,7 +3,7 @@
# Date created: August 13, 1997
# Whom: handy@physics.montana.edu
#
-# $Id: Makefile,v 1.24 1998/09/09 05:57:17 tg Exp $
+# $Id: Makefile,v 1.25 1998/09/11 06:46:51 tg Exp $
DISTNAME= WindowMaker-0.19.3
PKGNAME= windowmaker-0.19.3
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.windowmaker.org/pub/beta/srcs/ \
MAINTAINER= handy@physics.montana.edu
RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
png\\.2\\.:${PORTSDIR}/graphics/png \
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 669a0b7c2a4..204ef2e5c42 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,7 +3,7 @@
# Date created: August 13, 1997
# Whom: handy@physics.montana.edu
#
-# $Id: Makefile,v 1.24 1998/09/09 05:57:17 tg Exp $
+# $Id: Makefile,v 1.25 1998/09/11 06:46:51 tg Exp $
DISTNAME= WindowMaker-0.19.3
PKGNAME= windowmaker-0.19.3
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.windowmaker.org/pub/beta/srcs/ \
MAINTAINER= handy@physics.montana.edu
RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
png\\.2\\.:${PORTSDIR}/graphics/png \
diff --git a/x11-wm/wmx/Makefile b/x11-wm/wmx/Makefile
index a4d625aacb5..d8a5a940a34 100644
--- a/x11-wm/wmx/Makefile
+++ b/x11-wm/wmx/Makefile
@@ -3,7 +3,7 @@
# Date created: 11. Jan 1998
# Whom: Stefan Zehl <sec@42.org>
#
-# $Id: Makefile,v 1.2 1998/08/05 09:31:49 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/07 23:01:41 asami Exp $
#
DISTNAME= wmx-4
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.netcomuk.co.uk/~cannam/
MAINTAINER= sec@42.org
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_X_PREFIX= yes
ALL_TARGET= depend wmx
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 3c69067720c..7b9808d9dd3 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.2 1997/12/10 22:48:22 vanilla Exp $
+# $Id: Makefile,v 1.3 1998/08/07 23:56:56 asami Exp $
#
DISTNAME= xfce-1.2.4
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= X11/toolbars
MAINTAINER= Nakai@Mlab.t.u-tokyo.ac.jp
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm \
xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/XFCE-1.2.4
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 3c69067720c..7b9808d9dd3 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.2 1997/12/10 22:48:22 vanilla Exp $
+# $Id: Makefile,v 1.3 1998/08/07 23:56:56 asami Exp $
#
DISTNAME= xfce-1.2.4
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= X11/toolbars
MAINTAINER= Nakai@Mlab.t.u-tokyo.ac.jp
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm \
xforms\\.0\\.:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/XFCE-1.2.4
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 1dc6b148965..f4a93a49960 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -3,7 +3,7 @@
# Date created: 31 Jul 1996
# Whom: shanee@augusta.de
#
-# $Id: Makefile,v 1.2 1997/04/29 10:54:43 asami Exp $
+# $Id: Makefile,v 1.3 1997/10/26 23:56:53 fenner Exp $
#
DISTNAME= bricons
@@ -15,7 +15,7 @@ EXTRACT_SUFX= -athena-3.0.tar.gz
MAINTAINER= shanee@augusta.de
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index df70cc876db..35aed72c2e2 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,7 +3,7 @@
# Date created: 17 June 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.1.1.1 1998/09/06 06:34:19 vanilla Exp $
+# $Id: Makefile,v 1.2 1998/09/14 10:07:36 asami Exp $
#
DISTNAME= gnome-libs-0.27
@@ -21,7 +21,7 @@ LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
LIB_DEPENDS+= gif\\.3\\.:${PORTSDIR}/graphics/giflib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
-LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+= Xpm.5:${PORTSDIR}/graphics/xpm
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index df70cc876db..35aed72c2e2 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -3,7 +3,7 @@
# Date created: 17 June 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.1.1.1 1998/09/06 06:34:19 vanilla Exp $
+# $Id: Makefile,v 1.2 1998/09/14 10:07:36 asami Exp $
#
DISTNAME= gnome-libs-0.27
@@ -21,7 +21,7 @@ LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
LIB_DEPENDS+= gif\\.3\\.:${PORTSDIR}/graphics/giflib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
-LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+= Xpm.5:${PORTSDIR}/graphics/xpm
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index df70cc876db..35aed72c2e2 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,7 +3,7 @@
# Date created: 17 June 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.1.1.1 1998/09/06 06:34:19 vanilla Exp $
+# $Id: Makefile,v 1.2 1998/09/14 10:07:36 asami Exp $
#
DISTNAME= gnome-libs-0.27
@@ -21,7 +21,7 @@ LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
LIB_DEPENDS+= gif\\.3\\.:${PORTSDIR}/graphics/giflib
LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png
-LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS+= Xpm.5:${PORTSDIR}/graphics/xpm
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/x11/offix-execute/Makefile b/x11/offix-execute/Makefile
index 58392313d6d..d8764cf643d 100644
--- a/x11/offix-execute/Makefile
+++ b/x11/offix-execute/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:22:44 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:31:44 asami Exp $
#
DISTNAME= Execute-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
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 56eb4dd2d39..78f698e6fce 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -3,7 +3,7 @@
# Date created: August 31, 1998
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.2 1998/09/07 06:57:08 tg Exp $
+# $Id: Makefile,v 1.3 1998/09/11 07:51:58 tg Exp $
DISTNAME= wdm-0.90
CATEGORIES= x11
@@ -14,7 +14,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DAEMONPIC}
MAINTAINER= ports@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
png\\.2\\.:${PORTSDIR}/graphics/png \
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index 82105bcab86..0e8067d8974 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -3,7 +3,7 @@
# Date created: 26th April 1995
# Whom: gpalmer
#
-# $Id: Makefile,v 1.3 1997/12/13 13:08:14 vanilla Exp $
+# $Id: Makefile,v 1.4 1997/12/16 20:23:37 vanilla Exp $
#
DISTNAME= xdtm-2.5.8
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= applications
MAINTAINER= gpalmer@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/xdtm
diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile
index 97e3bad0807..99e0e0588b3 100644
--- a/x11/xfedor/Makefile
+++ b/x11/xfedor/Makefile
@@ -6,7 +6,7 @@
# ATTENTION: It not work in > 256 colors modes, please fix it
# if you can.
#
-# $Id: Makefile,v 1.4 1997/08/10 23:23:46 ache Exp $
+# $Id: Makefile,v 1.5 1997/08/10 23:24:59 ache Exp $
#
DISTNAME= xfedor
@@ -14,7 +14,7 @@ PKGNAME= xfedor-1.0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/x11/util/
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
MAINTAINER= ache@FreeBSD.ORG
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 2b75855e5c0..ba49e714c0a 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,7 +3,7 @@
# Date created: 9 November 1994
# Whom: smace
#
-# $Id: Makefile,v 1.36 1998/07/21 07:09:04 tg Exp $
+# $Id: Makefile,v 1.37 1998/08/05 09:31:50 asami Exp $
#
DISTNAME= xlockmore-4.11
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= applications
MAINTAINER= tg@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-gl --without-motif --without-sx \
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 5103bf588dd..75f9fb29ee5 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 July 1995
# Whom: asami
#
-# $Id: Makefile,v 1.13 1998/07/24 03:12:51 asami Exp $
+# $Id: Makefile,v 1.14 1998/08/05 09:31:51 asami Exp $
#
DISTNAME= xscreensaver-2.24
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= applications
MAINTAINER= jseger@FreeBSD.ORG
-LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
BROKEN= libkrb