Use bsd.pkg.install.mk to handle the subdirectory in PKG_SYSCONFDIR, and

avoid removing a non-existent directory from the PLIST.
Rename the zh_CN.gb2312 locale to zh_CN.GB2312.  Bump PKGREVISION to 3.

7 files changed, 47 insertions, 11 deletions

diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 4446d60e4fa..6163a1e90c9 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/01/09 20:12:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/03 16:38:12 jmmv Exp $
 
 PKGNAME=		${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 COMMENT=		Small, fast and light-weight window manager
 
 CONFLICTS+=		icewm-gnome-[0-9]*
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index e1e9ab75f75..6065b10222a 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2003/04/27 12:44:29 cjep Exp $
+# $NetBSD: Makefile.common,v 1.19 2003/05/03 16:38:12 jmmv Exp $
 
 DISTNAME=		icewm-1.2.0
 CATEGORIES=		x11 wm
@@ -10,6 +10,7 @@ HOMEPAGE=		http://icewm.sourceforge.net/
 GNU_CONFIGURE=		# defined
 USE_X11BASE=		# defined
 USE_GMAKE=		# defined
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	# defined
 BUILD_USES_MSGFMT=	# defined
 
@@ -24,6 +25,8 @@ CONFIGURE_ARGS+=	--disable-apm
 .endif
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+PKG_SYSCONFSUBDIR=	icewm
+
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
 CPPFLAGS+=		-DSTART_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\"
 .endif
@@ -34,6 +37,8 @@ INSTALL_TARGET=		install-base install-nls
 
 post-extract:
 	${CP} ${FILES} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
+	${MV} ${WRKSRC}/po/zh_CN.gb2312.po ${WRKSRC}/po/zh_CN.GB2312.po
+	${MV} ${WRKSRC}/po/zh_CN.gb2312.pox ${WRKSRC}/po/zh_CN.GB2312.pox
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index 2b8a772a308..df71e2a4c8e 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/04/27 14:57:56 cjep Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/05/03 16:38:12 jmmv Exp $
 bin/genpref
 bin/icehelp
 bin/icesh
@@ -299,9 +299,8 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/icewm.mo
-${PKGLOCALEDIR}/locale/zh_CN.gb2312/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
-@dirrm etc/X11/icewm
 @dirrm lib/X11/icewm/icons
 @dirrm lib/X11/icewm/ledclock
 @dirrm lib/X11/icewm/mailbox
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index db4d30c7883..c8a0b099359 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/08/26 08:29:13 martti Exp $
+$NetBSD: distinfo,v 1.10 2003/05/03 16:38:12 jmmv Exp $
 
 SHA1 (icewm-1.2.0.tar.gz) = bef4daba4bb94120f08f90755a9bc3518c254c21
 Size (icewm-1.2.0.tar.gz) = 684306 bytes
@@ -8,4 +8,6 @@ SHA1 (patch-ac) = 5275f5e9b5dae569d8d01a1209c00f40490edcbc
 SHA1 (patch-ad) = d2f6760952be3517661829b47a3d7868aaeccbf5
 SHA1 (patch-ae) = e577de295c2024e51b0b571dc8eaaf5169ad57e4
 SHA1 (patch-af) = 61a5060c95f9110b536c3312c1afc8d722af5226
-SHA1 (patch-ag) = b6fb34262124dff0c33efe6f9c3261068af71c7d
+SHA1 (patch-ag) = 1a50e341ddd7ae89248f065fa61ea2887cfcc58a
+SHA1 (patch-ah) = 8b436ee2d25177d4a2d9a06471c68a5bc26d7e73
+SHA1 (patch-ai) = 96c7d3bcb53c4bc61def387accc90498e0c0f0f1
diff --git a/wm/icewm/patches/patch-ag b/wm/icewm/patches/patch-ag
index 3223c4831b9..7365a31d803 100644
--- a/wm/icewm/patches/patch-ag
+++ b/wm/icewm/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.5 2002/03/10 22:08:15 wiz Exp $
+$NetBSD: patch-ag,v 1.6 2003/05/03 16:38:14 jmmv Exp $
 
---- configure.orig	Tue Oct  9 16:54:09 2001
-+++ configure
+--- configure.orig	2002-06-30 18:05:20.000000000 +0200
++++ configure	2003-05-03 18:24:42.000000000 +0200
 @@ -701,6 +701,7 @@
    --enable-movesize-fx    Move/Resize FX (experimental bloat)
    --disable-x86-asm       Don't use optimized x86 assembly code
@@ -41,3 +41,12 @@ $NetBSD: patch-ag,v 1.5 2002/03/10 22:08:15 wiz Exp $
  #define CONFIG_ADDRESSBAR 1
  EOF
  
+@@ -8770,7 +8780,7 @@
+       cfgdatadir=$with_cfgdir
+     fi
+ else
+-   cfgdatadir='${sysconfdir}/X11/icewm'
++   cfgdatadir='${sysconfdir}'
+ fi;
+ 
+ # Check whether --with-docdir or --without-docdir was given.
diff --git a/wm/icewm/patches/patch-ah b/wm/icewm/patches/patch-ah
new file mode 100644
index 00000000000..35b7825b5a2
--- /dev/null
+++ b/wm/icewm/patches/patch-ah
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2003-05-03 18:17:47.000000000 +0200
++++ Makefile.in	2003-05-03 18:18:40.000000000 +0200
+@@ -76,7 +76,6 @@
+         done
+ 	@echo "Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)"
+ 	@$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
+-	@$(INSTALLDIR) $(DESTDIR)$(CFGDIR)
+ 	@for lib in $(LIBFILES) ; do \
+             $(INSTALLLIB) "$$lib" $(DESTDIR)$(LIBDIR); \
+         done
diff --git a/wm/icewm/patches/patch-ai b/wm/icewm/patches/patch-ai
new file mode 100644
index 00000000000..2cdc74d8887
--- /dev/null
+++ b/wm/icewm/patches/patch-ai
@@ -0,0 +1,11 @@
+--- install.inc.orig	2003-05-03 18:20:38.000000000 +0200
++++ install.inc	2003-05-03 18:20:49.000000000 +0200
+@@ -9,7 +9,7 @@
+ PREFIX      = /usr
+ BINDIR      = ${exec_prefix}/bin
+ LIBDIR      = ${libdir}/X11/icewm
+-CFGDIR      = ${sysconfdir}/X11/icewm
++CFGDIR      = ${sysconfdir}
+ LOCDIR      = ${datadir}/locale
+ KDEDIR 	    = /usr/share
+ DOCDIR	    = ${prefix}/doc