pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/aterm Convert to options framework.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a52996336842
branches:  trunk
changeset: 495029:a52996336842
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 01 19:39:36 2005 +0000

description:
Convert to options framework.
Fix a pasto in a comment while here.

diffstat:

 x11/aterm/Makefile   |  22 +++-------------------
 x11/aterm/options.mk |  26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 19 deletions(-)

diffs (77 lines):

diff -r d93ad828c4e3 -r a52996336842 x11/aterm/Makefile
--- a/x11/aterm/Makefile        Wed Jun 01 19:31:17 2005 +0000
+++ b/x11/aterm/Makefile        Wed Jun 01 19:39:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/06/01 19:39:36 wiz Exp $
 #
 
 DISTNAME=      aterm-0.4.2
@@ -17,8 +17,6 @@
 BUILD_DEFS+=   ATERM_USE_KANJI ATERM_USE_XTERM_SCROLL
 BUILD_DEFS+=   ATERM_USE_BIG5 ATERM_USE_GREEK
 
-.include "../../mk/bsd.prefs.mk"
-
 CONFIGURE_ARGS+=--enable-background-image \
                --enable-transparency \
                --enable-fading \
@@ -35,26 +33,12 @@
                --enable-utmp \
                --enable-wtmp
 
-.if defined(ATERM_USE_XTERM_SCROLL) && ${ATERM_USE_XTERM_SCROLL} != NO
-CONFIGURE_ARGS+=--enable-xterm-scroll
-.endif
-
-.if defined(ATERM_USE_KANJI) && ${ATERM_USE_KANJI} != NO
-CONFIGURE_ARGS+=--enable-kanji
-.endif
-
-.if defined(ATERM_USE_BIG5) && ${ATERM_USE_BIG5} != NO
-CONFIGURE_ARGS+=--enable-big5
-.endif
-
-.if defined(ATERM_USE_GREEK) && ${ATERM_USE_GREEK} != NO
-CONFIGURE_ARGS+=--enable-greek
-.endif
+.include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin"
-# Make rxvt setuid root so that tty ownership setting and utmp logging
+# Make aterm setuid root so that tty ownership setting and utmp logging
 # function correctly.
 #
 CONFIGURE_ARGS+=--enable-ttygid
diff -r d93ad828c4e3 -r a52996336842 x11/aterm/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/aterm/options.mk      Wed Jun 01 19:39:36 2005 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: options.mk,v 1.1 2005/06/01 19:39:36 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.aterm
+PKG_SUPPORTED_OPTIONS= aterm-big5 aterm-greek aterm-kanji aterm-xterm-scroll
+PKG_OPTIONS_LEGACY_VARS+=      ATERM_USE_KANJI:aterm-kanji
+PKG_OPTIONS_LEGACY_VARS+=      ATERM_USE_XTERM_SCROLL:aterm-xterm-scroll
+PKG_OPTIONS_LEGACY_VARS+=      ATERM_USE_BIG5:aterm-big5
+PKG_OPTIONS_LEGACY_VARS+=      ATERM_USE_GREEK:aterm-greek
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Materm-big5)
+CONFIGURE_ARGS+=--enable-big5
+.endif
+
+.if !empty(PKG_OPTIONS:Materm-greek)
+CONFIGURE_ARGS+=--enable-greek
+.endif
+
+.if !empty(PKG_OPTIONS:Materm-kanji)
+CONFIGURE_ARGS+=--enable-kanji
+.endif
+
+.if !empty(PKG_OPTIONS:Materm-xterm-scroll)
+CONFIGURE_ARGS+=--enable-xterm-scroll
+.endif



Home | Main Index | Thread Index | Old Index