diff options
| -rw-r--r-- | editors/mule/Makefile | 8 | ||||
| -rw-r--r-- | inputmethod/kinput2/Makefile | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/editors/mule/Makefile b/editors/mule/Makefile index df9c1aa0884..3064370f1c8 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/16 21:34:18 seb Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/19 21:40:52 xtraeme Exp $ DISTNAME= mule-2.3 PKGREVISION= 2 @@ -14,15 +14,15 @@ CONFLICTS= emacs-[0-9]* .include "../../mk/bsd.prefs.mk" .if !defined(USE_WNN4) || ${USE_WNN4} == YES -.include "../../inputmethod/ja-freewnn-lib/buildlink2.mk" +.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" .endif .if !defined(USE_CANNA) || ${USE_CANNA} == YES -.include "../../inputmethod/canna-lib/buildlink2.mk" +.include "../../inputmethod/canna-lib/buildlink3.mk" .endif WRKSRC= ${WRKDIR}/mule GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_X11= yes diff --git a/inputmethod/kinput2/Makefile b/inputmethod/kinput2/Makefile index 4eba35c3aa4..8510496e50e 100644 --- a/inputmethod/kinput2/Makefile +++ b/inputmethod/kinput2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 21:43:41 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/19 21:43:21 xtraeme Exp $ # FreeBSD Id: Makefile,v 1.4 1999/06/06 13:19:49 taoka Exp $ DISTNAME= kinput2-v3 @@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ MAINTAINER= tech-pkg-ja@jp.NetBSD.org COMMENT= Input server of Japanese text -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_IMAKE= YES PLIST_SRC= ${PKGDIR}/PLIST-common @@ -24,7 +24,7 @@ PKG_FAIL_REASON= ${PKGNAME} is ignored. because USE_CANNA,USE_WNN4,USE_WNN6,USE_ .endif .if !defined(USE_CANNA) || ${USE_CANNA} == YES -.include "../../inputmethod/canna-lib/buildlink2.mk" +.include "../../inputmethod/canna-lib/buildlink3.mk" KINPUT2_DEF+= -DUseCanna -Dport_CANNASRC=${BUILDLINK_PREFIX.canna}/include \ -Dport_CANNALIB="${LDFLAGS} -lcanna16" .endif @@ -35,14 +35,14 @@ KINPUT2_DEF+= -DUseCanna -Dport_CANNASRC=${BUILDLINK_PREFIX.canna}/include \ # -Dport_WNNLIB="${LDFLAGS} -lwnn6 -lcrypt" #.elif (!defined(USE_WNN4) || ${USE_WNN4} == YES) .if !defined(USE_WNN4) || ${USE_WNN4} == YES -.include "../../inputmethod/ja-freewnn-lib/buildlink2.mk" +.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=${BUILDLINK_PREFIX.ja-freewnn}/include/wnn \ -Dport_WNNLIB="${LDFLAGS} -lwnn -lcrypt" PLIST_SRC+= ${PKGDIR}/PLIST-freewnn .endif .if !defined(USE_SJ3) || ${USE_SJ3} == YES -.include "../../inputmethod/sj3-lib/buildlink2.mk" +.include "../../inputmethod/sj3-lib/buildlink3.mk" KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${BUILDLINK_PREFIX.sj3}/include \ -Dport_SJ3LIB="${LDFLAGS} -lsj3lib" PLIST_SRC+= ${PKGDIR}/PLIST-sj3 |