Attachment #65133 for bug #96606

View | Details | Raw Unified | Return to bug 96606 | Differences between
Collapse All | Expand All




COMMENT=	Chinese input method server under X

LIB_DEPENDS=	tabe.2:${PORTSDIR}/chinese/libtabe
RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
.if !defined(USE_DB2)
LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
.else
LIB_DEPENDS+=	db2.0:${PORTSDIR}/databases/db2
.endif
RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts \
		${LOCALBASE}/share/tabe/libtabe-0.2.5:${PORTSDIR}/chinese/libtabe

WRKSRC=		${WRKDIR}/xcin
USE_BDB=	yes
OBSOLETE_BDB_VAR=	USE_DB2
USE_GETTEXT=	yes
USE_ICONV=	yes
USE_X_PREFIX=	yes
GNU_CONFIGURE=	yes
INSTALLS_SHLIB=	yes
USE_REINPLACE=	yes
CONFIGURE_ARGS=	--prefix=${PREFIX} \
		--x-libraries=${X11BASE}/lib \
		--with-xcin-dir=${PREFIX}/lib/X11/xcin25 \
		--with-db-name=${BDB_LIB_NAME} \
		--with-db-inc=${BDB_INCLUDE_DIR} \
		--with-db-lib=${BDB_LIB_DIR} \
		--with-tabe-inc=${LOCALBASE}/include/tabe \
		--with-tabe-lib=${LOCALBASE}/lib \
		--with-intl-inc=${LOCALBASE}/include \
		--with-intl-lib=${LOCALBASE}/lib \
		--with-iconv-inc=${LOCALBASE}/include \
		--with-iconv-lib=${LOCALBASE}/lib
.if !defined(USE_DB2)
CONFIGURE_ARGS+= --with-db-inc=${LOCALBASE}/include/db3
.else
CONFIGURE_ARGS+= --with-db-inc=${LOCALBASE}/include/db2
.endif

MAN1=		xcin.1

.include <bsd.port.pre.mk>

pre-everything::
.if defined(WITH_BDB_VER)
	@${ECHO} ""
	@${ECHO} "WARNING:"
	@${ECHO} "	You have defined WITH_BDB_VER. Make sure you use the same"
	@${ECHO} "	db version that libtabe uses. Otherwise, this port may"
	@${ECHO} "	not work correctly."
	@${ECHO} ""
.endif

post-extract:

.endfor
.endif

.include <bsd.port.post.mk>




--- configure.orig	Tue Nov 27 09:21:17 2001
+++ configure	Sat Apr 22 01:24:08 2006
@@ -32,6 +32,8 @@
 ac_help="$ac_help
   --with-db-lib=PATH        set the library dir of Berkeley DB2/3."
 ac_help="$ac_help
+  --with-db-name=NAME       set the library name of Berkeley DB."
+ac_help="$ac_help
   --with-tabe-inc=PATH      set the include dir of libtabe."
 ac_help="$ac_help
   --with-tabe-lib=PATH      set the library dir of libtabe."
@@ -869,6 +871,15 @@
 fi
 
 
+# Check whether --with-db_name or --without-db_name was given.
+if test "${with_db_name+set}" = set; then
+  withval="$with_db_name"
+    test x$withval != x && with_db_name="$withval"
+else
+    with_db_name='db'
+fi;
+
+
 # Check whether --with-tabe_inc or --without-tabe_inc was given.
 if test "${with_tabe_inc+set}" = set; then
   withval="$with_tabe_inc"
@@ -7869,7 +7880,7 @@
 fi
 
 LIBS="$OLD_LIBS"
-for f in db db3; do
+for f in $with_db_name; do
     echo $ac_n "checking for db_create in -l$f""... $ac_c" 1>&6
 echo "configure:7875: checking for db_create in -l$f" >&5
 ac_lib_var=`echo $f'_'db_create | sed 'y%./+-%__p_%'`
@@ -7878,16 +7889,20 @@
 else
   ac_save_LIBS="$LIBS"
 LIBS="-l$f  $LIBS"
+__db_create="db_create"
+if [ "$f" = "db-4.2" ]; then
+  __db_create="db_create_4002"
+fi
 cat > conftest.$ac_ext <<EOF
 #line 7883 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char db_create();
+char $__db_create();
 
 int main() {
-db_create()
+$__db_create()
 ; return 0; }
 EOF
 if { (eval echo configure:7894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -7914,7 +7929,7 @@
     test $found = y && break
 done
 if test $found = n; then
-    for f in db db2; do
+    for f in $with_db_name; do
 	echo $ac_n "checking for db_open in -l$f""... $ac_c" 1>&6
 echo "configure:7920: checking for db_open in -l$f" >&5
 ac_lib_var=`echo $f'_'db_open | sed 'y%./+-%__p_%'`

Return to bug 96606

Lines 19-64 Link Here

(-)/home/rafan/tmp/ports/a/xcin25/Makefile (-22 / +17 lines)
19	COMMENT= Chinese input method server under X	19	COMMENT= Chinese input method server under X
20		20
21	LIB_DEPENDS= tabe.2:${PORTSDIR}/chinese/libtabe	21	LIB_DEPENDS= tabe.2:${PORTSDIR}/chinese/libtabe
22		22	RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
23	.if !defined(USE_DB2)
24	LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3
25	.else
26	LIB_DEPENDS+= db2.0:${PORTSDIR}/databases/db2
27	.endif
28	RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts \
29	${LOCALBASE}/share/tabe/libtabe-0.2.5:${PORTSDIR}/chinese/libtabe
30		23
31	WRKSRC= ${WRKDIR}/xcin	24	WRKSRC= ${WRKDIR}/xcin
		25	USE_BDB= yes
		26	OBSOLETE_BDB_VAR= USE_DB2
32	USE_GETTEXT= yes	27	USE_GETTEXT= yes
33	USE_ICONV= yes	28	USE_ICONV= yes
34	USE_X_PREFIX= yes	29	USE_X_PREFIX= yes
35	GNU_CONFIGURE= yes	30	GNU_CONFIGURE= yes
36	INSTALLS_SHLIB= yes	31	INSTALLS_SHLIB= yes
37	USE_REINPLACE= yes
38	CONFIGURE_ARGS= --prefix=${PREFIX} \	32	CONFIGURE_ARGS= --prefix=${PREFIX} \
39	--x-libraries=${X11BASE}/lib \	33	--x-libraries=${X11BASE}/lib \
40	--with-xcin-dir=${PREFIX}/lib/X11/xcin25 \	34	--with-xcin-dir=${PREFIX}/lib/X11/xcin25 \
41	--with-db-lib=${LOCALBASE}/lib \	35	--with-db-name=${BDB_LIB_NAME} \
		36	--with-db-inc=${BDB_INCLUDE_DIR} \
		37	--with-db-lib=${BDB_LIB_DIR} \
42	--with-tabe-inc=${LOCALBASE}/include/tabe \	38	--with-tabe-inc=${LOCALBASE}/include/tabe \
43	--with-tabe-lib=${LOCALBASE}/lib \	39	--with-tabe-lib=${LOCALBASE}/lib \
44	--with-intl-inc=${LOCALBASE}/include \	40	--with-intl-inc=${LOCALBASE}/include \
45	--with-intl-lib=${LOCALBASE}/lib \	41	--with-intl-lib=${LOCALBASE}/lib \
46	--with-iconv-inc=${LOCALBASE}/include \	42	--with-iconv-inc=${LOCALBASE}/include \
47	--with-iconv-lib=${LOCALBASE}/lib	43	--with-iconv-lib=${LOCALBASE}/lib
48	.if !defined(USE_DB2)
49	CONFIGURE_ARGS+= --with-db-inc=${LOCALBASE}/include/db3
50	.else
51	CONFIGURE_ARGS+= --with-db-inc=${LOCALBASE}/include/db2
52	.endif
53		44
54	MAN1= xcin.1	45	MAN1= xcin.1
55		46
56	pre-fetch:	47	.include <bsd.port.pre.mk>
57	.if !defined(USE_DB2)	48
58	@${ECHO} --	49	pre-everything::
59	@${ECHO} "Type \"make -DUSE_DB2\" if you want use DB2."	50	.if defined(WITH_BDB_VER)
60	@${ECHO} "Otherwise, xcin2.5 will use DB3."	51	@${ECHO} ""
61	@${ECHO} --	52	@${ECHO} "WARNING:"
		53	@${ECHO} " You have defined WITH_BDB_VER. Make sure you use the same"
		54	@${ECHO} " db version that libtabe uses. Otherwise, this port may"
		55	@${ECHO} " not work correctly."
		56	@${ECHO} ""
62	.endif	57	.endif
63		58
64	post-extract:	59	post-extract:
Lines 102-105 Link Here
102	.endfor	97	.endfor
103	.endif	98	.endif
104		99
105	.include <bsd.port.mk>	100	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/home/rafan/tmp/ports/a/xcin25/files/patch-configure (+68 lines)
		1	--- configure.orig Tue Nov 27 09:21:17 2001
		2	+++ configure Sat Apr 22 01:24:08 2006
		3	@@ -32,6 +32,8 @@
		4	ac_help="$ac_help
		5	--with-db-lib=PATH set the library dir of Berkeley DB2/3."
		6	ac_help="$ac_help
		7	+ --with-db-name=NAME set the library name of Berkeley DB."
		8	+ac_help="$ac_help
		9	--with-tabe-inc=PATH set the include dir of libtabe."
		10	ac_help="$ac_help
		11	--with-tabe-lib=PATH set the library dir of libtabe."
		12	@@ -869,6 +871,15 @@
		13	fi
		14
		15
		16	+# Check whether --with-db_name or --without-db_name was given.
		17	+if test "${with_db_name+set}" = set; then
		18	+ withval="$with_db_name"
		19	+ test x$withval != x && with_db_name="$withval"
		20	+else
		21	+ with_db_name='db'
		22	+fi;
		23	+
		24	+
		25	# Check whether --with-tabe_inc or --without-tabe_inc was given.
		26	if test "${with_tabe_inc+set}" = set; then
		27	withval="$with_tabe_inc"
		28	@@ -7869,7 +7880,7 @@
		29	fi
		30
		31	LIBS="$OLD_LIBS"
		32	-for f in db db3; do
		33	+for f in $with_db_name; do
		34	echo $ac_n "checking for db_create in -l$f""... $ac_c" 1>&6
		35	echo "configure:7875: checking for db_create in -l$f" >&5
		36	ac_lib_var=`echo $f'_'db_create \| sed 'y%./+-%__p_%'`
		37	@@ -7878,16 +7889,20 @@
		38	else
		39	ac_save_LIBS="$LIBS"
		40	LIBS="-l$f $LIBS"
		41	+__db_create="db_create"
		42	+if [ "$f" = "db-4.2" ]; then
		43	+ __db_create="db_create_4002"
		44	+fi
		45	cat > conftest.$ac_ext <<EOF
		46	#line 7883 "configure"
		47	#include "confdefs.h"
		48	/* Override any gcc2 internal prototype to avoid an error. */
		49	/* We use char because int might match the return type of a gcc2
		50	builtin and then its argument prototype would still apply. */
		51	-char db_create();
		52	+char $__db_create();
		53
		54	int main() {
		55	-db_create()
		56	+$__db_create()
		57	; return 0; }
		58	EOF
		59	if { (eval echo configure:7894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
		60	@@ -7914,7 +7929,7 @@
		61	test $found = y && break
		62	done
		63	if test $found = n; then
		64	- for f in db db2; do
65	+ for f in $with_db_name; do
66	echo $ac_n "checking for db_open in -l$f""... $ac_c" 1>&6
67	echo "configure:7920: checking for db_open in -l$f" >&5
68	ac_lib_var=`echo $f'_'db_open \| sed 'y%./+-%__p_%'`