aboutsummaryrefslogtreecommitdiff
path: root/japanese/iiimf-le-canna
diff options
context:
space:
mode:
authorDaichi GOTO <daichi@FreeBSD.org>2005-03-25 07:59:10 +0000
committerDaichi GOTO <daichi@FreeBSD.org>2005-03-25 07:59:10 +0000
commit698e579b67c44631e339422c73f12a8e6204877c (patch)
tree57c90bb633c8fa4ec3bbd4236d6824a8c0c2576d /japanese/iiimf-le-canna
parentda254b47597ffd2337274bd6f89e5bf94652b25f (diff)
Notes
Diffstat (limited to 'japanese/iiimf-le-canna')
-rw-r--r--japanese/iiimf-le-canna/Makefile6
-rw-r--r--japanese/iiimf-le-canna/files/patch-leif_configure.ac24
2 files changed, 23 insertions, 7 deletions
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index eded6f7a6218..ff9f9a693e5a 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -7,7 +7,7 @@
PORTNAME= le-canna
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
@@ -38,6 +38,7 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
.if !defined(WITHOUT_XAUX)
USE_XLIB= yes
+USE_GNOME= gtk20
CFLAGS+= -I${X11BASE}/include
LDFLAGS+= -L${X11BASE}/lib
PLIST_SUB+= WANT_XAUX=""
@@ -72,6 +73,9 @@ post-patch:
pre-configure:
@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
+.if defined(WITHOUT_XAUX)
+ @cd ${WRKSRC} && ${REINPLACE_CMD} -e "/GTK/s,^.*$$,,g" configure.ac
+.endif
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
diff --git a/japanese/iiimf-le-canna/files/patch-leif_configure.ac b/japanese/iiimf-le-canna/files/patch-leif_configure.ac
index d7409e9b7ec9..4028da90cd4e 100644
--- a/japanese/iiimf-le-canna/files/patch-leif_configure.ac
+++ b/japanese/iiimf-le-canna/files/patch-leif_configure.ac
@@ -1,8 +1,20 @@
---- leif/configure.ac Wed Oct 6 23:00:36 2004
-+++ leif/configure.ac Fri Feb 18 01:19:12 2005
-@@ -61,25 +61,19 @@
- IM_CONSTRUCT_FLAGS
- IM_CONSTRUCT_THREAD_FLAGS
+--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
++++ leif/configure.ac Thu Mar 24 18:29:16 2005
+@@ -45,11 +45,11 @@
+ IM_CHECK_SYSTEM
+ IM_CHECK_DLOPEN
+ IM_CHECK_CANNA
+-IM_CHECK_FREEWNN
++dnl IM_CHECK_FREEWNN
+
+ IM_CHECK_X
+ IM_CHECK_GTK
+-IM_CHECK_MOTIF
++dnl IM_CHECK_MOTIF
+ PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+ AC_SUBST(GTK2_CFLAGS)
+ AC_SUBST(GTK2_LIBS)
+@@ -63,23 +63,17 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
@@ -21,13 +33,13 @@
+LE_TARGETS="canna"
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-+IM_ADD_TARGET(LE_TARGETS, HAVE_X, canna/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
++IM_ADD_TARGET(LE_TARGETS, HAVE_X, canna/xaux)
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test