summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjschauma <jschauma>2003-03-03 04:17:23 +0000
committerjschauma <jschauma>2003-03-03 04:17:23 +0000
commitf123a2704ae609327d2ca81a0aea0454e4ae6b51 (patch)
treee8b3b3ed164c392443b55f7878bc9b189c4c8326 /x11
parentac1f6fd775c3d2dec2f0b7800f783a1c36245f1d (diff)
downloadpkgsrc-f123a2704ae609327d2ca81a0aea0454e4ae6b51.tar.gz
Use new IMAKE_MAN_DIR variables in PLISTs to make these packages more
portable. Bump PKGREVISION accordingly.
Diffstat (limited to 'x11')
-rw-r--r--x11/XF86Setup/Makefile3
-rw-r--r--x11/XF86Setup/PLIST6
-rw-r--r--x11/kterm/Makefile3
-rw-r--r--x11/kterm/PLIST4
-rw-r--r--x11/oneko/Makefile3
-rw-r--r--x11/oneko/PLIST4
-rw-r--r--x11/unclutter/PLIST4
-rw-r--r--x11/x2x/Makefile6
-rw-r--r--x11/x2x/PLIST5
-rw-r--r--x11/x3270/Makefile3
-rw-r--r--x11/x3270/PLIST12
-rw-r--r--x11/xaniroc/Makefile3
-rw-r--r--x11/xaniroc/PLIST4
-rw-r--r--x11/xcb/Makefile3
-rw-r--r--x11/xcb/PLIST4
-rw-r--r--x11/xclip/Makefile3
-rw-r--r--x11/xclip/PLIST4
-rw-r--r--x11/xcolors/Makefile3
-rw-r--r--x11/xcolors/PLIST4
-rw-r--r--x11/xcolorsel/Makefile3
-rw-r--r--x11/xcolorsel/PLIST4
-rw-r--r--x11/xearth/Makefile4
-rw-r--r--x11/xearth/PLIST4
-rw-r--r--x11/xephem/Makefile3
-rw-r--r--x11/xephem/PLIST4
-rw-r--r--x11/xforms/Makefile3
-rw-r--r--x11/xforms/PLIST6
-rw-r--r--x11/xgas/Makefile3
-rw-r--r--x11/xgas/PLIST4
-rw-r--r--x11/xkeycaps/Makefile3
-rw-r--r--x11/xkeycaps/PLIST4
-rw-r--r--x11/xless/Makefile3
-rw-r--r--x11/xless/PLIST4
-rw-r--r--x11/xlogout/Makefile3
-rw-r--r--x11/xlogout/PLIST4
-rw-r--r--x11/xmascot/Makefile3
-rw-r--r--x11/xmascot/PLIST4
-rw-r--r--x11/xmon/Makefile3
-rw-r--r--x11/xmon/PLIST8
-rw-r--r--x11/xmountains/Makefile3
-rw-r--r--x11/xmountains/PLIST4
-rw-r--r--x11/xmove/PLIST6
-rw-r--r--x11/xp/Makefile3
-rw-r--r--x11/xp/PLIST4
-rw-r--r--x11/xpaste/Makefile3
-rw-r--r--x11/xpaste/PLIST4
-rw-r--r--x11/xphoon/Makefile3
-rw-r--r--x11/xphoon/PLIST4
-rw-r--r--x11/xpostit/Makefile3
-rw-r--r--x11/xpostit/PLIST4
-rw-r--r--x11/xscript/Makefile3
-rw-r--r--x11/xscript/PLIST4
-rw-r--r--x11/xsnow/Makefile3
-rw-r--r--x11/xsnow/PLIST4
-rw-r--r--x11/xtoolwait/Makefile3
-rw-r--r--x11/xtoolwait/PLIST4
-rw-r--r--x11/xview-clients/Makefile3
-rw-r--r--x11/xview-clients/PLIST12
-rw-r--r--x11/xview-lib/Makefile4
-rw-r--r--x11/xview-lib/PLIST4
-rw-r--r--x11/xwatchwin/Makefile5
-rw-r--r--x11/xwatchwin/PLIST3
-rw-r--r--x11/xwatchwin/PLIST.netbsd3
-rw-r--r--x11/xwatchwin/PLIST.sunos3
-rw-r--r--x11/xwit/Makefile4
-rw-r--r--x11/xwit/PLIST4
66 files changed, 142 insertions, 123 deletions
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index a95375f69db..34e21fc6df8 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2002/12/28 07:58:55 uebayasi Exp $
+# $NetBSD: Makefile,v 1.25 2003/03/03 04:17:46 jschauma Exp $
DISTNAME= XF86Setup-3.3.6
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/XF86Setup/PLIST b/x11/XF86Setup/PLIST
index 6b1bf015b2f..929eb9802c2 100644
--- a/x11/XF86Setup/PLIST
+++ b/x11/XF86Setup/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:24 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:46 jschauma Exp $
bin/XF86Setup
bin/xmseconfig
lib/X11/XF86Setup/pics/XFree86.msk
@@ -73,5 +73,5 @@ lib/X11/XF86Setup/texts/ja/help_modeselect.tcl
@dirrm lib/X11/XF86Setup/scripts
@dirrm lib/X11/XF86Setup/pics
@dirrm lib/X11/XF86Setup
-man/cat1/XF86Setup.0
-man/cat1/xmseconfig.0
+${IMAKE_MAN_DIR}/XF86Setup.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xmseconfig.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 668e9a8caf2..ecb1ab100cf 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/01/28 22:04:36 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2003/03/03 04:17:45 jschauma Exp $
DISTNAME= kterm-6.2.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
diff --git a/x11/kterm/PLIST b/x11/kterm/PLIST
index 8d4665a3f6e..42428995d7f 100644
--- a/x11/kterm/PLIST
+++ b/x11/kterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:45 jschauma Exp $
bin/kterm
lib/X11/app-defaults/KTerm
-man/cat1/kterm.0
+${IMAKE_MAN_DIR}/kterm.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/oneko/Makefile b/x11/oneko/Makefile
index 479cbc69a10..2e0a39dfad1 100644
--- a/x11/oneko/Makefile
+++ b/x11/oneko/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:06:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/03 04:17:44 jschauma Exp $
DISTNAME= oneko-1.1b
PKGNAME= oneko-1.2
+PKGREVISION= 1
CATEGORIES= x11 games
MASTER_SITES= ${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
diff --git a/x11/oneko/PLIST b/x11/oneko/PLIST
index 467faf182ca..4be1b3a478e 100644
--- a/x11/oneko/PLIST
+++ b/x11/oneko/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:15 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:44 jschauma Exp $
bin/oneko
-man/cat1/oneko.0
+${IMAKE_MAN_DIR}/oneko.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/unclutter/PLIST b/x11/unclutter/PLIST
index 75fd0d7c76d..e3d9de2da9c 100644
--- a/x11/unclutter/PLIST
+++ b/x11/unclutter/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:46 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:44 jschauma Exp $
bin/unclutter
-man/cat1/unclutter.0.gz
+${IMAKE_MAN_DIR}/unclutter.${IMAKE_MANNEWSUFFIX}.gz
diff --git a/x11/x2x/Makefile b/x11/x2x/Makefile
index 426eaa32b2a..3b486001d5f 100644
--- a/x11/x2x/Makefile
+++ b/x11/x2x/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/03 04:17:43 jschauma Exp $
DISTNAME= x2x-1.27
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.digital.com/pub/Digital/SRC/x2x/ \
ftp://ftp.digital.de/Digital/SRC/x2x/
@@ -14,7 +15,4 @@ USE_IMAKE= yes
post-configure:
(cd ${WRKSRC}; ${LN} -s x2x.1 x2x.man)
-post-install:
- (cd ${WRKSRC}; ${INSTALL_MAN} x2x.1 ${PREFIX}/man/man1)
-
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/x2x/PLIST b/x11/x2x/PLIST
index 757c7ccf301..88e03e5145c 100644
--- a/x11/x2x/PLIST
+++ b/x11/x2x/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:54 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:43 jschauma Exp $
bin/x2x
-man/cat1/x2x.0
-man/man1/x2x.1
+${IMAKE_MAN_DIR}/x2x.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 10f48f32685..ef5ef7935b4 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:06:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/03 04:17:42 jschauma Exp $
# FreeBSD Id: Makefile,v 1.10 1997/10/15 20:23:40 max Exp
#
DISTNAME= x3270-3213
PKGNAME= x3270-3.2.13
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.geocities.com/SiliconValley/Peaks/7814/
EXTRACT_SUFX= .tgz
diff --git a/x11/x3270/PLIST b/x11/x3270/PLIST
index 1913da906f0..11f6125b4fd 100644
--- a/x11/x3270/PLIST
+++ b/x11/x3270/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:03:57 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/03 04:17:43 jschauma Exp $
bin/pr3287
bin/x3270
bin/x3270if
@@ -26,9 +26,9 @@ lib/X11/x3270/ibm_hosts
@unexec ${X11BASE}/bin/mkfontdir %D/lib/X11/fonts/misc
@exec ${CHMOD} u=rwx,go=rx %D/lib/X11/fonts/misc
@exec ${CHMOD} a=r %D/lib/X11/fonts/misc/fonts.dir
-man/cat1/ibm_hosts.0
-man/cat1/pr3287.0
-man/cat1/x3270-script.0
-man/cat1/x3270.0
-man/cat1/x3270if.0
+${IMAKE_MAN_DIR}/ibm_hosts${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/pr3287${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/x3270-script${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/x3270${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/x3270if${IMAKE_MANNEWSUFFIX}
@dirrm lib/X11/x3270
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index a7f549faf2f..cd87d18e25b 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 22:09:54 agc Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/03 04:17:42 jschauma Exp $
# from FreeBSD: ports/x11/xaniroc/Makefile,v 1.4 1999/08/31 02:50:46 peter Exp
#
DISTNAME= xaniroc
PKGNAME= xaniroc-1.02
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.freebird.org/unixware/freebird/x11/utils/ \
ftp://netlab1.usu.edu/pub/mirror/freebird/x11/utils/
diff --git a/x11/xaniroc/PLIST b/x11/xaniroc/PLIST
index 66346035406..078848ac2d4 100644
--- a/x11/xaniroc/PLIST
+++ b/x11/xaniroc/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:42 jschauma Exp $
bin/xaniroc
-man/cat1/xaniroc.0
+${IMAKE_MAN_DIR}/xaniroc.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 15ca4b5db7d..85cfa218d24 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/03/08 15:07:10 tron Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/03 04:17:41 jschauma Exp $
DISTNAME= xcb-2.3i
PKGNAME= xcb-2.3.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.goof.com/pcg/marc/data/
diff --git a/x11/xcb/PLIST b/x11/xcb/PLIST
index ef8c4fbe693..53a3a57808a 100644
--- a/x11/xcb/PLIST
+++ b/x11/xcb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:59 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:41 jschauma Exp $
bin/xcb
lib/X11/app-defaults/Xcb
-man/cat1/xcb.0
+${IMAKE_MAN_DIR}/xcb.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index cc3a11b65fc..bdfd9da9324 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/16 12:05:29 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/03 04:17:40 jschauma Exp $
#
DISTNAME= xclip-0.08
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://people.debian.org/~kims/xclip/
diff --git a/x11/xclip/PLIST b/x11/xclip/PLIST
index 622920d4b15..cb3cad7bf33 100644
--- a/x11/xclip/PLIST
+++ b/x11/xclip/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/16 12:05:29 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:41 jschauma Exp $
bin/xclip
-man/cat1/xclip.0
+${IMAKE_MAN_DIR}/xclip.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index e272da2ca7c..f9fc190c922 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2001/05/21 22:00:05 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/03 04:17:40 jschauma Exp $
# FreeBSD: Makefile,v 1.9 1998/01/22 00:41:36 fenner Exp
#
DISTNAME= xcolors
PKGNAME= xcolors-1.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/
diff --git a/x11/xcolors/PLIST b/x11/xcolors/PLIST
index bccad53fe4d..5cc2333e027 100644
--- a/x11/xcolors/PLIST
+++ b/x11/xcolors/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:59 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:40 jschauma Exp $
bin/xcolors
lib/X11/app-defaults/Xcolors
-man/cat1/xcolors.0
+${IMAKE_MAN_DIR}/xcolors.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 0146ed11467..3eb2f0385a5 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/10/08 13:26:32 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/03 04:17:39 jschauma Exp $
#
DISTNAME= xcolorsel-1.1a-src
PKGNAME= xcolorsel-1.1a
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
diff --git a/x11/xcolorsel/PLIST b/x11/xcolorsel/PLIST
index 2b69ab357a0..0e30fae951f 100644
--- a/x11/xcolorsel/PLIST
+++ b/x11/xcolorsel/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:39 jschauma Exp $
bin/xcolorsel
lib/X11/app-defaults/Xcolorsel
lib/X11/app-defaults/Xcolorsel-color
lib/X11/xcolorsel/Xcolorsel.help
-man/cat1/xcolorsel.0
+${IMAKE_MAN_DIR}/xcolorsel.${IMAKE_MANNEWSUFFIX}
@dirrm lib/X11/xcolorsel
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index 263f75a0603..9c316ac0c97 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/12/28 19:47:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/03 04:17:38 jschauma Exp $
#
DISTNAME= xearth-1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://cag.lcs.mit.edu/pub/tuna/ \
ftp://ftp.cs.colorado.edu/users/tuna/
diff --git a/x11/xearth/PLIST b/x11/xearth/PLIST
index 4efdca0632d..bb035f37557 100644
--- a/x11/xearth/PLIST
+++ b/x11/xearth/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:06 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:38 jschauma Exp $
bin/xearth
-man/cat1/xearth.0.gz
+${IMAKE_MAN_DIR}/xearth.${IMAKE_MANNEWSUFFIX}.gz
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 2c497b20e78..d3fa73000e9 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2002/09/29 09:29:56 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/03 04:17:38 jschauma Exp $
DISTNAME= xephem-3.5.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.clearskyinstitute.com/xephem/ \
ftp://iphcip1.physik.uni-mainz.de/pub/xephem/
diff --git a/x11/xephem/PLIST b/x11/xephem/PLIST
index f5df720dc39..1ca20b62768 100644
--- a/x11/xephem/PLIST
+++ b/x11/xephem/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/19 11:39:43 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/03 04:17:38 jschauma Exp $
bin/xephem
-man/cat1/xephem.0
+${IMAKE_MAN_DIR}/xephem.${IMAKE_MANNEWSUFFIX}
lib/X11/app-defaults/XEphem
share/xephem/auxil/README
share/xephem/auxil/analemma.plt
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 35e6d155fc4..52038a6d9b8 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2003/01/12 18:30:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.46 2003/03/03 04:17:37 jschauma Exp $
#
DISTNAME= xforms-1.0-release
PKGNAME= xforms-1.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/ \
http://archive.cs.uu.nl/mirror/XFORMS/OpenSource/
diff --git a/x11/xforms/PLIST b/x11/xforms/PLIST
index 3c2955c5b89..2558c7fe444 100644
--- a/x11/xforms/PLIST
+++ b/x11/xforms/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/28 19:49:07 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/03 04:17:37 jschauma Exp $
bin/fd2ps
bin/fdesign
include/X11/flimage.h
@@ -11,5 +11,5 @@ lib/libforms.a
lib/libforms.so
lib/libforms.so.1
lib/libforms.so.${PKGVERSION}
-man/cat1/fd2ps.0
-man/cat1/fdesign.0
+${IMAKE_MAN_DIR}/fd2ps.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/fdesign.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xgas/Makefile b/x11/xgas/Makefile
index 97a78339f30..cc3c3666f87 100644
--- a/x11/xgas/Makefile
+++ b/x11/xgas/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:07:09 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/03 04:17:36 jschauma Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1996/11/15 09:55:44 asami Exp
#
DISTNAME= xgas
PKGNAME= xgas-1.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tut.ac.jp/.h3/X11/X11R6/contrib/programs/
diff --git a/x11/xgas/PLIST b/x11/xgas/PLIST
index a1d2b8ed16b..1d819a9f57a 100644
--- a/x11/xgas/PLIST
+++ b/x11/xgas/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:37 jschauma Exp $
bin/xgas
lib/X11/app-defaults/XGas
-man/cat1/xgas.0.gz
+${IMAKE_MAN_DIR}/xgas.${IMAKE_MANNEWSUFFIX}.gz
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index b883cd7d461..1e8b1d6d855 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/02/27 16:52:38 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/03 04:17:36 jschauma Exp $
#
DISTNAME= xkeycaps-2.46
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} \
http://www.jwz.org/xkeycaps/
diff --git a/x11/xkeycaps/PLIST b/x11/xkeycaps/PLIST
index eb0d4be2c6e..ba709e288cc 100644
--- a/x11/xkeycaps/PLIST
+++ b/x11/xkeycaps/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:36 jschauma Exp $
bin/xkeycaps
-man/cat1/xkeycaps.0
+${IMAKE_MAN_DIR}/xkeycaps.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xless/Makefile b/x11/xless/Makefile
index e5073b82e02..66576e9598a 100644
--- a/x11/xless/Makefile
+++ b/x11/xless/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/09/30 22:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/03 04:17:35 jschauma Exp $
# FreeBSD Id: Makefile,v 1.2 1996/12/29 00:51:27 obrien Exp
#
DISTNAME= xless-1.7
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} \
ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
diff --git a/x11/xless/PLIST b/x11/xless/PLIST
index 45233d00b1f..2d581541e95 100644
--- a/x11/xless/PLIST
+++ b/x11/xless/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:15 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:35 jschauma Exp $
bin/xless
lib/X11/xless.help
lib/X11/app-defaults/XLess
lib/X11/app-defaults/XLess-color
-man/cat1/xless.0.gz
+${IMAKE_MAN_DIR}/xless.${IMAKE_MANNEWSUFFIX}.gz
diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile
index 41a407b0be1..9ae1d22f9b1 100644
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/03 04:17:34 jschauma Exp $
#
DISTNAME= xlogout
PKGNAME= xlogout-19891129
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/x11/xlogout/PLIST b/x11/xlogout/PLIST
index 7b81da7e0f8..684e64faa2c 100644
--- a/x11/xlogout/PLIST
+++ b/x11/xlogout/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:17 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:34 jschauma Exp $
bin/xlogout
lib/X11/app-defaults/XLogout
-man/cat1/xlogout.0
+${IMAKE_MAN_DIR}/xlogout.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index cc05ec9d51f..86ed8877a0b 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2001/02/17 17:07:16 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/03 04:17:33 jschauma Exp $
# FreeBSD Id: Makefile,v 1.2 1997/06/07 19:47:09 max Exp
#
DISTNAME= xmascot2.5p2
PKGNAME= xmascot-2.5p2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/
diff --git a/x11/xmascot/PLIST b/x11/xmascot/PLIST
index 1fbf897103b..5f246be24c4 100644
--- a/x11/xmascot/PLIST
+++ b/x11/xmascot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:34 jschauma Exp $
bin/xmascot
lib/X11/xmascot/pin.mag
lib/X11/xmascot/chain.mag
@@ -22,5 +22,5 @@ lib/X11/xmascot/mi2.raw
lib/X11/xmascot/mitime.au
lib/X11/xmascot/mitime.raw
@dirrm lib/X11/xmascot
-man/cat1/xmascot.0
+${IMAKE_MAN_DIR}/xmascot.${IMAKE_MANNEWSUFFIX}
lib/X11/app-defaults/XMascot
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index e4d70c3b23f..d17a94fc1a6 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:07:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/03 04:17:33 jschauma Exp $
#
DISTNAME= xmon.1.5.4
PKGNAME= xmon-1.5.4
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=devel_tools/}
diff --git a/x11/xmon/PLIST b/x11/xmon/PLIST
index 5e266953318..12c900c2826 100644
--- a/x11/xmon/PLIST
+++ b/x11/xmon/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:20 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:33 jschauma Exp $
bin/xmond
bin/xmonui
-man/cat1/xmon.0
-man/cat1/xmond.0
-man/cat1/xmonui.0
+${IMAKE_MAN_DIR}/xmon.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xmond.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xmonui.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index 01abe40ed56..6891ff08f4f 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/12/19 13:57:37 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/03 04:17:32 jschauma Exp $
#
DISTNAME= xmountains_2.6
PKGNAME= ${DISTNAME:C/_/-/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.epcc.ed.ac.uk/~spb/xmountains/
diff --git a/x11/xmountains/PLIST b/x11/xmountains/PLIST
index a8fe2cf5774..769c15df9a1 100644
--- a/x11/xmountains/PLIST
+++ b/x11/xmountains/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/19 13:57:38 grant Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/03 04:17:32 jschauma Exp $
bin/xmountains
-man/cat1/xmountains.0
+${IMAKE_MAN_DIR}/xmountains.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xmove/PLIST b/x11/xmove/PLIST
index 4a0547f8ce5..13ce1016f7c 100644
--- a/x11/xmove/PLIST
+++ b/x11/xmove/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:22 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:31 jschauma Exp $
bin/xmove
bin/xmovectrl
-man/cat1/xmove.0.gz
-man/cat1/xmovectrl.0.gz
+${IMAKE_MAN_DIR}/xmove.${IMAKE_MANNEWSUFFIX}.gz
+${IMAKE_MAN_DIR}/xmovectrl.${IMAKE_MANNEWSUFFIX}.gz
share/doc/xmove/features.txt
share/doc/xmove/limitations.txt
share/doc/xmove/using_xmove.txt
diff --git a/x11/xp/Makefile b/x11/xp/Makefile
index fc890a25c67..231fa36c7a7 100644
--- a/x11/xp/Makefile
+++ b/x11/xp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/08/31 15:24:08 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/03 04:17:31 jschauma Exp $
DISTNAME= xp-1.2b10
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.ncl.ac.uk/pub/users/ngmt/X11/
diff --git a/x11/xp/PLIST b/x11/xp/PLIST
index db742ca0db6..3c16f9eab5d 100644
--- a/x11/xp/PLIST
+++ b/x11/xp/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:26 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:31 jschauma Exp $
bin/xp
bin/xpman
lib/X11/app-defaults/Xp
-man/cat1/xp.0
+${IMAKE_MAN_DIR}/xp.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile
index 783f6e19fb4..2c67708dcfc 100644
--- a/x11/xpaste/Makefile
+++ b/x11/xpaste/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/01/27 18:32:35 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/03 04:17:30 jschauma Exp $
#
DISTNAME= xpaste-1.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
EXTRACT_SUFX= .shar.gz
diff --git a/x11/xpaste/PLIST b/x11/xpaste/PLIST
index addcdeb78fb..06d0ff8d2a6 100644
--- a/x11/xpaste/PLIST
+++ b/x11/xpaste/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:26 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:30 jschauma Exp $
bin/xpaste
-man/cat1/xpaste.0
+${IMAKE_MAN_DIR}/xpaste.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index 911c848066b..83dc6dfb696 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/09/29 09:34:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/03 04:17:30 jschauma Exp $
#
DISTNAME= xphoon.tar
PKGNAME= xphoon-19910918
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.gwdg.de/pub/x11/x.org/contrib/ \
diff --git a/x11/xphoon/PLIST b/x11/xphoon/PLIST
index 6af8c5c2912..a3cb8b243fd 100644
--- a/x11/xphoon/PLIST
+++ b/x11/xphoon/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:29 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:30 jschauma Exp $
bin/xphoon
-man/cat1/xphoon.0
+${IMAKE_MAN_DIR}/xphoon.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xpostit/Makefile b/x11/xpostit/Makefile
index af99ba29818..b7f566c58f3 100644
--- a/x11/xpostit/Makefile
+++ b/x11/xpostit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/03 08:16:14 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/03 04:17:29 jschauma Exp $
#
DISTNAME= xpostit3.3.1
PKGNAME= xpostit-3.3.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
diff --git a/x11/xpostit/PLIST b/x11/xpostit/PLIST
index c1945bf5a63..b7115023f80 100644
--- a/x11/xpostit/PLIST
+++ b/x11/xpostit/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:33 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:29 jschauma Exp $
bin/xpostit
-man/cat1/xpostit.0
+${IMAKE_MAN_DIR}/xpostit.${IMAKE_MANNEWSUFFIX}
lib/X11/app-defaults/XPostit
lib/X11/app-defaults/XPostit-color
diff --git a/x11/xscript/Makefile b/x11/xscript/Makefile
index a5ee1737ea3..cfc54bb074f 100644
--- a/x11/xscript/Makefile
+++ b/x11/xscript/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:56 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/03 04:17:29 jschauma Exp $
#
DISTNAME= xscript.tar
PKGNAME= xscript-19930228
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/test-distrib/src
CATEGORIES= x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
diff --git a/x11/xscript/PLIST b/x11/xscript/PLIST
index 370c63001c6..dbaaee939c8 100644
--- a/x11/xscript/PLIST
+++ b/x11/xscript/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:36 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:29 jschauma Exp $
bin/xscript
-man/cat1/xscript.0
+${IMAKE_MAN_DIR}/xscript.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 6bda0458dcf..5a7619e3ad4 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:56 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/03 04:17:28 jschauma Exp $
# FreeBSD Id: Makefile,v 1.7 1996/11/18 09:56:45 asami Exp
#
DISTNAME= xsnow-1.42
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.euronet.nl/~rja/Xsnow/
diff --git a/x11/xsnow/PLIST b/x11/xsnow/PLIST
index 4c8b2d5f780..0859c9a509e 100644
--- a/x11/xsnow/PLIST
+++ b/x11/xsnow/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:37 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:28 jschauma Exp $
bin/xsnow
-man/cat6/xsnow.0
+${IMAKE_MAN_SOURCE_PATH}6/xsnow.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index ec2d721e188..bde1b1184b4 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/08/25 21:53:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/03 04:17:27 jschauma Exp $
#
DISTNAME= xtoolwait-1.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.hacom.nl/~richard/software/
diff --git a/x11/xtoolwait/PLIST b/x11/xtoolwait/PLIST
index eeeb760081f..418f987526b 100644
--- a/x11/xtoolwait/PLIST
+++ b/x11/xtoolwait/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:28 jschauma Exp $
bin/xtoolwait
-man/cat1/xtoolwait.0
+${IMAKE_MAN_DIR}/xtoolwait.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index cb98451ca4d..642021cb7a1 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2002/08/25 19:24:03 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/03 04:17:27 jschauma Exp $
# $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp
#
DISTNAME= xview3.2p1-X11R6
PKGNAME= xview-clients-3.2.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/x11/xview-clients/PLIST b/x11/xview-clients/PLIST
index 961ba03a36d..8bb5dea22c8 100644
--- a/x11/xview-clients/PLIST
+++ b/x11/xview-clients/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:27 jschauma Exp $
bin/clock
bin/cmdtool
bin/olwm
@@ -10,8 +10,8 @@ lib/openwin-menu-demo
lib/help/clock.info
lib/help/olwm.info
lib/help/workspace.info
-man/cat1/clock.0
-man/cat1/cmdtool.0
-man/cat1/olwm.0
-man/cat1/olwmslave.0
-man/cat1/shelltool.0
+${IMAKE_MAN_DIR}/clock.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/cmdtool.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/olwm.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/olwmslave.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/shelltool.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index 9250472d82e..be47229eb25 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2002/08/25 18:40:50 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2003/03/03 04:17:26 jschauma Exp $
# $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
#
DISTNAME= xview3.2p1-X11R6
PKGNAME= xview-lib-3.2.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/x11/xview-lib/PLIST b/x11/xview-lib/PLIST
index afab39fc06d..2dfb926241b 100644
--- a/x11/xview-lib/PLIST
+++ b/x11/xview-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/10 04:49:58 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/03/03 04:17:26 jschauma Exp $
include/bitmaps/1x1
include/bitmaps/2x2
include/bitmaps/black
@@ -529,7 +529,7 @@ lib/libxview.so.3.2
lib/text_extras_menu
lib/textswrc
lib/ttyswrc
-man/cat1/xview.0
+${IMAKE_MAN_DIR}/xview.${IMAKE_MANNEWSUFFIX}
@dirrm lib/help
@dirrm include/xview_private
@dirrm include/xview
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index d8babdbb35c..ca201509634 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2002/08/25 21:53:03 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/03 04:17:25 jschauma Exp $
DISTNAME= xwatchwin
PKGNAME= xwatchwin-1.1.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://sunsite.uio.no/pub/X11/contrib/utilities/
MAINTAINER= packages@netbsd.org
COMMENT= watch a window on another X server
-PLIST_SRC= ${PKGDIR}/PLIST.${LOWER_OPSYS}
-
USE_BUILDLINK2= yes
USE_IMAKE= yes
diff --git a/x11/xwatchwin/PLIST b/x11/xwatchwin/PLIST
new file mode 100644
index 00000000000..17ef40819d0
--- /dev/null
+++ b/x11/xwatchwin/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2003/03/03 04:17:25 jschauma Exp $
+bin/xwatchwin
+${IMAKE_MAN_DIR}/xwatchwin.${IMAKE_MANNEWSUFFIX}
diff --git a/x11/xwatchwin/PLIST.netbsd b/x11/xwatchwin/PLIST.netbsd
deleted file mode 100644
index 7bdc5526ea2..00000000000
--- a/x11/xwatchwin/PLIST.netbsd
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.netbsd,v 1.1 2001/10/31 22:29:25 zuntum Exp $
-bin/xwatchwin
-man/cat1/xwatchwin.0
diff --git a/x11/xwatchwin/PLIST.sunos b/x11/xwatchwin/PLIST.sunos
deleted file mode 100644
index 799bd6fca03..00000000000
--- a/x11/xwatchwin/PLIST.sunos
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.sunos,v 1.1 2001/10/31 22:29:25 zuntum Exp $
-bin/xwatchwin
-man/man1/xwatchwin.1x
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index 5660388c857..b3afdd42e3b 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/08/25 21:53:03 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/03 04:17:23 jschauma Exp $
#
DISTNAME= xwit-3.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
diff --git a/x11/xwit/PLIST b/x11/xwit/PLIST
index 6cbc89c3d30..2a882954c33 100644
--- a/x11/xwit/PLIST
+++ b/x11/xwit/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/16 14:09:26 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/03 04:17:24 jschauma Exp $
bin/xwit
-man/cat1/xwit.0
+${IMAKE_MAN_DIR}/xwit.${IMAKE_MANNEWSUFFIX}