summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2000-08-23 23:14:21 +0000
committertron <tron>2000-08-23 23:14:21 +0000
commit3bb1003bffe659fe78e3ff049aa5e426d687763a (patch)
tree623953a643a6181e26e24311ef14ff20193779e7
parentea8b8736a98aa0f9cc1e367db350fc4ffa0d09b1 (diff)
downloadpkgsrc-3bb1003bffe659fe78e3ff049aa5e426d687763a.tar.gz
Use "USE_XPM" option instead of direct dependence on the "xpm" package.
-rw-r--r--audio/dap/Makefile4
-rw-r--r--audio/snd/Makefile7
-rw-r--r--audio/xmradio/Makefile8
-rw-r--r--audio/xwave/Makefile7
-rw-r--r--cad/xchiplogo/Makefile6
-rw-r--r--comms/xisp/Makefile6
-rw-r--r--databases/xmysql/Makefile6
-rw-r--r--databases/xmysqladmin/Makefile6
-rw-r--r--devel/ddd/Makefile11
-rw-r--r--editors/abiword/Makefile10
-rw-r--r--editors/nedit/Makefile9
-rw-r--r--editors/xemacs/Makefile6
-rw-r--r--editors/xvile/Makefile13
-rw-r--r--emulators/wine-current/Makefile8
-rw-r--r--emulators/wine/Makefile9
-rw-r--r--emulators/xcopilot/Makefile7
-rw-r--r--emulators/xmame/Makefile8
-rw-r--r--games/crossfire/Makefile8
-rw-r--r--games/freeciv-client/Makefile7
-rw-r--r--games/maelstrom/Makefile7
-rw-r--r--games/mirrormagic/Makefile5
-rw-r--r--games/nethack-qt/Makefile8
-rw-r--r--games/nethack-x11/Makefile6
-rw-r--r--games/nighthawk/Makefile5
-rw-r--r--games/tanked/Makefile7
-rw-r--r--games/xarchon/Makefile6
-rw-r--r--games/xbill/Makefile9
-rw-r--r--games/xboing/Makefile8
-rw-r--r--games/xconq/Makefile10
-rw-r--r--games/xdemineur/Makefile7
-rw-r--r--games/xgalaga/Makefile9
-rw-r--r--games/xnibbles/Makefile8
-rw-r--r--games/xpat2/Makefile7
-rw-r--r--games/xpuyopuyo/Makefile10
-rw-r--r--games/xscrabble/Makefile9
-rw-r--r--games/xsoldier/Makefile9
-rw-r--r--graphics/fxtv/Makefile9
-rw-r--r--graphics/gd/Makefile10
-rw-r--r--graphics/gimp-current/Makefile12
-rw-r--r--graphics/gimp/Makefile14
-rw-r--r--graphics/libwmf/Makefile13
-rw-r--r--graphics/pixmap/Makefile6
-rw-r--r--graphics/xart/Makefile7
-rw-r--r--graphics/xbmbrowser/Makefile9
-rw-r--r--graphics/xfig/Makefile8
-rw-r--r--graphics/xpaint/Makefile6
-rw-r--r--graphics/xpdf/Makefile8
-rw-r--r--mail/xfmail/Makefile4
-rw-r--r--mail/xmailbox/Makefile6
-rw-r--r--math/abs/Makefile7
-rw-r--r--math/grace/Makefile10
-rw-r--r--math/xmgr/Makefile12
-rw-r--r--misc/root/Makefile13
-rw-r--r--misc/siag/Makefile12
-rw-r--r--misc/xinvest/Makefile10
-rw-r--r--net/wmpload/Makefile5
-rw-r--r--news/knews/Makefile6
-rw-r--r--print/lyx/Makefile8
-rw-r--r--print/transfig/Makefile6
-rw-r--r--sysutils/asapm/Makefile9
-rw-r--r--sysutils/xbatt/Makefile7
-rw-r--r--sysutils/xosview/Makefile10
-rw-r--r--textproc/ted/Makefile4
-rw-r--r--www/Mosaic/Makefile10
-rw-r--r--www/arena/Makefile10
-rw-r--r--x11/Xaw-Xpm/Makefile7
-rw-r--r--x11/XmHTML/Makefile14
-rw-r--r--x11/afterstep/Makefile12
-rw-r--r--x11/asclock-xlib/Makefile7
-rw-r--r--x11/asclock/Makefile7
-rw-r--r--x11/ctwm/Makefile7
-rw-r--r--x11/fvwm-wharf/Makefile7
-rw-r--r--x11/gnome-libs/Makefile12
-rw-r--r--x11/icewm/Makefile4
-rw-r--r--x11/kdebase/Makefile10
-rw-r--r--x11/khostchooser/Makefile10
-rw-r--r--x11/kterm/Makefile7
-rw-r--r--x11/olvwm/Makefile10
-rw-r--r--x11/rxvt/Makefile9
-rw-r--r--x11/scwm/Makefile12
-rw-r--r--x11/speyes/Makefile9
-rw-r--r--x11/tvtwm/Makefile7
-rw-r--r--x11/windowmaker/Makefile10
-rw-r--r--x11/wmavgload/Makefile8
-rw-r--r--x11/wmcalclock/Makefile9
-rw-r--r--x11/wmfire/Makefile5
-rw-r--r--x11/wmfstatus/Makefile8
-rw-r--r--x11/wmmoonclock/Makefile5
-rw-r--r--x11/wmtime/Makefile10
-rw-r--r--x11/wmx/Makefile7
-rw-r--r--x11/wterm/Makefile3
-rw-r--r--x11/xbanner/Makefile8
-rw-r--r--x11/xbeats/Makefile9
-rw-r--r--x11/xfce/Makefile12
-rw-r--r--x11/xforms/Makefile11
-rw-r--r--x11/xlockmore/Makefile8
-rw-r--r--x11/xpenguins/Makefile4
-rw-r--r--x11/xpmroot/Makefile5
-rw-r--r--x11/xquote/Makefile10
-rw-r--r--x11/xteddy/Makefile9
100 files changed, 390 insertions, 429 deletions
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 5d8b06dbf45..94a4149761a 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/02/29 16:57:45 scw Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/23 23:14:22 tron Exp $
DISTNAME= dap-2.1.1
CATEGORIES= audio
@@ -8,13 +8,13 @@ EXTRACT_SUFX= .tgz
MAINTAINER= scw@netbsd.org
HOMEPAGE= http://www.cee.hw.ac.uk/~richardk/
-DEPENDS+= xpm-*:../../graphics/xpm
DEPENDS+= xforms-0.88:../../x11/xforms
MAKEFILE= Makefile.netbsd
ONLY_FOR_PLATFORM= *-*-alpha *-*-arm32 *-*-i386 *-*-m68k *-*-sparc *-*-ns32k
USE_X11BASE= YES
+USE_XPM= YES
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/dap
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index ddde613b126..f34a2bb50f8 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/08/18 22:46:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/23 23:14:21 tron Exp $
#
DISTNAME= snd
@@ -10,11 +10,10 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://ccrma-www.stanford.edu/CCRMA/Software/snd/snd.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
NO_SRC_ON_FTP= Already on MASTER_SITE_LOCAL
-USE_MOTIF= yes
+USE_MOTIF= YES
+USE_XPM= YES
MAKEFILE= makefile.netbsd
ALL_TARGET= snd
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index 5010eba12e2..365974de76f 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/01 19:42:22 david Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:22 tron Exp $
DISTNAME= xmradio-0.9b2
CATEGORIES= audio
@@ -8,13 +8,13 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.rostock.zgdv.de/~runge/xmradio.html
DEPENDS+= sox>=12.16:../sox
-DEPENDS+= xpm-3.4k:../../graphics/xpm
ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-i386 \
NetBSD-1.5_ALPHA-i386 NetBSD-1.[5-9]*-*
-USE_MOTIF= yes
-USE_IMAKE= yes
+USE_MOTIF= YES
+USE_IMAKE= YES
+USE_XPM= YES
post-install:
${MKDIR} ${PREFIX}/share/doc/xmradio
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index 897df97b9ee..5b6f9f592d5 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/04/24 14:52:33 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 23:14:22 tron Exp $
#
DISTNAME= xwave2
@@ -8,9 +8,8 @@ MASTER_SITES= http://www.funet.fi/~kouhia/
MAINTAINER= hubertf@netbsd.org
-DEPENDS+= xpm-3.*:../../graphics/xpm
-
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/xwave ${PREFIX}/bin
diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile
index c9ae200cde3..3b7c8567d1e 100644
--- a/cad/xchiplogo/Makefile
+++ b/cad/xchiplogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/12/23 03:57:11 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:22 tron Exp $
#
DISTNAME= xchiplogo
@@ -10,9 +10,9 @@ MAINTAINER= dmcmahill@netbsd.org
HOMEPAGE= http://www.eleceng.adelaide.edu.au/Personal/moini/chiplogo.html
DEPENDS+= xforms-*:../../x11/xforms
-DEPENDS+= xpm-*:../../graphics/xpm
-USE_X11= yes
+USE_X11= YES
+USE_XPM= YES
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${LOCALBASE}/bin/xchiplogo
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index 88ceced5944..51c42de66b3 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/08/26 19:01:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 23:14:22 tron Exp $
#
DISTNAME= xisp-2.6p1
@@ -12,9 +12,9 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://users.hol.gr/~dbouras/
DEPENDS+= xforms-0.88:../../x11/xforms
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11BASE= yes
+USE_X11BASE= YES
+USE_XPM= YES
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xisp
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index a08d41b37aa..7635ecca80f 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/15 05:54:19 bad Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:23 tron Exp $
#
DISTNAME= xmysql-1.10
@@ -10,9 +10,9 @@ HOMEPAGE= http://web.wt.net/~dblhack
DEPENDS= mysql-client-3.22.32:../../databases/mysql-client
DEPENDS+= xforms-0.88:../../x11/xforms
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11= yes
+USE_X11= YES
+USE_XPM= YES
ALL_TARGET= xmysql
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index d4029a4eaf9..96f8d40b808 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/15 05:54:20 bad Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:22 tron Exp $
#
DISTNAME= xmysqladmin-1.0
@@ -10,9 +10,9 @@ HOMEPAGE= http://www.mysql.com/
DEPENDS= mysql-client-3.22.32:../../databases/mysql-client
DEPENDS+= xforms-0.88:../../x11/xforms
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11= yes
+USE_X11= YES
+USE_XPM= YES
ALL_TARGET= xmysqladmin
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 9ff059664eb..6bf6d335056 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/04/18 09:33:55 rh Exp $
+# $NetBSD: Makefile,v 1.29 2000/08/23 23:14:23 tron Exp $
# $FreeBSD Id: Makefile,v 1.5 1998/02/19 09:43:16 obrien Exp
#
@@ -9,11 +9,10 @@ MASTER_SITES= ${MASTER_SITE_GNU:=ddd/}
MAINTAINER= frueauf@netbsd.org
HOMEPAGE= http://www.gnu.org/software/ddd/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_MOTIF= yes
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_MOTIF= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
+USE_GMAKE= YES
CONFIGURE_ARGS+= --with-ncurses=no
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 5fdfe6479ae..51fe7349ecb 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/04 11:09:38 abs Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/23 23:14:23 tron Exp $
#
# According to AbiSource's explanation of their trademark rights,
@@ -20,11 +20,11 @@ HOMEPAGE= http://www.abisource.com/
BUILD_DEPENDS+= ${LOCALBASE}/bin/unzip:../../archivers/unzip
DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= png>=1.0.6:../../graphics/png
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11= # defined
-USE_GMAKE= # defined
-NO_CONFIGURE= # defined
+USE_X11= YES
+USE_XPM= YES
+USE_GMAKE= YES
+NO_CONFIGURE= YES
ALL_TARGET= compile canonical
DIST_SUBDIR= abisuite
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index e0518ab5348..1db6a46f161 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/07/07 17:32:33 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/23 23:14:23 tron Exp $
DISTNAME= nedit-5.1.1-src
PKGNAME= nedit-5.1.1
@@ -8,11 +8,10 @@ MASTER_SITES= http://ftp.nedit.org/ftp/v5_1_1/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.nedit.org/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_MOTIF= YES
+USE_XPM= YES
-USE_MOTIF= yes
-
-NO_CONFIGURE= yes
+NO_CONFIGURE= YES
ALL_TARGET= netbsd
WRKSRC= ${WRKDIR}/${PKGNAME}
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 73b8db8c605..46d1e4de799 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/08/04 18:49:27 martin Exp $
+# $NetBSD: Makefile,v 1.23 2000/08/23 23:14:23 tron Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
DISTNAME= xemacs-21.1.9
@@ -18,11 +18,11 @@ USE_XAW= yes
DEPENDS+= gdbm>=1.7.3:../../databases/gdbm
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
-DEPENDS+= xpm-3.4k:../../graphics/xpm
NOT_FOR_PLATFORM= *-*-alpha *-*-mips* #fails purespace dumping
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= YES
+USE_XPM= YES
DIST_SUBDIR= xemacs
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 759820390ae..778b53a99b0 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/07/11 09:31:32 agc Exp $
+# $NetBSD: Makefile,v 1.25 2000/08/23 23:14:23 tron Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
#
@@ -12,12 +12,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
-USE_PERL5= yes
-USE_XAW= yes
+USE_X11BASE= YES
+GNU_CONFIGURE= YES
+USE_PERL5= YES
+USE_XAW= YES
+USE_XPM= YES
MAKEFILE= makefile
CONFIGURE_ARGS+= --with-screen=Xaw --with-xpm --with-perl --with-lib-dir=${X11PREFIX}/libexec
INSTALL_TARGET= install install-perl
diff --git a/emulators/wine-current/Makefile b/emulators/wine-current/Makefile
index e8804e13091..540265199ba 100644
--- a/emulators/wine-current/Makefile
+++ b/emulators/wine-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/23 15:33:40 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 23:14:24 tron Exp $
DISTNAME= Wine-990328
PKGNAME= wine-990328
@@ -9,13 +9,13 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
MAINTAINER= tv@netbsd.org
HOMEPAGE= http://www.winehq.com/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= ncurses>=4.2:../../devel/ncurses
ONLY_FOR_PLATFORM= NetBSD-*-i386
-USE_X11= yes
-GNU_CONFIGURE= yes
+USE_X11= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS= --enable-dll
CONFIGURE_ENV= CC="${CC} -idirafter ${LOCALBASE}/include"
MAKE_ENV= LDOPTIONS="${LDFLAGS}"
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 67334c4a781..a9e3a2081e9 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/08/23 15:33:39 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2000/08/23 23:14:24 tron Exp $
DISTNAME= Wine-981211
PKGNAME= wine-981211
@@ -9,12 +9,11 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www.winehq.com/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
ONLY_FOR_PLATFORM= NetBSD-*-i386
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-dll
post-install:
diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile
index ca433bfc05e..3120467a9c7 100644
--- a/emulators/xcopilot/Makefile
+++ b/emulators/xcopilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/05/24 20:39:42 tv Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:24 tron Exp $
#
DISTNAME= xcopilot-0.6.6
@@ -12,7 +12,8 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
NOT_FOR_PLATFORM= *-*-alpha # suspected LP64 bugs
-GNU_CONFIGURE= yes
-USE_X11= yes
+GNU_CONFIGURE= YES
+USE_X11= YES
+USE_XPM= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 269baf8ddb1..db8ae87372f 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2000/07/13 20:54:01 martin Exp $
+# $NetBSD: Makefile,v 1.38 2000/08/23 23:14:24 tron Exp $
#
DISTNAME= xmame-0.37b4.1
@@ -10,10 +10,10 @@ MAINTAINER= soren@netbsd.org
HOMEPAGE= http://x.mame.net/
DEPENDS= unzip>=5.40:../../archivers/unzip
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11BASE= yes
-USE_GMAKE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_GMAKE= YES
MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} \
MAME_CPU=${MAME_CPU} \
INSTALL_MAN="${INSTALL_MAN}" \
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 5b805192b9c..f4541cccc22 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 08:38:01 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/23 23:14:24 tron Exp $
#
DISTNAME= crossfire-0.94.2
@@ -10,7 +10,6 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.fak14.uni-muenchen.de/~h729ihqu/games/crossfire.html
DEPENDS+= rplay>=3.2.0:../../audio/rplay
-DEPENDS+= xpm-3.4k:../../graphics/xpm
EXTRACT_ONLY= ${CF_SRC}
@@ -18,8 +17,9 @@ CF_SRC= crossfire-0.94.2.tar.gz
CF_MAPS= crossfire-0.94.2.maps.tar.gz
CF_SOUND= crossfire-0.92.7.sounds.tar.gz
-USE_IMAKE= yes
-USE_PERL5= yes
+USE_IMAKE= YES
+USE_PERL5= YES
+USE_XPM= YES
SCRIPTS_ENV+= ${SCRIPTSDIR}
INSTALL_FILE= ${WRKDIR}/.INSTALL
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index c9d80a2f1f4..f954ad62e1d 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/08/12 06:34:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:27 tron Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
@@ -8,8 +8,9 @@ DEPENDS+= xpm-*:../../graphics/xpm
CONFLICTS= freeciv-client-gtk-*
-USE_XAW= # defined
-USE_X11= # defined
+USE_X11= YES
+USE_XAW= YES
+USE_XPM= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index f1d497f241c..e66a3578ba3 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/30 05:46:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 23:14:25 tron Exp $
DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz
PKGNAME= maelstrom-2.0.6
@@ -11,8 +11,6 @@ DISTFILES= ${DISTNAME} ${STREK} ${SWARS} ${ESOUND}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.ambrosiasw.com/Products/Maelstrom.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
ESOUND= Maelstrom-Sounds-L2.0.0.tar.gz
STREK= Star_Trek.tar.gz
SWARS= Star_Wars.tar.gz
@@ -20,7 +18,8 @@ SWARS= Star_Wars.tar.gz
EXTRACT_ONLY= ${DISTNAME}
WRKSRC= ${WRKDIR}/Maelstrom
-USE_X11BASE= yes
+USE_X11BASE= YES
+USE_XPM= YES
EVAL_PREFIX+= XPMDIR=xpm
MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} XPMDIR=${XPMDIR}
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index f538d0af990..c621c72da86 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 08:39:54 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/23 23:14:24 tron Exp $
#
DISTNAME= mirrormagic-1.3
@@ -7,9 +7,8 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/}
MAINTAINER= root@garbled.net
-DEPENDS= xpm-3.4k:../../graphics/xpm
-
USE_X11BASE= YES
+USE_XPM= YES
do-install:
${INSTALL_PROGRAM} -o bin -g games -m 2755 ${WRKSRC}/mirrormagic ${X11PREFIX}/bin
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 9fb093c0444..3dd1242e49d 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/08/10 17:50:10 pooka Exp $
+# $NetBSD: Makefile,v 1.21 2000/08/23 23:14:26 tron Exp $
#
.include "../nethack-lib/Makefile.common"
@@ -7,13 +7,13 @@ PKGNAME= nethack-qt-${NETHACK_VERSION}
CATEGORIES+= x11
DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= qt2-2.0.2:../../x11/qt
-USE_X11= yes
+USE_X11= YES
+USE_XPM= YES
+
ALL_TARGET= x11tiles nethack
INSTALL_TARGET= binfiles
-
EVAL_PREFIX+= QT2DIR=qt2
PATH= ${QT2DIR}/qt2/bin:$$PATH
MAKE_ENV+= GTYPE=-qt QTDIR=${QT2DIR}/qt2
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index b810648a445..b9cb2e66097 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/10 17:50:08 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 23:14:26 tron Exp $
#
.include "../nethack-lib/Makefile.common"
@@ -8,9 +8,9 @@ PKGNAME= nethack-x11-${NETHACK_VERSION}
CATEGORIES+= x11
DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11= yes
+USE_X11= YES
+USE_XPM= YES
ALL_TARGET= nethack
INSTALL_TARGET= binfiles
MAKE_ENV+= GTYPE=-x11
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index 7ca42a903bc..1bc3a62874d 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/01/02 03:20:12 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:26 tron Exp $
#
DISTNAME= nighthawk-2.1
@@ -14,10 +14,9 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.downunder.net.au/~jsno/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
USE_GMAKE= YES
USE_X11= YES
+USE_XPM= YES
post-build:
cd ${WRKSRC}/src_sound ; \
diff --git a/games/tanked/Makefile b/games/tanked/Makefile
index 03bc7e3a959..43ab904eab6 100644
--- a/games/tanked/Makefile
+++ b/games/tanked/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/11 08:41:32 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:25 tron Exp $
#
DISTNAME= tanked-0.90
@@ -8,9 +8,8 @@ MASTER_SITES= http://ogresoft.dyn.ml.org/
MAINTAINER= root@garbled.net
HOMEPAGE= http://ogresoft.dyn.ml.org/tanked.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE= yes
+USE_X11BASE= YES
+USE_XPM= YES
post-patch:
@${TOUCH} ${WRKSRC}/client/tanked.man
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index 3bf1dc6d51c..819ac1146c3 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:19 agc Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/23 23:14:26 tron Exp $
#
DISTNAME= xarchon-0.50
@@ -9,11 +9,11 @@ MASTER_SITES= http://xarchon.seul.org/ \
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://xarchon.seul.org/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= esound-*:../../audio/esound
-GNU_CONFIGURE= yes
+USE_XPM= YES
+GNU_CONFIGURE= YES
EVAL_PREFIX+= GTKDIR=gtk+ XPMDIR=xpm
CONFIGURE_ARGS+=--with-xpm-prefix=${XPMDIR} \
--with-gtk-prefix=${GTKDIR} \
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index b1dd8647450..16c2893129d 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/29 17:15:17 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/23 23:14:25 tron Exp $
#
DISTNAME= xbill-2.0
@@ -9,10 +9,9 @@ EXTRACT_SUFX= .tgz
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.xbill.org/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-NO_INSTALL_MANPAGES= yes
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
+NO_INSTALL_MANPAGES= YES
post-install:
${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/man/man6/xbill.6
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 6f56f8aff4f..21971c69f6e 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/11 08:43:53 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/23 23:14:25 tron Exp $
#
DISTNAME= xboing2.4
@@ -9,11 +9,11 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.catt.rmit.edu.au/xboing/xboing.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_IMAKE= YES
+USE_XPM= YES
+NO_INSTALL_MANPAGES= YES
WRKSRC= ${WRKDIR}/xboing
-NO_INSTALL_MANPAGES= yes
-USE_IMAKE= yes
post-install:
${CHOWN} bin:games ${X11PREFIX}/bin/xboing
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 99724c6a222..226834b237e 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
-#
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:26 tron Exp $
DISTNAME= xconq-7.2.2
CATEGORIES= games x11
@@ -8,10 +7,9 @@ MASTER_SITES= ftp://sourceware.cygnus.com/pub/xconq/
MAINTAINER= kleink@netbsd.org
HOMEPAGE= http://sourceware.cygnus.com/xconq/
-DEPENDS= xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-xpm
INFO_FILES= xcdesign.info xconq.info
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index fb4ad99aa58..5e787a1daf7 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/08/13 14:30:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.13 2000/08/23 23:14:24 tron Exp $
#
DISTNAME= xdemineur-2.1.1
@@ -9,8 +9,7 @@ MASTER_SITES= ftp://ftp.babafou.eu.org/pub/babafou/ \
MAINTAINER= bouyer@netbsd.org
HOMEPAGE= http://www.spinne.com/x/games/xdemineur/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 8f513da8c3c..ad317e7497b 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/11 08:43:53 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:25 tron Exp $
#
DISTNAME= xgalaga-2.0.34
@@ -8,10 +8,9 @@ MASTER_SITES= http://ogresoft.dyn.ml.org/
MAINTAINER= root@garbled.net
HOMEPAGE= http://ogresoft.dyn.ml.org/xgal.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE= yes
-HAS_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --prefix=${X11PREFIX}/share/xgalaga
CONFIGURE_ARGS+= --exec-prefix=${X11PREFIX}/bin
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index 050b99af1ae..1a2f8d9bf94 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:49 agc Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:25 tron Exp $
#
DISTNAME= xnibbles-1.0BETA4
@@ -9,11 +9,11 @@ MASTER_SITES= http://www.tjhsst.edu/xnibbles/
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.tjhsst.edu/xnibbles/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_X11BASE= YES
+USE_XPM= YES
+USE_GMAKE= YES
WRKSRC= ${WRKDIR}/xnibbles
-USE_X11BASE= yes
-USE_GMAKE= yes
ALL_TARGET= netbsd
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index f27dee92bb3..4af49333d8d 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/28 18:12:06 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:27 tron Exp $
# FreeBSD: ports/games/xpat2/Makefile,v 1.11 2000/04/14 12:27:59 asami Exp
DISTNAME= xpat2-1.06
@@ -7,9 +7,8 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=games/solitaires/}
MAINTAINER= kuebart@mathematik.uni-ulm.de
-DEPENDS= xpm-*:../../graphics/xpm
-
-USE_X11BASE= # defined
+USE_X11BASE= YES
+USE_XPM= YES
EVAL_PREFIX= XPMDIR=xpm
MAKE_ENV+= XPMDIR="${XPMDIR}"
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 7b3ceba4b02..4949f591ef5 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/11 20:01:19 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:26 tron Exp $
DISTNAME= xpuyopuyo-0.9.1
CATEGORIES= games x11
@@ -11,13 +11,13 @@ HOMEPAGE= http://chaos2.org/xpuyopuyo/
BUILD_DEPENDS+= autoreconf:../../devel/autoconf
DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= libmikmod>=3.1.9:../../audio/libmikmod
-DEPENDS+= xpm-*:../../graphics/xpm
-USE_X11BASE= # defined
-USE_LIBTOOL= # defined
+USE_X11BASE= YES
+USE_XPM= YES
+USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-gnome # install desktop and pixmap files
CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="${GNOME_CONFIG}"
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 805fbe4d77e..c98004e431e 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/01/02 03:20:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:26 tron Exp $
#
DISTNAME= xscrabble
@@ -9,11 +9,10 @@ MASTER_SITES= http://www.belgarath.demon.co.uk/programs/
MAINTAINER= dmcmahill@netbsd.org
HOMEPAGE= http://www.belgarath.demon.co.uk/programs/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
WRKSRC= ${WRKDIR}/xscrabble
-USE_X11BASE= yes
-USE_IMAKE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_IMAKE= YES
post-patch:
${SED} 's!/usr/local/lib!${PREFIX}/share/games/xscrabble!g' \
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 015d043a06f..5d05b476edf 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:59 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:25 tron Exp $
#
DISTNAME= xsoldier-0.96
@@ -8,10 +8,9 @@ MASTER_SITES= http://www.surfline.ne.jp/hachi/xsoldier/
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.surfline.ne.jp/hachi/xsoldier.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE= yes
-NO_INSTALL_MANPAGES= yes
+USE_IMAKE= YES
+USE_XPM= YES
+NO_INSTALL_MANPAGES= YES
post-patch:
${TOUCH} ${WRKSRC}/xsoldier.man
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 852fbabb49b..3c300ecede2 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/08/23 21:27:58 veego Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/23 23:14:29 tron Exp $
DISTNAME= fxtv-1.02
CATEGORIES= graphics
@@ -14,9 +14,10 @@ DEPENDS+= xpm-3.4[j-z]:../../graphics/xpm
ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-*
-USE_GMAKE= yes
-USE_XAW= yes
-USE_X11BASE= yes
+USE_X11BASE= YES
+USE_XAW= YES
+USE_XPM= YES
+USE_GMAKE= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index b82d65259bd..d8f550219ac 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/08/04 23:59:02 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2000/08/23 23:14:27 tron Exp $
# FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
#
@@ -11,13 +11,13 @@ HOMEPAGE= http://www.boutell.com/gd/
DEPENDS+= freetype-lib>=1.3.1:../../graphics/freetype-lib
DEPENDS+= png>=1.0.6:../../graphics/png
-DEPENDS+= xpm-*:../../graphics/xpm
DEPENDS+= jpeg-*:../../graphics/jpeg
-USE_X11= # defined
-USE_LIBTOOL= # defined
+USE_X11= YES
+USE_XPM= YES
+USE_LIBTOOL= YES
-NO_CONFIGURE= # defined
+NO_CONFIGURE= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index 6cee6ede595..a8557d6dea3 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/07/31 04:14:07 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2000/08/23 23:14:28 tron Exp $
DISTNAME= gimp-1.1.24
CATEGORIES= graphics
@@ -16,13 +16,13 @@ DEPENDS+= gtk+>=1.2.7:../../x11/gtk
DEPENDS+= mpeg-1.2.1:../../graphics/mpeg-lib
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11BASE= yes
-USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_GMAKE= YES
+USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= YES
EVAL_PREFIX+= GTKDIR=gtk+
CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" \
--disable-perl \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 19756ffb3c7..6be60a88a44 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2000/08/15 23:13:59 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2000/08/23 23:14:27 tron Exp $
DISTNAME= gimp-1.0.4
CATEGORIES= graphics
@@ -17,17 +17,17 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= mpeg-1.2.1:../../graphics/mpeg-lib
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
-DEPENDS+= xpm-3.4k:../../graphics/xpm
GIMP_DATA= gimp-data-extras-1.0.0
.ifndef DISPLAY
-IS_INTERACTIVE= yes
+IS_INTERACTIVE= YES
.endif
-USE_X11BASE= yes
-USE_GMAKE= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_GMAKE= YES
+USE_LIBTOOL= YES
+GNU_CONFIGURE= YES
EVAL_PREFIX+= GTKDIR=gtk+
CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}"
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 103dc85f65c..3429c6471f4 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/08/06 14:18:32 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/23 23:14:29 tron Exp $
#
DISTNAME= libwmf-0.1.17
@@ -12,13 +12,10 @@ HOMEPAGE= http://www.csn.ul.ie/~caolan/docs/libwmf.html
BUILD_DEPENDS+= autoconf:../../devel/autoconf
DEPENDS+= freetype-lib>=1.3.1:../../graphics/freetype-lib
DEPENDS+= png>=1.0.6:../../graphics/png
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-WRKSRC= ${WRKDIR}/libwmf
-USE_X11= # defined
-
-GNU_CONFIGURE= # defined
+USE_X11= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
EVAL_PREFIX+= XPMDIR=xpm
CONFIGURE_ARGS+= --includedir="${PREFIX}/include/libwmf"
CONFIGURE_ARGS+= --with-png="${LOCALBASE}"
@@ -27,9 +24,9 @@ CONFIGURE_ARGS+= --with-xpm="${XPMDIR}"
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include # png.h
-
INCLUDEDIR= ${PREFIX}/include/libwmf
HTMLDIR= ${PREFIX}/share/doc/html/libwmf
+WRKSRC= ${WRKDIR}/libwmf
pre-configure:
cd ${WRKSRC} && autoconf
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 7eade522373..f840071a776 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:43 tron Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/23 23:14:27 tron Exp $
# FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp
#
@@ -9,9 +9,9 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/pixmap/}
MAINTAINER= packages@netbsd.org
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_IMAKE= YES
+USE_XPM= YES
WRKSRC= ${WRKDIR}/pixmap
-USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index cbe0cb57250..d28c051ce2a 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/03/21 22:40:55 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/23 23:14:27 tron Exp $
#
DISTNAME= xart19980415
@@ -12,11 +12,12 @@ HOMEPAGE= http://www.cqi.com/~humbubba/linux.html
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= tiff-*:../../graphics/tiff
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= png>=1.0.6:../../graphics/png
+USE_IMAKE= YES
+USE_XPM= YES
+
WRKSRC= ${WRKDIR}/19980415
-USE_IMAKE= yes
post-extract:
${FIND} ${WRKSRC} -type d -print | xargs ${CHMOD} 755
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index e5bf61bfec0..a3199ae7bf1 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:43 tron Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/23 23:14:28 tron Exp $
# FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp
#
@@ -9,9 +9,8 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
MAINTAINER= packages@netbsd.org
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE= yes
-USE_GMAKE= yes
+USE_IMAKE= YES
+USE_GMAKE= YES
+USE_XPM= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 47b4cbdd152..05665171c0d 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/07/27 14:01:00 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2000/08/23 23:14:28 tron Exp $
#
DISTNAME= xfig.3.2.3a
@@ -11,11 +11,11 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://epb1.lbl.gov/BVSmith/xfig/
DEPENDS+= transfig-3.2.3:../../print/transfig
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= jpeg-6b:../../graphics/jpeg
-USE_IMAKE= yes
-USE_XAW= yes
+USE_IMAKE= YES
+USE_XAW= YES
+USE_XPM= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index e64b7329efc..852c803255d 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/05/15 02:32:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2000/08/23 23:14:28 tron Exp $
# FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
#
@@ -10,12 +10,12 @@ MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://home.worldonline.dk/~torsten/xpaint/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= tiff-*:../../graphics/tiff
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png>=1.0.6:../../graphics/png
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
pre-configure:
@${SED} -e 's|\$${LOCALBASE}|'${LOCALBASE}'|g' \
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index b7fa7f1dac0..cdba56b4c54 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/08/21 15:16:00 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/23 23:14:28 tron Exp $
# FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
#
@@ -14,12 +14,12 @@ HOMEPAGE= http://www.foolabs.com/xpdf/
DEPENDS+= freetype-lib-1.3.1:../../graphics/freetype
DEPENDS+= ghostscript-fonts-*:../../print/ghostscript-fonts
DEPENDS+= t1lib-1.0.1:../../textproc/t1lib
-DEPENDS+= xpm-3.4k:../../graphics/xpm
CONFLICTS= xpdf-crypto-*
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--enable-japanese --enable-chinese
CONFIGURE_ARGS+=--with-freetype-includes=${LOCALBASE}/include
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 69e2841421c..8fd56e6d784 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/18 22:46:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/23 23:14:29 tron Exp $
#
DISTNAME= xfmail-1.3
@@ -9,7 +9,6 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://Burka.NetVision.net.il/xfmail/xfmail.html
DEPENDS+= gdbm>=1.7.3:../../databases/gdbm
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= xforms-0.88:../../x11/xforms
ONLY_FOR_PLATFORM= *-*-arm32 *-*-i386 *-*-m68k *-*-sparc *-*-ns32k
@@ -19,6 +18,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
USE_X11BASE= YES
+USE_XPM= YES
GNU_CONFIGURE= YES
post-install:
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 2b6b54935c9..fa335d40b70 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/01/09 01:50:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:29 tron Exp $
#
DISTNAME= xmailbox-2.5
@@ -7,9 +7,9 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
MAINTAINER= bouyer@netbsd.org
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
USE_IMAKE= YES
+USE_XPM= YES
+
MAKE_ENV+= INSTALL_PROGRAM='${INSTALL_PROGRAM}'
MAKE_ENV+= INSTALL_MAN='${INSTALL_MAN}'
diff --git a/math/abs/Makefile b/math/abs/Makefile
index 2b07dd00f06..70c3c6e3366 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/20 22:48:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:29 tron Exp $
#
DISTNAME= abs-src-0.5
@@ -9,9 +9,8 @@ MASTER_SITES= http://www.ping.be/bertin/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.ping.be/bertin/abs.shtml
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE= yes
+USE_X11BASE= YES
+USE_XPM= YES
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/abs ${PREFIX}/bin
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 139aa3f0374..be88b0b1731 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/08 17:29:06 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:30 tron Exp $
#
DISTNAME= grace-5.1.0
@@ -8,7 +8,6 @@ MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/grace/src/
MAINTAINER= drochner@netbsd.org
HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= netcdf:../../devel/netcdf
DEPENDS+= jpeg-6*:../../graphics/jpeg
DEPENDS+= tiff-*:../../graphics/tiff
@@ -18,9 +17,10 @@ DEPENDS+= t1lib-1.0.1:../../textproc/t1lib
DEPENDS+= Xbae-*:../../x11/Xbae
#DEPENDS+= fftw-*:../../math/fftw
-USE_GMAKE= yes
-USE_FORTRAN= yes
-USE_MOTIF= yes
+USE_GMAKE= YES
+USE_FORTRAN= YES
+USE_MOTIF= YES
+USE_XPM= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-grace-home=${PREFIX}/grace \
--with-extra-incpath=${LOCALBASE}/include:${X11BASE}/include
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index 0a1267c6ccb..ea3a08159b0 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/25 08:33:58 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/23 23:14:29 tron Exp $
# FreeBSD Id: Makefile,v 1.13 1998/12/12 22:27:21 jseger Exp
#
@@ -15,14 +15,14 @@ MAINTAINER= packages@NetBSD.org
HOMEPAGE= http://plasma-gate.weizmann.ac.il/Xmgr/
BUILD_DEPENDS= bison:../../devel/bison
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= netcdf-3.4:../../devel/netcdf
-USE_FORTRAN= # defined
-USE_X11= # defined
-USE_MOTIF= # defined
+USE_FORTRAN= YES
+USE_X11= YES
+USE_XPM= YES
+USE_MOTIF= YES
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-acegr-home="${PREFIX}"
CONFIGURE_ARGS+= --enable-extra-incpath="${EXTRA_INCDIRS}"
CONFIGURE_ARGS+= --enable-extra-ldpath="${LOCALBASE}/lib"
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 17af78ebf9a..5b639d850e9 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/05 20:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:30 tron Exp $
DISTNAME= root_v2.23.08.source
PKGNAME= root-2.23
@@ -9,12 +9,13 @@ MASTER_SITES= ftp://root.cern.ch/root/
MAINTAINER= drochner@netbsd.org
HOMEPAGE= http://root.cern.ch/
-BUILD_DEPENDS+= cint:../../lang/cint
-DEPENDS+= xpm-*:../../graphics/xpm
+BUILD_DEPENDS+= cint:../../lang/cint
-USE_GMAKE= yes
-ALL_TARGET= netbsd
-MAKE_ENV= LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR}
+USE_GMAKE= YES
+USE_XPM= YES
+
+ALL_TARGET= netbsd
+MAKE_ENV= LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR}
do-configure:
${CP} ${FILESDIR}/Makefile.netbsd ${WRKDIR}/src
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index a8ff40bd913..5d8a3fec6d3 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/02/02 04:05:03 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/23 23:14:30 tron Exp $
DISTNAME= siag-3.1.20
CATEGORIES= misc textproc math
@@ -10,13 +10,13 @@ HOMEPAGE= http://www.edu.stockholm.se/siag/
DEPENDS+= gv-3.5.8:../../print/gv
DEPENDS+= gnuplot-3.7:../../graphics/gnuplot
DEPENDS+= guile-1.3.*:../../lang/guile
-DEPENDS+= xpm-3.4k:../../graphics/xpm
CONFIGURE_ARGS= --with-x --with-guile --includedir=${PREFIX}/include
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_X11= yes
-USE_XAW= yes
+GNU_CONFIGURE= YES
+USE_GMAKE= YES
+USE_X11= YES
+USE_XAW= YES
+USE_XPM= YES
CFLAGS+= -Dunix
LDFLAGS+= -Wl,-R${X11BASE}/lib
diff --git a/misc/xinvest/Makefile b/misc/xinvest/Makefile
index fecaeb4b01b..c9ae922ecb5 100644
--- a/misc/xinvest/Makefile
+++ b/misc/xinvest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/17 20:20:28 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:30 tron Exp $
DISTNAME= xinvest-2.6
CATEGORIES= misc x11
@@ -8,11 +8,11 @@ MASTER_SITES= http://www.sunsite.auc.dk/xinvest/ \
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.sunsite.auc.dk/xinvest/xinvest.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_IMAKE= YES
+USE_MOTIF= YES
+USE_XPM= YES
-USE_IMAKE= yes
-USE_MOTIF= yes
-NO_INSTALL_MANPAGES= yes
+NO_INSTALL_MANPAGES= YES
post-patch:
${TOUCH} ${WRKSRC}/Xinvest.man
diff --git a/net/wmpload/Makefile b/net/wmpload/Makefile
index a014ff0e35d..6995843730e 100644
--- a/net/wmpload/Makefile
+++ b/net/wmpload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/01/25 10:54:55 abs Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:30 tron Exp $
#
DISTNAME= wmpload-0.9.4
@@ -8,9 +8,8 @@ MASTER_SITES= http://www.engr.utk.edu/~mdsmith/pload/
MAINTAINER= abs@netbsd.org
HOMEPAGE= http://www.engr.utk.edu/~mdsmith/pload/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
HAS_CONFIGURE= YES
USE_X11BASE= YES
+USE_XPM= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 030d5932754..fb4be526f2e 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/03/21 22:40:56 tron Exp $
+# $NetBSD: Makefile,v 1.26 2000/08/23 23:14:30 tron Exp $
DISTNAME= knews-1.0b.1
PKGNAME= knews-1.0b1
@@ -11,11 +11,11 @@ HOMEPAGE= http://www.matematik.su.se/~kjj/
DEPENDS+= faces-1.6.1:../../mail/faces
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png>=1.0.6:../../graphics/png
-DEPENDS+= xpm-3.4k:../../graphics/xpm
CONFLICTS= knews-1.0b0
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
BUILD_DEFS+= KNEWS_DOMAIN_NAME KNEWS_DOMAIN_FILE
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 7282e9372e7..d8424b4dece 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/03/09 10:56:12 tron Exp $
+# $NetBSD: Makefile,v 1.26 2000/08/23 23:14:31 tron Exp $
# FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
#
@@ -11,11 +11,11 @@ HOMEPAGE= http://www.lyx.org/
DEPENDS= ispell-3.1.20:../../textproc/ispell
DEPENDS+= teTeX>=1.0.6:../../print/teTeX
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= xforms-0.88:../../x11/xforms
-USE_PERL5= yes
-GNU_CONFIGURE= yes
+USE_PERL5= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib" \
--with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 2df67fae96b..730d76c82c6 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/06/22 08:11:34 itohy Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/23 23:14:31 tron Exp $
#
DISTNAME= transfig.3.2.3
@@ -9,9 +9,9 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/drawing_tools/transfig/}
MAINTAINER= root@garbled.net
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= jpeg-6b:../../graphics/jpeg
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index e842c8f131d..bb916cee57e 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:24 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/23 23:14:31 tron Exp $
# FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
#
@@ -15,10 +15,9 @@ HOMEPAGE= http://www.tigr.net/afterstep/as-apps/download/asapm/
IGNORE+= "APM is not available for ${MACHINE_PLATFORM}"
.endif
-DEPENDS+= xpm-*:../../graphics/xpm
-
-GNU_CONFIGURE= yes
-USE_X11= yes
+GNU_CONFIGURE= YES
+USE_X11= YES
+USE_XPM= YES
CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support
EVAL_PREFIX+= XPMDIR=xpm
CONFIGURE_ARGS+= --with-xpm \
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 460a0930744..c9edf821f7b 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/11 10:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:31 tron Exp $
#
DISTNAME= xbatt-1.3pr1
@@ -13,9 +13,8 @@ HOMEPAGE= http://www2.clave.gr.jp/~eto/xbatt/ # Not really
IGNORE+= "APM is not available for ${MACHINE_PLATFORM}"
.endif
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
ALL_TARGET= xbatt
post-install:
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 9a0e5e28919..24101af3bba 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/07/13 15:48:47 agc Exp $
+# $NetBSD: Makefile,v 1.30 2000/08/23 23:14:31 tron Exp $
#
DISTNAME= xosview-1.7.0.b
@@ -9,21 +9,21 @@ MASTER_SITES= http://www.ece.utexas.edu/~bgrayson/xosview/ \
MAINTAINER= bgrayson@netbsd.org
HOMEPAGE= http://lore.ece.utexas.edu/~bgrayson/xosview.html
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --prefix=${PREFIX}
-USE_X11BASE= yes
+USE_X11BASE= YES
+USE_XPM= YES
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
BUILD_DEFS= UVM
.elif ${OPSYS} == "SunOS"
-DEPENDS+= xpm-*:../../graphics/xpm
BUILD_DEPENDS+= ${LOCALBASE}/egcs/bin/g++:../../lang/egcs
CONFIGURE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
CONFIGURE_ENV+= LIBS="${LIBS} -lsocket -lnsl"
-USE_GMAKE= yes
+USE_GMAKE= YES
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ted/Makefile b/textproc/ted/Makefile
index 0762c264370..d389db12eff 100644
--- a/textproc/ted/Makefile
+++ b/textproc/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/04/22 02:05:11 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/23 23:14:31 tron Exp $
DISTNAME= ted-2.8.src
PKGNAME= ted-2.8
@@ -14,10 +14,10 @@ DEPENDS+= libungif-*:../../graphics/libungif
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
-DEPENDS+= xpm-3.4k:../../graphics/xpm
USE_MOTIF= YES
USE_X11= YES
+USE_XPM= YES
AFMDIR= ${PREFIX}/share/Ted/afm
INDDIR= ${PREFIX}/share/Ted/ind
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index f22a3cefaef..47c9454b474 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/07/29 00:09:59 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2000/08/23 23:14:32 tron Exp $
# FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
#
@@ -13,14 +13,14 @@ HOMEPAGE= http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png>=1.0.6:../../graphics/png
-DEPENDS+= xpm-3.4k:../../graphics/xpm
NOT_FOR_PLATFORM= *-*-alpha #LP64 problems
-USE_X11BASE= # defined
-USE_MOTIF12= # defined
+USE_X11BASE= YES
+USE_XPM= YES
+USE_MOTIF12= YES
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-zdir=/usr
CONFIGURE_ARGS+= --with-jpegdir=${LOCALBASE}
CONFIGURE_ARGS+= --with-pngdir=${LOCALBASE}
diff --git a/www/arena/Makefile b/www/arena/Makefile
index 7a5444237b5..a8dab0ad93d 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2000/08/06 01:19:21 fredb Exp $
+# $NetBSD: Makefile,v 1.27 2000/08/23 23:14:32 tron Exp $
# FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
#
@@ -15,12 +15,12 @@ DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= libwww>=5.2.8:../../www/libwww
DEPENDS+= png>=1.0.6:../../graphics/png
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= YES
MAKEFILE= makefile
-USE_GMAKE= yes
-USE_X11= yes
+USE_GMAKE= YES
+USE_X11= YES
+USE_XPM= YES
# Comment out the following to build in the debugging symbols.
CONFIGURE_ARGS+= --without-debug
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 18ae37b03df..1424b6072c3 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/05/01 18:23:51 tv Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/23 23:14:32 tron Exp $
#
DISTNAME= Xaw-XPM-1.1
@@ -10,11 +10,10 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/X/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.zip.com.au/~bb/XawXpm/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
CONFLICTS= Xaw3d-*
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
post-install:
${MKDIR} ${PREFIX}/share/doc/Xaw-Xpm
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 16642a0689b..e8d2046f2c5 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/06/21 06:25:36 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2000/08/23 23:14:34 tron Exp $
#
DISTNAME= XmHTML-1.1.7
@@ -8,16 +8,16 @@ MASTER_SITES= http://www.xs4all.nl/~ripley/XmHTML/dist/
MAINTAINER= mellon@isc.org
HOMEPAGE= http://www.xs4all.nl/~ripley/XmHTML/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png>=1.0.6:../../graphics/png
-USE_X11= # defined
-USE_MOTIF= # defined
-USE_GMAKE= # defined
-USE_LIBTOOL= # defined
+USE_X11= YES
+USE_XPM= YES
+USE_MOTIF= YES
+USE_GMAKE= YES
+USE_LIBTOOL= YES
-NO_CONFIGURE= # defined
+NO_CONFIGURE= YES
do-install:
${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_DATA} \
diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index 90013caf78d..2f52193d7d0 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/08/15 13:38:05 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2000/08/23 23:14:33 tron Exp $
DISTNAME= AfterStep-1.8.0
PKGNAME= afterstep-1.8.0
@@ -14,14 +14,14 @@ BUILD_DEPENDS+= autoconf:../../devel/autoconf
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= rplay>=3.2.0b6:../../audio/rplay
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= asclock-[0-9]*:../../x11/asclock
DEPENDS+= xp-*:../../x11/xp
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_PERL= yes
-USE_X11= yes
+GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
+USE_PERL= YES
+USE_X11= YES
+USE_XPM= YES
CONFIGURE_ARGS+= --disable-staticlibs
CONFIGURE_ARGS+= --with-helpcommand="xpman"
diff --git a/x11/asclock-xlib/Makefile b/x11/asclock-xlib/Makefile
index b211a8f5130..1ffb19fecdf 100644
--- a/x11/asclock-xlib/Makefile
+++ b/x11/asclock-xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/10/28 19:05:41 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:35 tron Exp $
#
DISTNAME= asclock-xlib-2.0.11
@@ -10,9 +10,8 @@ MASTER_SITES= http://www.asclock.org/tar/
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.asclock.org/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
PLIST_SRC= ${PKGDIR}/PLIST \
${PKGDIR}/PLIST.themes
diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile
index c2df9f7d76f..e952ae12afe 100644
--- a/x11/asclock/Makefile
+++ b/x11/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/11/03 04:24:59 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/23 23:14:32 tron Exp $
#
DISTNAME= asclock-classic-1.0
@@ -9,9 +9,8 @@ MASTER_SITES= http://www.asclock.org/tar/
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.asclock.org/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
LANGUAGES= en de pt nl no it sv es hu br fr cs ru uk sl id da
diff --git a/x11/ctwm/Makefile b/x11/ctwm/Makefile
index 039e1f3004d..69242d050c9 100644
--- a/x11/ctwm/Makefile
+++ b/x11/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/10/07 17:41:59 tron Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/23 23:14:32 tron Exp $
#
DISTNAME= ctwm-3.5
@@ -8,8 +8,7 @@ MASTER_SITES= ftp://slhp1.epfl.ch/pub/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://woland.afti.nsu.ru/~reberger/xwinman/ctwm.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE= yes
+USE_IMAKE= YES
+USE_XPM= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile
index 2cfb3142cb3..7b5110e86cb 100644
--- a/x11/fvwm-wharf/Makefile
+++ b/x11/fvwm-wharf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/03/08 10:53:58 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:33 tron Exp $
DISTNAME= AfterStep-1.0
PKGNAME= fvwm-wharf-1.0
@@ -8,9 +8,8 @@ MASTER_SITES= ftp://ftp.afterstep.org/pub/
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.afterstep.org/
-DEPENDS= xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE= yes
+USE_X11BASE= YES
+USE_XPM= YES
do-configure:
(cd ${WRKSRC} ; xmkmf ; ${MAKE} Makefiles)
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index add8e5f5389..b3bb92fea90 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2000/07/31 08:45:45 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2000/08/23 23:14:33 tron Exp $
DISTNAME= gnome-libs-1.2.3
CATEGORIES= x11 gnome
@@ -11,14 +11,14 @@ DEPENDS+= ORBit-*:../../net/ORBit
DEPENDS+= esound>=0.2.18:../../audio/esound
DEPENDS+= gtk+>=1.2.7:../gtk
DEPENDS+= imlib-*:../../graphics/imlib
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11BASE= # defined
-USE_GMAKE= # defined
-USE_LIBTOOL= # defined
+USE_X11BASE= YES
+USE_XPM= YES
+USE_GMAKE= YES
+USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--with-glib-prefix=${LOCALBASE}
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile
index f5bf9e0a33f..3652b84afb6 100644
--- a/x11/icewm/Makefile
+++ b/x11/icewm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2000/07/31 07:37:00 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 23:14:36 tron Exp $
#
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_XPM= YES
CONFLICTS+= icewm-gnome-[0-9]*
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 3fa24e5e213..e9ed5d9479e 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2000/08/07 07:32:41 tron Exp $
+# $NetBSD: Makefile,v 1.69 2000/08/23 23:14:32 tron Exp $
# FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
DISTNAME= kdebase-1.1.2
@@ -15,15 +15,15 @@ HOMEPAGE= http://www.kde.org/
BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:../../devel/gettext
DEPENDS+= Mesa-*:../../graphics/Mesa
DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs
-DEPENDS+= xpm-3.4k:../../graphics/xpm
# kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase
# often do, so put the dependency here.
#
DEPENDS+= libungif-*:../../graphics/libungif
-USE_X11BASE= yes
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_GMAKE= YES
+GNU_CONFIGURE= YES
EVAL_PREFIX+= QT1DIR=qt1
CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index 6db51437510..5e4a4acbf56 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:26 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/23 23:14:34 tron Exp $
#
DISTNAME= khostchooser-0.3
@@ -10,14 +10,14 @@ MAINTAINER= root@garbled.net
BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:../../devel/gettext
DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= libungif-*:../../graphics/libungif
WRKSRC= ${WRKDIR}/khostchooser
-USE_X11BASE= yes
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_GMAKE= YES
+GNU_CONFIGURE= YES
EVAL_PREFIX+= QT1DIR=qt1
CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 02d1261192e..64535ab91c0 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/10/19 09:17:35 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/23 23:14:34 tron Exp $
DISTNAME= kterm-6.2.0
CATEGORIES= x11
@@ -12,8 +12,9 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sakamoto@netbsd.org
-USE_IMAKE= yes
-USE_XAW= yes
+USE_IMAKE= YES
+USE_XAW= YES
+USE_XPM= YES
BUILD_DEFS+= KTERM_USE_WALLPAPER
diff --git a/x11/olvwm/Makefile b/x11/olvwm/Makefile
index 6c8b15c39e3..be90222d9c5 100644
--- a/x11/olvwm/Makefile
+++ b/x11/olvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/06/17 09:41:46 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:35 tron Exp $
#
DISTNAME= olvwm4.src4
@@ -11,11 +11,11 @@ HOMEPAGE= http://www.akula.com/~jadler/sdo/olvwm/index.html
DEPENDS+= xview-lib-3.2.*:../xview-lib
DEPENDS+= xview-clients-3.2.*:../xview-clients
-DEPENDS+= xpm-3.*:../../graphics/xpm
-USE_X11BASE= yes
-USE_IMAKE= yes
-NO_WRKSUBDIR= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_IMAKE= YES
+NO_WRKSUBDIR= YES
post-install:
${MV} ${PREFIX}/man/cat1/olvwmrc.1 ${PREFIX}/man/man1/olvwmrc.1
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index c33a138446b..f99860cef3b 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/07/15 20:39:27 agc Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/23 23:14:32 tron Exp $
# FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
#
@@ -11,10 +11,9 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= gcw@rxvt.org
HOMEPAGE= http://www.rxvt.org/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
EVAL_PREFIX+= XPMDIR=xpm
CONFIGURE_ARGS+= --enable-utmp \
diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile
index 96929944788..10bb40d4988 100644
--- a/x11/scwm/Makefile
+++ b/x11/scwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/08/17 14:15:49 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/23 23:14:35 tron Exp $
#
DISTNAME= scwm-0.9
@@ -12,7 +12,6 @@ DEPENDS+= guile>=1.3.2:../../lang/guile
DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= gtar-1.12:../../archivers/gtar
DEPENDS+= readline>=4.0:../../devel/readline
-DEPENDS+= xpm-3.4k:../../graphics/xpm
BROKEN= Current release does not work with guile-1.4.0.
@@ -21,9 +20,10 @@ CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} \
--with-gtk-prefix="${GTKDIR}" \
--enable-multibyte
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_X11BASE= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
+USE_GMAKE= YES
+USE_LIBTOOL= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/speyes/Makefile b/x11/speyes/Makefile
index cbbb67411a2..13764761c3c 100644
--- a/x11/speyes/Makefile
+++ b/x11/speyes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/01/16 01:28:35 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:36 tron Exp $
DISTNAME= speyes-1.2.0
CATEGORIES= x11
@@ -7,9 +7,8 @@ MASTER_SITES= http://www.halcyon.com/amalmin/speyes/
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.halcyon.com/amalmin/speyes/speyes.html
-DEPENDS+= xpm-*:../../graphics/xpm
-
-USE_X11BASE= yes
-USE_IMAKE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_IMAKE= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tvtwm/Makefile b/x11/tvtwm/Makefile
index 91f2db1810d..b3efede38d1 100644
--- a/x11/tvtwm/Makefile
+++ b/x11/tvtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/06/21 13:17:52 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:34 tron Exp $
DISTNAME= tvtwm.pl11
PKGNAME= tvtwm-11
@@ -7,10 +7,9 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=window_managers/}
MAINTAINER= packages@netbsd.org
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_IMAKE= YES
+USE_XPM= YES
WRKSRC= ${WRKDIR}/tvtwm
-USE_IMAKE= yes
-
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 8a41bc9f2a0..0183ab71173 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2000/07/31 04:14:12 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2000/08/23 23:14:34 tron Exp $
DISTNAME= WindowMaker-0.62.1
PKGNAME= windowmaker-0.62.1
@@ -17,12 +17,12 @@ DEPENDS+= libungif-*:../../graphics/libungif
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_LIBTOOL= yes
+USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-usermenu \
--with-nlsdir=${PREFIX}/share/locale \
--with-incs-from="-I${LOCALBASE}/include" \
diff --git a/x11/wmavgload/Makefile b/x11/wmavgload/Makefile
index 874477d1c0e..0b530e90915 100644
--- a/x11/wmavgload/Makefile
+++ b/x11/wmavgload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/11/11 16:11:26 ad Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:36 tron Exp $
DISTNAME= wmavgload-0.7.0
CATEGORIES= x11
@@ -6,9 +6,9 @@ MASTER_SITES= ftp://ftp.windowmaker.org/pub/contrib/srcs/utils/
MAINTAINER= ad@netbsd.org
-DEPENDS= xpm-3.4k:../../graphics/xpm
+USE_IMAKE= YES
+USE_XPM= YES
-USE_IMAKE= yes
-NO_INSTALL_MANPAGES= yes
+NO_INSTALL_MANPAGES= YES
.include <../../mk/bsd.pkg.mk>
diff --git a/x11/wmcalclock/Makefile b/x11/wmcalclock/Makefile
index 8aa610f0170..6faf50c2d3e 100644
--- a/x11/wmcalclock/Makefile
+++ b/x11/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/02/06 00:41:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:37 tron Exp $
DISTNAME= wmCalClock-1.25
CATEGORIES= x11
@@ -7,13 +7,12 @@ MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
MAINTAINER= wiz@netbsd.org
HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
-DEPENDS= xpm-3.4k:../../graphics/xpm/
+USE_X11BASE= YES
+USE_XPM= YES
+USE_GMAKE= YES
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
-USE_X11BASE= yes
-USE_GMAKE= yes
-
do-install:
${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/
${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index ed146aa1c8b..7309c81457b 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/10/05 01:27:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:35 tron Exp $
#
DISTNAME= wmfire-0.0.3.8
@@ -7,9 +7,8 @@ MASTER_SITES= http://www.zebra.net/~dm/wmfire/
MAINTAINER= hubertf@netbsd.org
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
USE_X11= YES
+USE_XPM= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= CPPFLAGS=-I${X11BASE}/include
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index fe05533ad52..094964261a9 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/01/07 05:43:21 sakamoto Exp $
-#
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:36 tron Exp $
DISTNAME= wmfstatus-0.3
CATEGORIES= x11
@@ -8,9 +7,8 @@ MASTER_SITES= http://www.finik.net/files/
MAINTAINER= sakamoto@netbsd.org
HOMEPAGE= http://www.finik.net/software.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_X11= yes
+USE_X11= YES
+USE_XPM= YES
CPPFLAGS= -I${X11BASE}/include
MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
diff --git a/x11/wmmoonclock/Makefile b/x11/wmmoonclock/Makefile
index f8b7d2f42c9..7cd2c20c729 100644
--- a/x11/wmmoonclock/Makefile
+++ b/x11/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/08/06 15:15:21 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:37 tron Exp $
DISTNAME= wmMoonClock-1.27
CATEGORIES= x11
@@ -7,10 +7,9 @@ MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
MAINTAINER= tron@netbsd.org
HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
USE_GMAKE= YES
USE_X11BASE= YES
+USE_XPM= YES
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmtime/Makefile b/x11/wmtime/Makefile
index 83c4ed6fcc4..4bf60e915d0 100644
--- a/x11/wmtime/Makefile
+++ b/x11/wmtime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/31 13:28:14 ad Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:36 tron Exp $
DISTNAME= wmtime-1.0b2
CATEGORIES= x11
@@ -6,11 +6,11 @@ MASTER_SITES= http://www.netbsd.org/~ad/distfiles/
MAINTAINER= ad@netbsd.org
-DEPENDS= xpm-3.4k:../../graphics/xpm
+USE_IMAKE= YES
+USE_XPM= YES
-USE_IMAKE= yes
-NO_INSTALL_MANPAGES= 1
-WRKSRC= ${WRKDIR}/wmtime.app/wmtime
+NO_INSTALL_MANPAGES= YES
+WRKSRC= ${WRKDIR}/wmtime.app/wmtime
post-extract:
${CP} ${WRKSRC}/../Imakefile ${WRKSRC}/Imakefile
diff --git a/x11/wmx/Makefile b/x11/wmx/Makefile
index 6513cf2682f..2c44b7e67ce 100644
--- a/x11/wmx/Makefile
+++ b/x11/wmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/22 06:44:53 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:36 tron Exp $
DISTNAME= wmx-5
PKGNAME= wmx-5.0
@@ -8,9 +8,8 @@ MASTER_SITES= http://www.all-day-breakfast.com/wmx/
MAINTAINER= kuebart@mathematik.uni-ulm.de
HOMEPAGE= http://www.all-day-breakfast.com/wmx/
-DEPENDS= xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE= yes
+USE_X11BASE= YES
+USE_XPM= YES
EVAL_PREFIX= XPMDIR=xpm
MAKE_ENV+= XPMDIR=${XPMDIR}
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 477694f0f0f..d7012be738f 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/02/19 19:42:55 rh Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/23 23:14:34 tron Exp $
#
DISTNAME= wterm-6.2.6
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= rh@netbsd.org
HOMEPAGE= http://wm.current.nu/files.php\#wterm
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= windowmaker-*:../../x11/windowmaker
USE_X11BASE= YES
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 86b8b93d49c..a7cba1f35c7 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 10:55:32 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/23 23:14:33 tron Exp $
DISTNAME= XBanner1.31
PKGNAME= xbanner-1.31
@@ -8,10 +8,10 @@ MASTER_SITES= ftp://ftp.digital.com/pub/linux/XBanner/
MAINTAINER= root@garbled.net
HOMEPAGE= http://chaos.fullerton.edu/XBanner/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_IMAKE= YES
+USE_XPM= YES
-NO_INSTALL_MANPAGES= yes
-USE_IMAKE= yes
+NO_INSTALL_MANPAGES= YES
post-install:
@${MKDIR} ${X11PREFIX}/share/doc/xbanner
diff --git a/x11/xbeats/Makefile b/x11/xbeats/Makefile
index 0b547899f33..bee141ad689 100644
--- a/x11/xbeats/Makefile
+++ b/x11/xbeats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/10/05 01:30:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:35 tron Exp $
#
DISTNAME= xbeats-0.4
@@ -8,9 +8,8 @@ MASTER_SITES= http://bohemians.org/~iznogood/xbeats/
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://bohemians.org/~iznogood/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
-USE_X11= yes
-GNU_CONFIGURE= yes
+USE_X11= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 13614263015..56238538b4b 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/31 04:14:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/23 23:14:35 tron Exp $
DISTNAME= xfce-3.3.1
CATEGORIES= x11
@@ -10,11 +10,11 @@ HOMEPAGE= http://www.xfce.org/
DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext
DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= imlib-1.9.*:../../graphics/imlib
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_X11= yes
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
+USE_X11= YES
+USE_XPM= YES
+USE_X11BASE= YES
+GNU_CONFIGURE= YES
CONFIGURE_ENV+= XFCE_LOCALE_DIR=${PREFIX}/share/locale
EVAL_PREFIX+= IMLIBDIR=imlib XPMDIR=xpm
@@ -22,6 +22,6 @@ CONFIGURE_ARGS+=--without-included-gettext \
--datadir=${PREFIX}/share \
--with-imlib=${IMLIBDIR} \
--with-xpm=${XPMDIR}
-USE_GMAKE= yes
+USE_GMAKE= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 9efa6438357..0ddd3eb8f26 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/08/15 14:29:13 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2000/08/23 23:14:33 tron Exp $
#
DISTNAME= bxform-088
@@ -23,8 +23,6 @@ ARCH_SUBDIR= netBSD-${MACHINE_ARCH}
DIST_SUBDIR= xforms-${MACHINE_ARCH}
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \
NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc
@@ -38,10 +36,11 @@ DISTNAME= bxform-088-ELF
.endif
## Define OBJMACHINE so WRKDIR is defined to be ${MACHINE_ARCH}-specific.
-OBJMACHINE= yes
+OBJMACHINE= YES
-USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_X11BASE= YES
+USE_XPM= YES
+USE_LIBTOOL= YES
MAKEFILE= ${FILESDIR}/Makefile
PLIST_SRC= ${PKGDIR}/PLIST.mi ${PKGDIR}/PLIST.shlib
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index f444d5eb079..d4a7efeed6b 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2000/08/21 20:31:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.33 2000/08/23 23:14:33 tron Exp $
# FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
#
@@ -10,11 +10,11 @@ MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.tux.org/~bagleyd/xlockmore.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= Mesa-*:../../graphics/Mesa
-GNU_CONFIGURE= yes
-USE_X11BASE= yes
+GNU_CONFIGURE= YES
+USE_X11BASE= YES
+USE_XPM= YES
CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \
--without-editres --without-dtsaver --without-rplay \
--without-nas --without-gtk
diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index b204dab5136..ca2aab15c60 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/31 00:28:56 itohy Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:37 tron Exp $
#
DISTNAME= xpenguins-1.2
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.met.rdg.ac.uk/~swrhgnrj/xpenguins/
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.met.rdg.ac.uk/~swrhgnrj/xpenguins/
-DEPENDS+= xpm-*:../../graphics/xpm
+USE_XPM= YES
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xpenguins ${PREFIX}/bin
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 81b21e0aca5..242a1058fd6 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/07/22 10:05:47 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/23 23:14:37 tron Exp $
#
DISTNAME= fvwm-${PKG_VERSION}
@@ -14,9 +14,8 @@ MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.fvwm.org/xpmroot.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-
USE_X11BASE= YES
+USE_XPM= YES
WRKSRC= ${WRKDIR}/${DISTNAME}/utils
EVAL_PREFIX= XPMDIR=xpm
diff --git a/x11/xquote/Makefile b/x11/xquote/Makefile
index a8016aa92b7..31c56be1199 100644
--- a/x11/xquote/Makefile
+++ b/x11/xquote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/17 16:55:25 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:34 tron Exp $
DISTNAME= xquote-2.1
CATEGORIES= x11
@@ -8,11 +8,11 @@ MASTER_SITES= http://www.sunsite.auc.dk/xinvest/ \
MAINTAINER= root@garbled.net
HOMEPAGE= http://sunsite.auc.dk/xinvest/xquote.html
-DEPENDS+= xpm-3.4k:../../graphics/xpm
+USE_IMAKE= YES
+USE_MOTIF= YES
+USE_XPM= YES
-USE_IMAKE= yes
-USE_MOTIF= yes
-NO_INSTALL_MANPAGES= yes
+NO_INSTALL_MANPAGES= YES
post-patch:
${TOUCH} ${WRKSRC}/Xquote.man
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile
index 96ac8196fe6..a8e7d00286a 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/31 00:28:56 itohy Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:36 tron Exp $
DISTNAME= xteddy-1.1
CATEGORIES= x11 games
@@ -7,10 +7,9 @@ MASTER_SITES= http://www.ITN.LiU.SE/~stegu/xteddy/
MAINTAINER= johnam@mail.kemper.org
HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy
-DEPENDS+= xpm-*:../../graphics/xpm
-
-GNU_CONFIGURE= yes
-USE_X11= yes
+USE_X11= YES
+USE_XPM= YES
+GNU_CONFIGURE= YES
pre-install:
${MKDIR} ${PREFIX}/share/xteddy