>Number:         12211
>Category:       pkg
>Synopsis:       editors/ng is upgraded to v1.4.3.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Feb 15 08:36:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Hiroyuki Yanai
>Release:        Feb 06 2001
>Organization:
--
fk200329@fsinet.or.jp
>Environment:
System: NetBSD elwood.fsinet.or.jp 1.5R NetBSD 1.5R (GENERIC_M246L) #12: Sun Jan 28 15:46:41 JST 2001
 yanai@elwood.fsinet.or.jp:/usr/local/hpcmips/diskless/usr/src/sys/arch/i386/compile/GENERIC_M246L i386
Architecture: i386
Machine: i386
>Description:
	editors/ng is upgraded to v1.4.3.
>How-To-Repeat:

>Fix:
apply this patch.

diff -ru ./ng-orig/Makefile ./ng/Makefile
--- ./ng-orig/Makefile	Sun Oct 22 04:15:00 2000
+++ ./ng/Makefile	Thu Feb 15 18:33:28 2001
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2000/10/21 22:27:12 wiz Exp $
 
-DISTNAME=	ng-1.4
+DISTNAME=	ng-1.4.3
 CATEGORIES=     editors japanese
 MASTER_SITES=   http://ha3.seikyou.ne.jp/home/amura/archives/ng/
 
@@ -22,10 +22,6 @@
 MAKEFLAGS+=	USE_CANNA=${USE_CANNA}
 
 post-patch:
-.if ${USE_CANNA} != "YES"
-	@(cd ${WRKSRC}; ${MV} config.h config.h.orig )
-	@(cd ${WRKSRC};	${SED} -e "s/#define CANNA/#undef CANNA/" config.h.orig > config.h )
-.endif
 	@(cd ${WRKSRC}; ${LN} -s sys/bsd/Makefile . )
 
 do-install:
diff -ru ./ng-orig/files/md5 ./ng/files/md5
--- ./ng-orig/files/md5	Thu Oct 19 16:54:00 2000
+++ ./ng/files/md5	Thu Feb 15 18:23:55 2001
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/10/19 23:54:37 hubertf Exp $
+$NetBSD$
 
-MD5 (ng-1.4.tar.gz) = 83fd519100b78ba0f6809ba4899b1863
+MD5 (ng-1.4.3.tar.gz) = abf49d8472cdfc9187bb97a4fababc55
diff -ru ./ng-orig/files/patch-sum ./ng/files/patch-sum
--- ./ng-orig/files/patch-sum	Sat Dec 16 04:33:00 2000
+++ ./ng/files/patch-sum	Thu Feb 15 18:33:51 2001
@@ -1,3 +1,3 @@
 $NetBSD: patch-sum,v 1.2 2000/12/15 20:02:01 wiz Exp $
 
-MD5 (patch-aa) = 01a8666c32877f67e89a12463f8c5be2
+MD5 (patch-aa) = 38931a750527d56ac5a557d6b4bbb3b3
diff -ru ./ng-orig/patches/patch-aa ./ng/patches/patch-aa
--- ./ng-orig/patches/patch-aa	Sat Dec 16 04:33:00 2000
+++ ./ng/patches/patch-aa	Thu Feb 15 18:32:24 2001
@@ -1,24 +1,23 @@
-$NetBSD: patch-aa,v 1.2 2000/12/15 20:02:02 wiz Exp $
+$NetBSD$
 
---- sys/bsd/Makefile.orig	Tue Jun 27 10:48:02 2000
-+++ sys/bsd/Makefile	Thu Sep  7 06:02:02 2000
-@@ -8,14 +8,17 @@
- # Modified for Ng 1.0	by Shigeki Yoshida (shige@csk.CO.JP)	1990.01.29
- 
+--- sys/bsd/Makefile.orig	Sun Oct  1 00:59:42 2000
++++ sys/bsd/Makefile	Thu Feb 15 18:28:30 2001
+@@ -13,12 +13,15 @@
  SYS	= bsd
--LIBS	= -L/usr/pkg/lib -lcanna -ltermcap
-+LIBS	= -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltermcap
+ 
+ # Canna configurations (ex. for NetBSD)
+-#CANNADEF = -DCANNA
+-#CANNALIB = -L/usr/pkg/lib -lcanna
+-#CANNAINC = -I/usr/pkg/include
 +.if ${USE_CANNA} == "YES"
-+LIBS	+=	-lcanna
++CANNADEF = -DCANNA
++CANNALIB = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lcanna
++CANNAINC = -I${PREFIX}/include
++.else
+ CANNADEF =
+ CANNALIB =
+ CANNAINC =
 +.endif
+ 
  # CDEFS gets defines, and gets passed to lint. CFLAGS gets flags, and doesn't
  # get passed to lint.
- #
- # Now, compile time options are defined in a "config.h".
- #
- CDEFS	= 
--CFLAGS	= -O2 -I/usr/pkg/include $(CDEFS)
-+CFLAGS	= -O2 -I${PREFIX}/include $(CDEFS)
- 
- # If your machine don't have an alloca(), please define ALLOCA.
- #ALLOCA	= alloca.o

>Release-Note:
>Audit-Trail:
>Unformatted: