From 46549abe56681669fa8695f4f13866eb48a0517c Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 1 Dec 2005 17:34:41 +0000 Subject: Convert to options framework. --- editors/mule/Makefile | 21 ++++----------------- editors/mule/options.mk | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 editors/mule/options.mk (limited to 'editors') diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 389cda3402e..8c4e47b952c 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/11/04 19:30:00 reed Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/01 17:34:41 wiz Exp $ DISTNAME= mule-2.3 PKGREVISION= 2 @@ -15,20 +15,13 @@ CONFLICTS= emacs-[0-9]* CHECK_WRKREF_SKIP+= ${PREFIX}/bin/mule CHECK_WRKREF_SKIP+= ${PREFIX}/bin/mule-19.28 -.include "../../mk/bsd.prefs.mk" - -.if !defined(USE_WNN4) || ${USE_WNN4} == YES -.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" -.endif -.if !defined(USE_CANNA) || ${USE_CANNA} == YES -.include "../../inputmethod/canna-lib/buildlink3.mk" -.endif - WRKSRC= ${WRKDIR}/mule GNU_CONFIGURE= yes GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR}/man1 USE_TOOLS+= gmake +.include "../../mk/bsd.prefs.mk" + CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-x --with-x-toolkit=lucid CONFIGURE_ARGS+= --terminal-face --mcpath .if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" @@ -36,13 +29,7 @@ CONFIGURE_ARGS+= --valbits=26 .endif CONFIGURE_ARGS+= --bdf-path=${X11PREFIX}/lib/X11/fonts/intlfonts/bdf -.if !defined(USE_WNN4) || ${USE_WNN4} == YES -CONFIGURE_ARGS+= --with-wnn4 --wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn --wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib -.endif - -.if !defined(USE_CANNA) || ${USE_CANNA} == YES -CONFIGURE_ARGS+= --canna --canna-includes=${BUILDLINK_PREFIX.Canna-lib}/include --canna-libraries=${BUILDLINK_PREFIX.Canna-lib}/lib -.endif +.include "options.mk" USE_MAKEINFO= YES INFO_FILES= CCL ISO2022 R2L XFONT antenews-jp canna-jp cl dired-x diff --git a/editors/mule/options.mk b/editors/mule/options.mk new file mode 100644 index 00000000000..63a73a99575 --- /dev/null +++ b/editors/mule/options.mk @@ -0,0 +1,21 @@ +# $NetBSD: options.mk,v 1.1 2005/12/01 17:34:41 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mule +PKG_SUPPORTED_OPTIONS= canna wnn4 +PKG_SUGGESTED_OPTIONS= canna wnn4 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mwnn4) +.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" +CONFIGURE_ARGS+= --with-wnn4 +CONFIGURE_ARGS+= --wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn +CONFIGURE_ARGS+= --wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib +.endif + +.if !empty(PKG_OPTIONS:Mcanna) +.include "../../inputmethod/canna-lib/buildlink3.mk" +CONFIGURE_ARGS+= --canna +CONFIGURE_ARGS+= --canna-includes=${BUILDLINK_PREFIX.Canna-lib}/include +CONFIGURE_ARGS+= --canna-libraries=${BUILDLINK_PREFIX.Canna-lib}/lib +.endif -- cgit v1.2.3