summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhira <hira>2005-06-06 17:25:57 +0000
committerhira <hira>2005-06-06 17:25:57 +0000
commit95f227f9bbb89eb571b1d1ac2cc60ed159dcf6da (patch)
tree5fbeaed1dd355b403eda04796483d7de0bbfaad0
parent94cdd8b13861fb696d3c4f7f5a14e48dedcc9fa3 (diff)
downloadpkgsrc-95f227f9bbb89eb571b1d1ac2cc60ed159dcf6da.tar.gz
Backout part of previous commit (because CONF_FILES handling is
wrong). Pointed out by wiz@.
-rw-r--r--x11/mlterm/Makefile10
-rw-r--r--x11/mlterm/PLIST15
2 files changed, 15 insertions, 10 deletions
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 3cae05dc6c1..cffd74fc089 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -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 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
-PKG_SYSCONFSUBDIR= mlterm
.include "../../mk/bsd.prefs.mk"
@@ -23,13 +22,6 @@ CONFIGURE_ARGS+= --with-imagelib=gdk-pixbuf
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 --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 370571059b6..75753d4004c 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -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/de/LC_MESSAGES/mlconfig.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mlconfig.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mlconfig.mo
@dirrm lib/mlterm
+@dirrm etc/mlterm