summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2003-07-16 07:41:33 +0000
committertron <tron@pkgsrc.org>2003-07-16 07:41:33 +0000
commitcfc8c448655333fc81bbfd66be64dca185040745 (patch)
tree2908f457021d06beff288f6f82dae8ef3c3968bd
parentefea2d7bf51ca8fc7efc930c7f3324232b7de4de (diff)
downloadpkgsrc-cfc8c448655333fc81bbfd66be64dca185040745.tar.gz
Make this package work with NetBSD's iconv(3) as suggested by T.Shiozaki.
This fixes PR pkg/22143 by myself.
-rw-r--r--wm/icewm-gnome/Makefile4
-rw-r--r--wm/icewm/Makefile4
-rw-r--r--wm/icewm/Makefile.common6
3 files changed, 8 insertions, 6 deletions
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 85316cf10f4..8a97df4b65a 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/07/13 13:53:42 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/07/16 07:41:34 tron Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Small, fast and light-weight window manager (GNOME version)
CONFLICTS+= icewm-[0-9]* icewm-imlib-[0-9]*
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 7a72eab0754..fe01437ce85 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/07/13 13:53:42 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/07/16 07:41:33 tron Exp $
PKGNAME= ${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Small, fast and light-weight window manager
CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]*
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 2c4e76300d6..8d99e86e4c8 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2003/07/09 21:14:26 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.27 2003/07/16 07:41:33 tron Exp $
DISTNAME= icewm-1.2.9
CATEGORIES= x11 wm
@@ -11,7 +11,6 @@ GNU_CONFIGURE= # defined
USE_BUILDLINK2= yes
USE_X11= # defined
USE_GMAKE= # defined
-USE_GNU_ICONV= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= # defined
BUILD_USES_MSGFMT= # defined
@@ -33,6 +32,9 @@ PKG_SYSCONFSUBDIR= icewm
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
CPPFLAGS+= -DSTART_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\"
.endif
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+= --with-unicode-set=utf-32
+.endif
DOCDIR= ${PREFIX}/share/doc/icewm
HTMLDIR= ${PREFIX}/share/doc/html/icewm