Wed Jun 2 12:36:57 2010 UTC ()
Fix building with db5; revision bump for db4 update; clean-up


(adam)
diff -r1.26 -r1.27 pkgsrc/inputmethod/xcin/Makefile
diff -r1.6 -r1.7 pkgsrc/inputmethod/xcin/PLIST
cvs diff -r1.26 -r1.27 pkgsrc/inputmethod/xcin/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/xcin/Makefile 2009/11/24 11:23:34 1.26
+++ pkgsrc/inputmethod/xcin/Makefile 2010/06/02 12:36:57 1.27
@@ -1,41 +1,39 @@ @@ -1,41 +1,39 @@
1# $NetBSD: Makefile,v 1.26 2009/11/24 11:23:34 obache Exp $ 1# $NetBSD: Makefile,v 1.27 2010/06/02 12:36:57 adam Exp $
2# 
3 2
4DISTNAME= xcin-2.5.3.pre2 3DISTNAME= xcin-2.5.3.pre2
5PKGNAME= xcin-2.5.3rc2 4PKGNAME= xcin-2.5.3rc2
6PKGREVISION= 7 5PKGREVISION= 8
7CATEGORIES= chinese x11 6CATEGORIES= chinese x11
8MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/ 7MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
9 8
10MAINTAINER= rxg@NetBSD.org 9MAINTAINER= rxg@NetBSD.org
11HOMEPAGE= http://xcin.linux.org.tw/ 10HOMEPAGE= http://xcin.linux.org.tw/
12COMMENT= Chinese XIM server 11COMMENT= Chinese XIM server
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
18 17
19WRKSRC= ${WRKDIR}/xcin 18WRKSRC= ${WRKDIR}/xcin
20USE_PKGLOCALEDIR= yes 
21USE_X11BASE= yes 
22USE_LIBTOOL= yes 19USE_LIBTOOL= yes
 20USE_PKGLOCALEDIR= yes
23USE_TOOLS+= msgfmt pax perl:run 21USE_TOOLS+= msgfmt pax perl:run
24 22USE_X11BASE= yes
25GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
27CONFIGURE_ARGS+= --with-db-lib=${BDBBASE}/lib 25CONFIGURE_ARGS+= --with-db-lib=${BDBBASE}/lib
28CONFIGURE_ARGS+= --with-db-inc=${BDBBASE}/include/{BDB_TYPE} 26CONFIGURE_ARGS+= --with-db-inc=${BDBBASE}/include/${BDB_TYPE}
29 27
30.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
31 29
32INSTALLATION_DIRS= share/doc/xcin 30INSTALLATION_DIRS= share/doc/xcin
33 31
34EGDIR= ${PREFIX}/share/examples/xcin 32EGDIR= ${PREFIX}/share/examples/xcin
35CONF_FILES= ${EGDIR}/xcinrc ${PKG_SYSCONFDIR}/xcinrc 33CONF_FILES= ${EGDIR}/xcinrc ${PKG_SYSCONFDIR}/xcinrc
36 34
37.if ${OPSYS} == "NetBSD" 35.if ${OPSYS} == "NetBSD"
38EUC_LOCALE= euccn 36EUC_LOCALE= euccn
39.else 37.else
40EUC_LOCALE= euc 38EUC_LOCALE= euc
41.endif 39.endif
@@ -44,26 +42,26 @@ PLIST_SUBST+= EUC_LOCALE=${EUC_LOCALE} @@ -44,26 +42,26 @@ PLIST_SUBST+= EUC_LOCALE=${EUC_LOCALE}
44 42
45post-extract: 43post-extract:
46 ${CP} ${FILESDIR}/xcinrc.DRAGONFLY ${WRKSRC}/etc 44 ${CP} ${FILESDIR}/xcinrc.DRAGONFLY ${WRKSRC}/etc
47 45
48post-install: 46post-install:
49 cd ${WRKSRC}/doc && pax -rw \ 47 cd ${WRKSRC}/doc && pax -rw \
50 -s ',^\./man$$,,' -s ',^\./man/.*,,' \ 48 -s ',^\./man$$,,' -s ',^\./man/.*,,' \
51 . ${DESTDIR}${PREFIX}/share/doc/xcin 49 . ${DESTDIR}${PREFIX}/share/doc/xcin
52 50
53INSTALL_MAKE_FLAGS+= program_prefix=${DESTDIR} 51INSTALL_MAKE_FLAGS+= program_prefix=${DESTDIR}
54 52
55BUILDLINK_DEPMETHOD.libXt?= build 53BUILDLINK_DEPMETHOD.libXt?= build
56 54
57BDB_ACCEPTED= db2 db3 db4 55BDB_ACCEPTED= db2 db3 db4 db5
 56BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
58 57
59.include "../../converters/libiconv/buildlink3.mk" 58.include "../../converters/libiconv/buildlink3.mk"
60.include "../../devel/gettext-lib/buildlink3.mk" 59.include "../../devel/gettext-lib/buildlink3.mk"
61.include "../../inputmethod/libchewing02/buildlink3.mk" 60.include "../../inputmethod/libchewing02/buildlink3.mk"
62.include "../../inputmethod/libtabe/buildlink3.mk" 61.include "../../inputmethod/libtabe/buildlink3.mk"
63.include "../../x11/libX11/buildlink3.mk" 62.include "../../x11/libX11/buildlink3.mk"
64.include "../../x11/libXext/buildlink3.mk" 63.include "../../x11/libXext/buildlink3.mk"
65.include "../../x11/libXt/buildlink3.mk" 64.include "../../x11/libXt/buildlink3.mk"
66.include "../../mk/pthread.buildlink3.mk" 
67.include "../../mk/bdb.buildlink3.mk" 65.include "../../mk/bdb.buildlink3.mk"
68BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} 66.include "../../mk/pthread.buildlink3.mk"
69.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/inputmethod/xcin/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/xcin/PLIST 2009/06/14 18:01:33 1.6
+++ pkgsrc/inputmethod/xcin/PLIST 2010/06/02 12:36:57 1.7
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:01:33 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2010/06/02 12:36:57 adam Exp $
2bin/cin2tab 2bin/cin2tab
3bin/xcin 3bin/xcin
4lib/libxcin.la 4lib/libxcin.la
5lib/xcin/chewing.la 
6lib/xcin/bimsphone.la 5lib/xcin/bimsphone.la
 6lib/xcin/chewing.la
7lib/xcin/gen_inp.la 7lib/xcin/gen_inp.la
8lib/xcin/tab/big5/array30.tab 8lib/xcin/tab/big5/array30.tab
9lib/xcin/tab/big5/bims_pinyin.tab 9lib/xcin/tab/big5/bims_pinyin.tab
10lib/xcin/tab/big5/cj.tab 10lib/xcin/tab/big5/cj.tab
11lib/xcin/tab/big5/default.phr 11lib/xcin/tab/big5/default.phr
12lib/xcin/tab/big5/jyutping.tab 12lib/xcin/tab/big5/jyutping.tab
13lib/xcin/tab/big5/jyutping0.tab 13lib/xcin/tab/big5/jyutping0.tab
14lib/xcin/tab/big5/phone.tab 14lib/xcin/tab/big5/phone.tab
15lib/xcin/tab/big5/pinyin.tab 15lib/xcin/tab/big5/pinyin.tab
16lib/xcin/tab/big5/pinyin0.tab 16lib/xcin/tab/big5/pinyin0.tab
17lib/xcin/tab/big5/simplex.tab 17lib/xcin/tab/big5/simplex.tab
18lib/xcin/tab/big5/sys.tab 18lib/xcin/tab/big5/sys.tab
19lib/xcin/tab/big5/telecode.tab 19lib/xcin/tab/big5/telecode.tab