summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-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
35 files changed, 137 insertions, 155 deletions
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