Subject: pkg/19382: Aterm is built with too many default options
To: None <gnats-bugs@gnats.netbsd.org>
From: None <jon@joshua.haninge.kth.se>
List: netbsd-bugs
Date: 12/14/2002 03:55:35
>Number: 19382
>Category: pkg
>Synopsis: Aterm is built with too many default options
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sat Dec 14 03:56:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Jon Olsson
>Release: NetBSD 1.6_STABLE
>Organization:
Monkey Mafia
>Environment:
System: NetBSD ape.mine.nu 1.6_STABLE NetBSD 1.6_STABLE (APE) #4: Fri Dec 13 20:
07:57 CET 2002 root@ape.mine.nu:/usr/src/sys/arch/i386/compile/APE i386
Architecture: i386
Machine: i386
Pkgsrc: current as of one hour ago (anoncvs.fi.netbsd.org)
>Description:
First off, aterm doesn't need all the default options enabled
by default in the pkgsrc Makefile, second off, it breaks swedish
characters while enabled. The solution I propose is to add two
build prefs, USE_KANJI and USE_GREEK for people who want that.
Patch included
>How-To-Repeat:
Install aterm, use a swedish keymap and watch japanese characters
appear when typing swedish characters.
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/aterm/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 2002/08/25 21:52:30 1.9
+++ Makefile 2002/12/14 11:43:45
@@ -13,14 +13,15 @@
USE_BUILDLINK2= YES
USE_X11= YES
GNU_CONFIGURE= YES
+BUILD_DEFS+= USE_KANJI USE_GREEK
+
+.include "../../mk/bsd.prefs.mk"
+
CONFIGURE_ARGS+=--enable-background-image \
--enable-transparency \
--enable-fading \
--enable-graphics \
--enable-xterm-scroll \
- --enable-kanji \
- --enable-big5 \
- --enable-greek \
--with-xpm \
--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include \
--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib \
@@ -32,6 +33,14 @@
--with-png-includes=${BUILDLINK_PREFIX.png}/include \
--enable-utmp \
--enable-wtmp
+
+.if defined(USE_KANJI) && ${USE_KANJI} == YES
+CONFIGURE_ARGS+=--enable-kanji --enable-big5
+.endif
+
+.if defined(USE_GREEK) && ${USE_GREEK} == YES
+CONFIGURE_ARGS+=--enable-greek
+.endif
.include "../../graphics/jpeg/buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
>Release-Note:
>Audit-Trail:
>Unformatted: