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

mule/xemacs/xemacs-current



canna,freewnn,sj3 関係commitしました。
canna-lib使ってるやつはUSE_X11=YESになってたりしたので
直すついでにbuildlink.mk使うようにしました。
mail/cueは使い方がわからなかったため漢字変換までは試してないです。

mule,xemacs,xemacs-currentで以下のpatchを試してくださる方募集中です。

sakamoto
--
Index: mule/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/mule/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- mule/Makefile	2002/05/31 15:19:55	1.11
+++ mule/Makefile	2002/06/10 13:16:16
@@ -13,10 +13,10 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if !defined(USE_WNN4) || ${USE_WNN4} == YES
-DEPENDS+=	ja-FreeWnn-lib-1.10:../../inputmethod/ja-freewnn-lib
+.include "../../inputmethod/ja-freewnn-lib/buildlink.mk"
 .endif
 .if !defined(USE_CANNA) || ${USE_CANNA} == YES
-DEPENDS+=	Canna-lib>=3.5.2:../../inputmethod/canna-lib
+.include "../../inputmethod/canna-lib/buildlink.mk"
 .endif
 
 WRKSRC=		${WRKDIR}/mule
@@ -30,11 +30,11 @@
 .endif
 
 .if !defined(USE_WNN4) || ${USE_WNN4} == YES
-CONFIGURE_ARGS+=	--with-wnn4 --wnn-includes=${LOCALBASE}/include/wnn --wnn-libraries=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-wnn4 --wnn-includes=${BUILDLINK_DIR}/include/wnn --wnn-libraries=${BUILDLINK_DIR}/lib
 .endif
 
 .if !defined(USE_CANNA) || ${USE_CANNA} == YES
-CONFIGURE_ARGS+=	--canna --canna-includes=${LOCALBASE}/include --canna-libraries=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--canna --canna-includes=${BUILDLINK_DIR}/include --canna-libraries=${BUILDLINK_DIR}/lib
 .endif
 
 INFO_FILES=	antenews-jp canna-jp cl dired-x egg-jp emacs forms gnus mule \
Index: xemacs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/xemacs/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- xemacs/Makefile	2002/05/31 15:19:57	1.48
+++ xemacs/Makefile	2002/06/10 13:16:17
@@ -58,8 +58,8 @@
 .endif
 
 .if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES
+.include "../../inputmethod/canna-lib/buildlink.mk"
 WITH_CANNA=	--with-canna=yes
-DEPENDS+=	Canna-lib-3*:../../inputmethod/canna-lib
 .else
 WITH_CANNA=	--with-canna=no
 .endif
Index: xemacs-current/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/xemacs-current/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- xemacs-current/Makefile	2002/05/31 15:19:57	1.8
+++ xemacs-current/Makefile	2002/06/10 13:16:17
@@ -56,8 +56,8 @@
 .endif
 
 .if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES
+.include "../../inputmethod/canna-lib/buildlink.mk"
 WITH_CANNA=	--with-canna=yes
-DEPENDS+=	Canna-lib-3*:../../inputmethod/canna-lib
 .else
 WITH_CANNA=	--with-canna=no
 .endif