1) Add missing mk/termcap buildlink3.

2) Always respect CPPFLAGS/LDFLAGS.
3) Enable "USE_CANNA" on Linux and SunOS.

Bump PKGREVISION.

4 files changed, 38 insertions, 9 deletions

diff --git a/editors/ng/Makefile b/editors/ng/Makefile
index 7b3ff94517b..b44ad24475c 100644
--- a/editors/ng/Makefile
+++ b/editors/ng/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2012/02/12 14:12:19 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2012/03/10 08:20:13 sbd Exp $
 
 DISTNAME=	ng-1.4.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors japanese
 MASTER_SITES=	http://tt.sakura.ne.jp/~amura/archives/ng/
 
@@ -50,4 +50,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.new ${DESTDIR}${PREFIX}/share/doc/ng/CHANGES.new.euc-jp
 	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.doc ${DESTDIR}${PREFIX}/share/doc/ng/CHANGES.doc.euc-jp
 
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ng/distinfo b/editors/ng/distinfo
index b5e32c91c5d..2fe8e218c99 100644
--- a/editors/ng/distinfo
+++ b/editors/ng/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:15:12 agc Exp $
+$NetBSD: distinfo,v 1.6 2012/03/10 08:20:13 sbd Exp $
 
 SHA1 (ng-1.4.3.tar.gz) = b5200da6c41f0e4d1d232a1a0c9548f8a37a96e2
 RMD160 (ng-1.4.3.tar.gz) = 5c0bcf80502cdba1bc7ea51c484b31088e5864bd
 Size (ng-1.4.3.tar.gz) = 586587 bytes
-SHA1 (patch-aa) = 0df9627b2dc337df879d982fe51a8293b65f3155
+SHA1 (patch-aa) = 9fe18cac939f4ac659f662d548d32996159e1ca6
+SHA1 (patch-sys_sysv_Makefile) = 02178b598ffc7d7e05150324b4f19af73cb3a047
diff --git a/editors/ng/patches/patch-aa b/editors/ng/patches/patch-aa
index 03a426b54ac..e56aa6aa5a7 100644
--- a/editors/ng/patches/patch-aa
+++ b/editors/ng/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2002/06/10 12:37:43 sakamoto Exp $
+$NetBSD: patch-aa,v 1.6 2012/03/10 08:20:13 sbd Exp $
 
---- sys/bsd/Makefile.orig	Sun Oct  1 00:59:42 2000
-+++ sys/bsd/Makefile	Thu Feb 15 18:28:30 2001
+--- sys/bsd/Makefile.orig	2000-09-30 15:59:42.000000000 +0000
++++ sys/bsd/Makefile
 @@ -13,12 +13,15 @@
  SYS	= bsd
  
@@ -15,8 +15,10 @@ $NetBSD: patch-aa,v 1.5 2002/06/10 12:37:43 sakamoto Exp $
 +CANNAINC = ${CPPFLAGS}
 +.else
  CANNADEF =
- CANNALIB =
- CANNAINC =
+-CANNALIB =
+-CANNAINC =
++CANNALIB = ${LDFLAGS}
++CANNAINC = ${CPPFLAGS}
 +.endif
  
  # CDEFS gets defines, and gets passed to lint. CFLAGS gets flags, and doesn't
diff --git a/editors/ng/patches/patch-sys_sysv_Makefile b/editors/ng/patches/patch-sys_sysv_Makefile
new file mode 100644
index 00000000000..8859c06cf5a
--- /dev/null
+++ b/editors/ng/patches/patch-sys_sysv_Makefile
@@ -0,0 +1,25 @@
+$NetBSD: patch-sys_sysv_Makefile,v 1.1 2012/03/10 08:20:13 sbd Exp $
+
+--- sys/sysv/Makefile.orig	2012-03-10 08:14:15.662278295 +0000
++++ sys/sysv/Makefile
+@@ -15,12 +15,15 @@
+ SYS	= sysv
+ 
+ # Canna configurations
+-#CANNADEF = -DCANNA
+-#CANNALIB = -L/usr/share/lib -lcanna
+-#CANNAINC = -I/usr/share/include
++.if ${USE_CANNA} == "YES"
++CANNADEF = -DCANNA
++CANNALIB = ${LDFLAGS} -lcanna
++CANNAINC = ${CPPFLAGS}
++.else
+ CANNADEF =
+-CANNALIB =
+-CANNAINC =
++CANNALIB = ${LDFLAGS}
++CANNAINC = ${CPPFLAGS}
++.endif
+ 
+ # CDEFS gets defines, and gets passed to lint. CFLAGS gets flags, and doesn't
+ # get passed to lint.