kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix canna-canuum which was broken due to

Browse source 
(1) curses library said undefined
    Fix by adding two replacement patch under canna/patches
    -- One is actually mod on patch-an
    -- The other is patches/patch-canuum_termio.c

(2) Add SUBST Lines for canna-canuum/Makefile
    for fix_curs (as of inputmethod/canna_canuum)

(3) Add Following lines on canna-canuum/Makefile
   .include "../../wip/canna-lib/buildlink3.mk"

Update  canna-lib/buildlink3.mk
-BUILDLINK_API_DEPENDS.Canna-lib+=      Canna-lib>=3.6pl4
+BUILDLINK_API_DEPENDS.Canna-lib+=      Canna-lib>=3.7p3

Following packages are confirmed to be packaged,
by listed in limited_list
with pbulk bulkbuild. (NetBSD/amd64 6.0_BETA2)
---------------
wip/canna
wip/canna-canuum
wip/canna-dict
wip/canna-lib
wip/canna-server
---------------
This commit is contained in:
Makoto Fujiwara 2012-08-12 12:47:24 +00:00 committed by Thomas Klausner
parent 917451fb15
commit b2b1c2d791
5 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
canna-canuum/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $ # $NetBSD: Makefile,v 1.2 2012/08/12 12:47:24 makoto Exp $
CANNA_MODULE= canuum CANNA_MODULE= canuum
@ -17,6 +17,13 @@ INSTALL_MAKE_FLAGS+= INSTUGIDFLAGS=
SPECIAL_PERMS+= bin/canuum ${SETUID_ROOT_PERMS} SPECIAL_PERMS+= bin/canuum ${SETUID_ROOT_PERMS}
.include "../../mk/curses.buildlink3.mk"
SUBST_CLASSES+= fix_curs
SUBST_STAGE.fix_curs= post-patch
SUBST_MESSAGE.fix_curs= Fixing curses
SUBST_FILES.fix_curs+= canuum/Imakefile
SUBST_SED.fix_curs+= -e 's/TERMCAP_LIB = .*/TERMCAP_LIB = -l'${BUILDLINK_LIBNAME.curses}'/g'
.include "../../wip/canna-lib/buildlink3.mk" .include "../../wip/canna-lib/buildlink3.mk"
pre-configure: pre-configure:
@ -25,6 +32,7 @@ pre-configure:
${LN} -fs ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum ${LN} -fs ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
${LN} -fs ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum ${LN} -fs ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
.include "../../wip/canna-lib/buildlink3.mk"
.include "../../wip/libspt/buildlink3.mk" .include "../../wip/libspt/buildlink3.mk"
.include "../../mk/termcap.buildlink3.mk" .include "../../mk/termcap.buildlink3.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

4
canna-lib/buildlink3.mk
View file

@ -1,11 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $ # $NetBSD: buildlink3.mk,v 1.2 2012/08/12 12:47:24 makoto Exp $
BUILDLINK_TREE+= Canna-lib BUILDLINK_TREE+= Canna-lib
.if !defined(CANNA_LIB_BUILDLINK3_MK) .if !defined(CANNA_LIB_BUILDLINK3_MK)
CANNA_LIB_BUILDLINK3_MK:= CANNA_LIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.Canna-lib+= Canna-lib>=3.6pl4 BUILDLINK_API_DEPENDS.Canna-lib+= Canna-lib>=3.7p3
BUILDLINK_PKGSRCDIR.Canna-lib?= ../../wip/canna-lib BUILDLINK_PKGSRCDIR.Canna-lib?= ../../wip/canna-lib
.endif # CANNA_LIB_BUILDLINK3_MK .endif # CANNA_LIB_BUILDLINK3_MK

5
canna/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $ $NetBSD: distinfo,v 1.2 2012/08/12 12:47:24 makoto Exp $
SHA1 (Canna37p3.tar.bz2) = e39eece7c70c669dd46dd74b26121a60a2496fde SHA1 (Canna37p3.tar.bz2) = e39eece7c70c669dd46dd74b26121a60a2496fde
RMD160 (Canna37p3.tar.bz2) = 33e5eb9e2dc144835db838612897e652acbc60ed RMD160 (Canna37p3.tar.bz2) = 33e5eb9e2dc144835db838612897e652acbc60ed
@ -8,5 +8,6 @@ SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4 SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4
SHA1 (patch-ae) = 0bb5c06e6523952e6cec2188787707d69223fb16 SHA1 (patch-ae) = 0bb5c06e6523952e6cec2188787707d69223fb16
SHA1 (patch-af) = a3ea53da7ce38c71708031dd9c66aafad3d1bf65 SHA1 (patch-af) = a3ea53da7ce38c71708031dd9c66aafad3d1bf65
SHA1 (patch-an) = d639f774bf9ef440458bfc716b211a1dcc95a823 SHA1 (patch-an) = c074e4b20f8b3dae6e81e16492b90bd68e8a73ae
SHA1 (patch-ao) = c577319f50df6624333726cd62b48d869989d881 SHA1 (patch-ao) = c577319f50df6624333726cd62b48d869989d881
SHA1 (patch-canuum_termio.c) = 30e6e715872c555f6cff34729d1dddfa3ab3486e

21
canna/patches/patch-an
View file

@ -1,8 +1,12 @@
$NetBSD: patch-an,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $ $NetBSD: patch-an,v 1.2 2012/08/12 12:47:24 makoto Exp $
--- canuum/canna.c.orig 2005-12-30 14:56:11.000000000 +0000 (1)
+++ canuum/canna.c (2) Replace obsolete function for curses
@@ -92,8 +92,6 @@ static char rcsid[] = "$Id: canna.c,v 1. resetterm -> reset_shell_mode
--- canuum/canna.c.orig 2003-09-17 17:50:52.000000000 +0900
+++ canuum/canna.c 2012-08-12 17:44:59.000000000 +0900
@@ -94,8 +94,6 @@
#define PARTIALREDRAW 1 #define PARTIALREDRAW 1
#define NOREDRAW 0 #define NOREDRAW 0
@ -11,3 +15,12 @@ $NetBSD: patch-an,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
static int maxmodelen; static int maxmodelen;
static int maxwidth = 0; static int maxwidth = 0;
@@ -1270,7 +1268,7 @@
cannakeyentry(key_end, CANNA_KEY_End);
#endif
- resetterm();
+ reset_shell_mode();
#endif
if (terminalname = malloc(strlen(term) + 1)) {

10
canna/patches/patch-canuum_termio.c Normal file
View file

@ -0,0 +1,10 @@
--- canuum/termio.c.orig 2003-12-28 02:15:21.000000000 +0900
+++ canuum/termio.c 2012-08-12 17:49:02.000000000 +0900
@@ -175,7 +175,6 @@
void
closeTermData ()
{
- resetterm ();
reset_shell_mode ();
}