[pkgsrc/trunk]: pkgsrc/wm Bump PKGREVISION to 1 because of:

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/000071ffdcff
branches:  trunk
changeset: 477427:000071ffdcff
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Fri Jul 02 19:00:12 2004 +0000

description:
Bump PKGREVISION to 1 because of:
- Disable i18n under NetBSD < 2.0.  It doesn't let icewm run (even when
  pkgsrc's libiconv is used).  If anybody has a better way to really
  solve the problem...).  Fixes PR pkg/23979 by syn at sceen.net.
- While here, move HTML documentation out of share/doc/html.

diffstat:

 wm/icewm-gnome/Makefile  |   3 ++-
 wm/icewm-imlib/Makefile  |   3 ++-
 wm/icewm/Makefile        |   3 ++-
 wm/icewm/Makefile.common |  18 ++++++++++++------
 wm/icewm/PLIST           |  43 +++++++++++++++++++++----------------------
 5 files changed, 39 insertions(+), 31 deletions(-)

diffs (143 lines):

diff -r 66b478da25e8 -r 000071ffdcff wm/icewm-gnome/Makefile
--- a/wm/icewm-gnome/Makefile   Fri Jul 02 18:01:46 2004 +0000
+++ b/wm/icewm-gnome/Makefile   Fri Jul 02 19:00:12 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/06/26 23:56:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2004/07/02 19:00:12 jmmv Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-gnome-/}
+PKGREVISION=   1
 COMMENT=       Small, fast and light-weight window manager (GNOME version)
 
 CONFLICTS+=    icewm-[0-9]* icewm-imlib-[0-9]*
diff -r 66b478da25e8 -r 000071ffdcff wm/icewm-imlib/Makefile
--- a/wm/icewm-imlib/Makefile   Fri Jul 02 18:01:46 2004 +0000
+++ b/wm/icewm-imlib/Makefile   Fri Jul 02 19:00:12 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/06/26 23:56:22 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/02 19:00:12 jmmv Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-imlib-/}
+PKGREVISION=   1
 COMMENT=       Small, fast and light-weight window manager (imlib version)
 
 CONFLICTS+=    icewm-[0-9]* icewm-gnome-[0-9]*
diff -r 66b478da25e8 -r 000071ffdcff wm/icewm/Makefile
--- a/wm/icewm/Makefile Fri Jul 02 18:01:46 2004 +0000
+++ b/wm/icewm/Makefile Fri Jul 02 19:00:12 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2004/06/26 23:56:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.25 2004/07/02 19:00:12 jmmv Exp $
 
 PKGNAME=               ${DISTNAME}
+PKGREVISION=           1
 COMMENT=               Small, fast and light-weight window manager
 
 CONFLICTS+=            icewm-gnome-[0-9]* icewm-imlib-[0-9]*
diff -r 66b478da25e8 -r 000071ffdcff wm/icewm/Makefile.common
--- a/wm/icewm/Makefile.common  Fri Jul 02 18:01:46 2004 +0000
+++ b/wm/icewm/Makefile.common  Fri Jul 02 19:00:12 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2004/06/26 23:56:21 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.34 2004/07/02 19:00:12 jmmv Exp $
 
 DISTNAME=              icewm-1.2.14
 CATEGORIES=            x11 wm
@@ -35,24 +35,30 @@
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
 CXXFLAGS+=             -DSTART_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\"
 .endif
+
 .if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+= --with-unicode-set=utf-32
+.  if !empty(OS_VERSION:M1.*)
+CONFIGURE_ARGS+=       --disable-i18n
+.  else
+CONFIGURE_ARGS+=       --with-unicode-set=utf-32
+.    include "../../converters/libiconv/buildlink3.mk"
+.  endif
+.else
+.  include "../../converters/libiconv/buildlink3.mk"
 .endif
 
 DOCDIR=                        ${PREFIX}/share/doc/icewm
-HTMLDIR=               ${PREFIX}/share/doc/icewm/html
 INSTALL_TARGET=                install-base install-nls
 
 post-extract:
        @${CP} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
+       ${INSTALL_DATA_DIR} ${DOCDIR}
        for file in BUGS CHANGES COPYING README README.wm-session TODO; do\
                ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
        done
-       ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${HTMLDIR}
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCDIR}
 
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
diff -r 66b478da25e8 -r 000071ffdcff wm/icewm/PLIST
--- a/wm/icewm/PLIST    Fri Jul 02 18:01:46 2004 +0000
+++ b/wm/icewm/PLIST    Fri Jul 02 19:00:12 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/06/26 23:56:21 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/07/02 19:00:12 jmmv Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
@@ -12,26 +12,26 @@
 share/doc/icewm/README
 share/doc/icewm/README.wm-session
 share/doc/icewm/TODO
-share/doc/icewm/html/icewm-1.html
-share/doc/icewm/html/icewm-10.html
-share/doc/icewm/html/icewm-11.html
-share/doc/icewm/html/icewm-12.html
-share/doc/icewm/html/icewm-13.html
-share/doc/icewm/html/icewm-14.html
-share/doc/icewm/html/icewm-15.html
-share/doc/icewm/html/icewm-16.html
-share/doc/icewm/html/icewm-17.html
-share/doc/icewm/html/icewm-18.html
-share/doc/icewm/html/icewm-19.html
-share/doc/icewm/html/icewm-2.html
-share/doc/icewm/html/icewm-3.html
-share/doc/icewm/html/icewm-4.html
-share/doc/icewm/html/icewm-5.html
-share/doc/icewm/html/icewm-6.html
-share/doc/icewm/html/icewm-7.html
-share/doc/icewm/html/icewm-8.html
-share/doc/icewm/html/icewm-9.html
-share/doc/icewm/html/icewm.html
+share/doc/icewm/icewm-1.html
+share/doc/icewm/icewm-10.html
+share/doc/icewm/icewm-11.html
+share/doc/icewm/icewm-12.html
+share/doc/icewm/icewm-13.html
+share/doc/icewm/icewm-14.html
+share/doc/icewm/icewm-15.html
+share/doc/icewm/icewm-16.html
+share/doc/icewm/icewm-17.html
+share/doc/icewm/icewm-18.html
+share/doc/icewm/icewm-19.html
+share/doc/icewm/icewm-2.html
+share/doc/icewm/icewm-3.html
+share/doc/icewm/icewm-4.html
+share/doc/icewm/icewm-5.html
+share/doc/icewm/icewm-6.html
+share/doc/icewm/icewm-7.html
+share/doc/icewm/icewm-8.html
+share/doc/icewm/icewm-9.html
+share/doc/icewm/icewm.html
 share/icewm/icons/app_16x16.xpm
 share/icewm/icons/app_32x32.xpm
 share/icewm/icons/bomb_16x16.xpm
@@ -378,5 +378,4 @@
 @dirrm share/icewm/ledclock
 @dirrm share/icewm/icons
 @dirrm share/icewm
-@dirrm share/doc/icewm/html
 @dirrm share/doc/icewm