CVS commit: [pkgsrc-2017Q1] pkgsrc/inputmethod/canna-lib

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon May  1 08:39:38 UTC 2017

Modified Files:
        pkgsrc/inputmethod/canna-lib [pkgsrc-2017Q1]: Makefile

Log Message:
Pullup ticket #5337 - requested by sevan
inputmethod/canna-lib: build fix

Revisions pulled up:
- inputmethod/canna-lib/Makefile                                1.17

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Thu Apr 20 13:25:07 UTC 2017

   Modified Files:
           pkgsrc/inputmethod/canna-lib: Makefile

   Log Message:
   Don't rely on GNU sed features.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.12.1 pkgsrc/inputmethod/canna-lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/canna-lib/Makefile
diff -u pkgsrc/inputmethod/canna-lib/Makefile:1.16 pkgsrc/inputmethod/canna-lib/Makefile:1.16.12.1
--- pkgsrc/inputmethod/canna-lib/Makefile:1.16  Sun Oct 25 12:17:36 2015
+++ pkgsrc/inputmethod/canna-lib/Makefile       Mon May  1 08:39:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/10/25 12:17:36 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16.12.1 2017/05/01 08:39:38 bsiegert Exp $
 
 PKGREVISION=   1
 CANNA_MODULE=  lib
@@ -13,11 +13,6 @@ post-patch:
        @${SED} -e 's|\(SUBDIRS = lib canna\).*\( misc\)|\1 cmd/forcpp cmd/kpdic dic/phono\2|' \
                -e 's|\(SGSDIR = \).*|\1 lib canna dic/phono misc doc|' \
                ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
-.for f in forcpp kpdic
-       @${MV} ${WRKSRC}/cmd/${f}/Imakefile ${WRKSRC}/cmd/${f}/Imakefile.orig
-       @${SED} -e '/^#define TargetName/a\${.newline}#define DontInstallProgram' ${WRKSRC}/cmd/${f}/Imakefile.orig \
-               > ${WRKSRC}/cmd/${f}/Imakefile
-.endfor
 
 MAKE_ENV+=     AWK=${AWK:Q}
 
@@ -27,4 +22,7 @@ post-extract:
 post-configure:
        @${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
 
+post-install:
+       ${RM} ${DESTDIR}${PREFIX}/bin/forcpp ${DESTDIR}${PREFIX}/bin/kpdic
+
 .include "../../mk/bsd.pkg.mk"