Use PKG_SYSCONFDIR framework. Reviewed by wiz@.

5 files changed, 73 insertions, 17 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index cffd74fc089..257d5f11a03 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/06/06 17:25:57 hira Exp $
+# $NetBSD: Makefile,v 1.34 2005/06/11 15:00:04 hira Exp $
 
 DISTNAME=	mlterm-2.9.2
 CATEGORIES=	x11
@@ -11,17 +11,25 @@ COMMENT=	Multilingual terminal emulator
 # CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h>
 NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-*
 
+USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-
 USE_PKGLOCALEDIR=	yes
 
+PKG_SYSCONFSUBDIR=	mlterm
+EGDIR=			${PREFIX}/share/examples/mlterm
+.for _f in aafont color font key main menu taafont termcap tfont vaafont vfont \
+	xim
+CONF_FILES+=		${EGDIR}/${_f} ${PKG_SYSCONFDIR}/${_f}
+.endfor
+
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
 CONFIGURE_ARGS+=	--with-type-engines=xft
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 CONFIGURE_ARGS+=	--without-libintl-prefix
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 
 SUBST_CLASSES+=		link
 SUBST_MESSAGE.link=	"Fixing hardcoded paths and link options."
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 75753d4004c..a63c20eb983 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,19 +1,7 @@
-@comment $NetBSD: PLIST,v 1.14 2005/06/06 17:25:57 hira Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/06/11 15:00:04 hira Exp $
 bin/mlcc
 bin/mlclient
 bin/mlterm
-etc/mlterm/aafont
-etc/mlterm/color
-etc/mlterm/font
-etc/mlterm/key
-etc/mlterm/main
-etc/mlterm/menu
-etc/mlterm/taafont
-etc/mlterm/termcap
-etc/mlterm/tfont
-etc/mlterm/vaafont
-etc/mlterm/vfont
-etc/mlterm/xim
 lib/libkik.la
 lib/libmkf.la
 lib/mlterm/libathena.la
@@ -30,5 +18,17 @@ man/man1/mlterm.1
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mlconfig.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mlconfig.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mlconfig.mo
+share/examples/mlterm/aafont
+share/examples/mlterm/color
+share/examples/mlterm/font
+share/examples/mlterm/key
+share/examples/mlterm/main
+share/examples/mlterm/menu
+share/examples/mlterm/taafont
+share/examples/mlterm/termcap
+share/examples/mlterm/tfont
+share/examples/mlterm/vaafont
+share/examples/mlterm/vfont
+share/examples/mlterm/xim
+@dirrm share/examples/mlterm
 @dirrm lib/mlterm
-@dirrm etc/mlterm
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 4c35e59330c..70843067028 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.15 2005/03/07 01:28:45 hira Exp $
+$NetBSD: distinfo,v 1.16 2005/06/11 15:00:04 hira Exp $
 
 SHA1 (mlterm-2.9.2.tar.gz) = d71f07bb38553a7cae927f15b8d0a20a165eebe7
 RMD160 (mlterm-2.9.2.tar.gz) = c83693c353f266333dc85588d8c1366925cca79c
 Size (mlterm-2.9.2.tar.gz) = 1980109 bytes
 SHA1 (patch-ad) = eaaded295f050591e6a30286163f832aae93fa3a
 SHA1 (patch-ae) = fde46b06d0dfb2c296c91a69e9e1f8ff11d68766
+SHA1 (patch-af) = b9947c2a817093b71e3e91312bac173d5106c306
+SHA1 (patch-ag) = 7f2ff30719dd9baecda31627b45f9516225ec602
diff --git a/x11/mlterm/patches/patch-af b/x11/mlterm/patches/patch-af
new file mode 100644
index 00000000000..1aea196dad6
--- /dev/null
+++ b/x11/mlterm/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2005/06/11 15:00:04 hira Exp $
+
+--- etc/Makefile.in.orig	2004-09-12 14:59:43.000000000 +0900
++++ etc/Makefile.in	2005-06-11 01:24:16.000000000 +0900
+@@ -1,7 +1,8 @@
+ top_builddir = ..
+ top_srcdir = @top_srcdir@
+ prefix = @prefix@
+-sysconfdir = @sysconfdir@
++datadir = @datadir@
++sysconfdir = $(datadir)/examples
+ 
+ DESTDIR=
+ SYSCONFDIR=$(DESTDIR)$(sysconfdir)/mlterm
diff --git a/x11/mlterm/patches/patch-ag b/x11/mlterm/patches/patch-ag
new file mode 100644
index 00000000000..5f6e399d7e0
--- /dev/null
+++ b/x11/mlterm/patches/patch-ag
@@ -0,0 +1,32 @@
+$NetBSD: patch-ag,v 1.1 2005/06/11 15:00:04 hira Exp $
+
+--- contrib/tool/mlterm-menu/Makefile.in.orig	2005-06-11 01:31:46.000000000 +0900
++++ contrib/tool/mlterm-menu/Makefile.in	2005-06-11 01:36:34.000000000 +0900
+@@ -15,6 +15,7 @@
+ DESTDIR =
+ LIBEXECDIR = $(DESTDIR)$(libexecdir)
+ SYSCONFDIR = $(DESTDIR)$(sysconfdir)
++mlconfdir = $(DESTDIR)$(datadir)/examples/mlterm
+ 
+ LKIK = @KIK_LIBS@
+ 
+@@ -45,15 +46,15 @@
+ .c.o:
+ 	$(CC) $(DEFS) $(CFLAGS) -c $<
+ 
+-install: $(LIBEXECDIR) $(SYSCONFDIR)/mlterm
++install: $(LIBEXECDIR) $(mlconfdir)
+ 	$(LIBTOOL_INSTALL) -m 755 mlterm-menu $(LIBEXECDIR)
+-	$(INSTALL) -m 644 ${top_srcdir}/contrib/tool/mlterm-menu/menu $(SYSCONFDIR)/mlterm
++	$(INSTALL) -m 644 ${top_srcdir}/contrib/tool/mlterm-menu/menu $(mlconfdir)
+ 
+ $(LIBEXECDIR):
+ 	mkdir -p $(LIBEXECDIR)
+ 
+-$(SYSCONFDIR)/mlterm:
+-	mkdir -p $(SYSCONFDIR)/mlterm
++$(mlconfdir):
++	mkdir -p $(mlconfdir)
+ 
+ clean:
+ 	rm -rf $(OBJS) mlterm-menu mlterm-menu.exe *.core .libs