[pkgsrc/trunk]: pkgsrc/x11/mlterm Backout part of previous commit (because CO...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/08df3d623a9f
branches:  trunk
changeset: 495306:08df3d623a9f
user:      hira <hira%pkgsrc.org@localhost>
date:      Mon Jun 06 17:25:57 2005 +0000

description:
Backout part of previous commit (because CONF_FILES handling is
wrong).  Pointed out by wiz@.

diffstat:

 x11/mlterm/Makefile |  10 +---------
 x11/mlterm/PLIST    |  15 ++++++++++++++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diffs (60 lines):

diff -r 8559c12def84 -r 08df3d623a9f x11/mlterm/Makefile
--- a/x11/mlterm/Makefile       Mon Jun 06 17:08:20 2005 +0000
+++ b/x11/mlterm/Makefile       Mon Jun 06 17:25:57 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/06/06 16:13:51 hira Exp $
+# $NetBSD: Makefile,v 1.33 2005/06/06 17:25:57 hira Exp $
 
 DISTNAME=      mlterm-2.9.2
 CATEGORIES=    x11
@@ -15,7 +15,6 @@
 GNU_CONFIGURE=         yes
 
 USE_PKGLOCALEDIR=      yes
-PKG_SYSCONFSUBDIR=     mlterm
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,13 +22,6 @@
 CONFIGURE_ARGS+=       --with-type-engines=xft
 CONFIGURE_ARGS+=       --without-libiconv-prefix
 CONFIGURE_ARGS+=       --without-libintl-prefix
-CONFIGURE_ARGS+=       --datadir=${PREFIX}/${PKGLOCALEDIR}
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
-
-.for _f in aafont color font key main menu taafont termcap tfont vaafont \
-       vfont xim
-CONF_FILES+=           ${PKG_SYSCONFDIR}/${_f}
-.endfor
 
 SUBST_CLASSES+=                link
 SUBST_MESSAGE.link=    "Fixing hardcoded paths and link options."
diff -r 8559c12def84 -r 08df3d623a9f x11/mlterm/PLIST
--- a/x11/mlterm/PLIST  Mon Jun 06 17:08:20 2005 +0000
+++ b/x11/mlterm/PLIST  Mon Jun 06 17:25:57 2005 +0000
@@ -1,7 +1,19 @@
-@comment $NetBSD: PLIST,v 1.13 2005/06/06 16:13:51 hira Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/06/06 17:25:57 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
@@ -19,3 +31,4 @@
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mlconfig.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mlconfig.mo
 @dirrm lib/mlterm
+@dirrm etc/mlterm