Wed Dec 12 12:04:51 2012 UTC ()
Update to 1.4.4+official patch, from ISIHARA Takanori in PR 47134.
While here, do some pkglint cleanup.

from Changelog:
a) "mark" was changed like GNU Emacs from Ng 1.5alpha3.
b) fix canna bug for UNIX.
c) fix compile problem when libc was used for Human68K.

from Officail Web page:
patch) fix query-replace bug.


(wiz)
diff -r1.25 -r1.26 pkgsrc/editors/ng/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/ng/PLIST
diff -r1.6 -r1.7 pkgsrc/editors/ng/distinfo
diff -r1.6 -r1.7 pkgsrc/editors/ng/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/editors/ng/patches/patch-sys_sysv_Makefile
cvs diff -r1.25 -r1.26 pkgsrc/editors/ng/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/ng/Makefile 2012/10/03 11:43:38 1.25
+++ pkgsrc/editors/ng/Makefile 2012/12/12 12:04:51 1.26
@@ -1,52 +1,53 @@ @@ -1,52 +1,53 @@
1# $NetBSD: Makefile,v 1.25 2012/10/03 11:43:38 asau Exp $ 1# $NetBSD: Makefile,v 1.26 2012/12/12 12:04:51 wiz Exp $
2 2
3DISTNAME= ng-1.4.3 3DISTNAME= ng-1.4.4
4PKGREVISION= 2 
5CATEGORIES= editors japanese 4CATEGORIES= editors japanese
6MASTER_SITES= http://tt.sakura.ne.jp/~amura/archives/ng/ 5MASTER_SITES= http://tt.sakura.ne.jp/~amura/archives/ng/
7 6
 7PATCH_SITES= ${MASTER_SITES}
 8PATCHFILES= ng-1.4.4-replace_bug.patch
 9
8MAINTAINER= fk200329@fsinet.or.jp 10MAINTAINER= fk200329@fsinet.or.jp
9HOMEPAGE= http://tt.sakura.ne.jp/~amura/ng/ 11HOMEPAGE= http://tt.sakura.ne.jp/~amura/ng/
10COMMENT= Very light Emacs-clone with japanese support 12COMMENT= Very light Emacs-clone with japanese support
11 13#LICENSE= GNU EMACS GENERAL PUBLIC LICENSE
12WRKSRC= ${WRKDIR}/ng 
13 14
14PKG_SUPPORTED_OPTIONS= canna 15PKG_SUPPORTED_OPTIONS= canna
15PKG_SUGGESTED_OPTIONS= canna 16PKG_SUGGESTED_OPTIONS= canna
16PKG_OPTIONS_VAR= PKG_OPTIONS.ng 17PKG_OPTIONS_VAR= PKG_OPTIONS.ng
17 18
18.include "../../mk/bsd.options.mk" 19.include "../../mk/bsd.options.mk"
19 20
20.if !empty(PKG_OPTIONS:Mcanna) 21.if !empty(PKG_OPTIONS:Mcanna)
21.include "../../inputmethod/canna-lib/buildlink3.mk" 22.include "../../inputmethod/canna-lib/buildlink3.mk"
22MAKEFLAGS+= USE_CANNA=YES 23MAKEFLAGS+= USE_CANNA=YES
23.else 24.else
24MAKEFLAGS+= USE_CANNA=NO 25MAKEFLAGS+= USE_CANNA=NO
25.endif 26.endif
26 27
27BUILD_TARGET= ng 28BUILD_TARGET= ng
28 29
29INSTALLATION_DIRS= bin 30INSTALLATION_DIRS= bin share/doc/ng share/examples/ng
30 31
31.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 32.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
32post-patch: 33post-patch:
33 @(cd ${WRKSRC}; ${LN} -s sys/sysv/Makefile . ) 34 cd ${WRKSRC}; ${LN} -s sys/sysv/Makefile .
34.else 35.else
35post-patch: 36post-patch:
36 @(cd ${WRKSRC}; ${LN} -s sys/bsd/Makefile . ) 37 cd ${WRKSRC}; ${LN} -s sys/bsd/Makefile .
37.endif 38.endif
38 39
39do-install: 40do-install:
40 ${INSTALL_PROGRAM} ${WRKSRC}/ng ${DESTDIR}${PREFIX}/bin 41 ${INSTALL_PROGRAM} ${WRKSRC}/ng ${DESTDIR}${PREFIX}/bin
41 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ng 42 ${INSTALL_DATA} ${WRKSRC}/dot.ng ${DESTDIR}${PREFIX}/share/examples/ng/dot.ng.euc-jp
42 ${INSTALL_DATA} ${WRKSRC}/docs/Ng.FAQ ${DESTDIR}${PREFIX}/share/doc/ng/Ng.FAQ.euc-jp 43 ${INSTALL_DATA} ${WRKSRC}/docs/Ng.FAQ ${DESTDIR}${PREFIX}/share/doc/ng/Ng.FAQ.euc-jp
43 ${INSTALL_DATA} ${WRKSRC}/docs/Ng.doc ${DESTDIR}${PREFIX}/share/doc/ng/Ng.doc.euc-jp 44 ${INSTALL_DATA} ${WRKSRC}/docs/Ng.doc ${DESTDIR}${PREFIX}/share/doc/ng/Ng.doc.euc-jp
44 ${INSTALL_DATA} ${WRKSRC}/docs/Ng.ref ${DESTDIR}${PREFIX}/share/doc/ng/Ng.ref.euc-jp 45 ${INSTALL_DATA} ${WRKSRC}/docs/Ng.ref ${DESTDIR}${PREFIX}/share/doc/ng/Ng.ref.euc-jp
45 ${INSTALL_DATA} ${WRKSRC}/docs/Ng.tut ${DESTDIR}${PREFIX}/share/doc/ng/Ng.tut.euc-jp 46 ${INSTALL_DATA} ${WRKSRC}/docs/Ng.tut ${DESTDIR}${PREFIX}/share/doc/ng/Ng.tut.euc-jp
46 ${INSTALL_DATA} ${WRKSRC}/docs/README.Ng ${DESTDIR}${PREFIX}/share/doc/ng/README.Ng.euc-jp 47 ${INSTALL_DATA} ${WRKSRC}/docs/README.Ng ${DESTDIR}${PREFIX}/share/doc/ng/README.Ng.euc-jp
47 ${INSTALL_DATA} ${WRKSRC}/docs/README.SKG ${DESTDIR}${PREFIX}/share/doc/ng/README.SKG.euc-jp 48 ${INSTALL_DATA} ${WRKSRC}/docs/README.SKG ${DESTDIR}${PREFIX}/share/doc/ng/README.SKG.euc-jp
48 ${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.new ${DESTDIR}${PREFIX}/share/doc/ng/CHANGES.new.euc-jp 49 ${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.1_3 ${DESTDIR}${PREFIX}/share/doc/ng/CHANGES.1_3.euc-jp
49 ${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.doc ${DESTDIR}${PREFIX}/share/doc/ng/CHANGES.doc.euc-jp 50 ${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.doc ${DESTDIR}${PREFIX}/share/doc/ng/CHANGES.doc.euc-jp
50 51
51.include "../../mk/termcap.buildlink3.mk" 52.include "../../mk/termcap.buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/editors/ng/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/ng/PLIST 2009/06/14 17:50:25 1.2
+++ pkgsrc/editors/ng/PLIST 2012/12/12 12:04:51 1.3
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:50:25 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/12/12 12:04:51 wiz Exp $
2bin/ng 2bin/ng
 3share/doc/ng/CHANGES.1_3.euc-jp
3share/doc/ng/CHANGES.doc.euc-jp 4share/doc/ng/CHANGES.doc.euc-jp
4share/doc/ng/CHANGES.new.euc-jp 
5share/doc/ng/Ng.FAQ.euc-jp 5share/doc/ng/Ng.FAQ.euc-jp
6share/doc/ng/Ng.doc.euc-jp 6share/doc/ng/Ng.doc.euc-jp
7share/doc/ng/Ng.ref.euc-jp 7share/doc/ng/Ng.ref.euc-jp
8share/doc/ng/Ng.tut.euc-jp 8share/doc/ng/Ng.tut.euc-jp
9share/doc/ng/README.Ng.euc-jp 9share/doc/ng/README.Ng.euc-jp
10share/doc/ng/README.SKG.euc-jp 10share/doc/ng/README.SKG.euc-jp
 11share/examples/ng/dot.ng.euc-jp
cvs diff -r1.6 -r1.7 pkgsrc/editors/ng/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/ng/distinfo 2012/03/10 08:20:13 1.6
+++ pkgsrc/editors/ng/distinfo 2012/12/12 12:04:51 1.7
@@ -1,7 +1,10 @@ @@ -1,7 +1,10 @@
1$NetBSD: distinfo,v 1.6 2012/03/10 08:20:13 sbd Exp $ 1$NetBSD: distinfo,v 1.7 2012/12/12 12:04:51 wiz Exp $
2 2
3SHA1 (ng-1.4.3.tar.gz) = b5200da6c41f0e4d1d232a1a0c9548f8a37a96e2 3SHA1 (ng-1.4.4-replace_bug.patch) = 4d1b8abc0aa22b52951eb696427790cc75842842
4RMD160 (ng-1.4.3.tar.gz) = 5c0bcf80502cdba1bc7ea51c484b31088e5864bd 4RMD160 (ng-1.4.4-replace_bug.patch) = af945e81541b0b848350f46044176ba536d77f45
5Size (ng-1.4.3.tar.gz) = 586587 bytes 5Size (ng-1.4.4-replace_bug.patch) = 3956 bytes
6SHA1 (patch-aa) = 9fe18cac939f4ac659f662d548d32996159e1ca6 6SHA1 (ng-1.4.4.tar.gz) = 35cfdd4ebe7ee4e48c4a6b9e64a52470f0ba2b63
7SHA1 (patch-sys_sysv_Makefile) = 02178b598ffc7d7e05150324b4f19af73cb3a047 7RMD160 (ng-1.4.4.tar.gz) = dd041789d3fba92fe1c9906564a246c1f62cc34e
 8Size (ng-1.4.4.tar.gz) = 587018 bytes
 9SHA1 (patch-aa) = c78f7c9d1654262f612c6db25d5def2f8d2bbcfa
 10SHA1 (patch-sys_sysv_Makefile) = 75abfc306abe358a950a3854c660ee97052e2af4
cvs diff -r1.6 -r1.7 pkgsrc/editors/ng/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/ng/patches/patch-aa 2012/03/10 08:20:13 1.6
+++ pkgsrc/editors/ng/patches/patch-aa 2012/12/12 12:04:51 1.7
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.6 2012/03/10 08:20:13 sbd Exp $ 1$NetBSD: patch-aa,v 1.7 2012/12/12 12:04:51 wiz Exp $
 2
 3Adapt canna flags for pkgsrc.
2 4
3--- sys/bsd/Makefile.orig 2000-09-30 15:59:42.000000000 +0000 5--- sys/bsd/Makefile.orig 2000-09-30 15:59:42.000000000 +0000
4+++ sys/bsd/Makefile 6+++ sys/bsd/Makefile
5@@ -13,12 +13,15 @@ 7@@ -13,12 +13,15 @@
6 SYS = bsd 8 SYS = bsd
7  9
8 # Canna configurations (ex. for NetBSD) 10 # Canna configurations (ex. for NetBSD)
9-#CANNADEF = -DCANNA 11-#CANNADEF = -DCANNA
10-#CANNALIB = -L/usr/pkg/lib -lcanna 12-#CANNALIB = -L/usr/pkg/lib -lcanna
11-#CANNAINC = -I/usr/pkg/include 13-#CANNAINC = -I/usr/pkg/include
12+.if ${USE_CANNA} == "YES" 14+.if ${USE_CANNA} == "YES"
13+CANNADEF = -DCANNA 15+CANNADEF = -DCANNA
14+CANNALIB = ${LDFLAGS} -lcanna 16+CANNALIB = ${LDFLAGS} -lcanna
cvs diff -r1.1 -r1.2 pkgsrc/editors/ng/patches/patch-sys_sysv_Makefile (expand / switch to unified diff)

--- pkgsrc/editors/ng/patches/patch-sys_sysv_Makefile 2012/03/10 08:20:13 1.1
+++ pkgsrc/editors/ng/patches/patch-sys_sysv_Makefile 2012/12/12 12:04:51 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-sys_sysv_Makefile,v 1.1 2012/03/10 08:20:13 sbd Exp $ 1$NetBSD: patch-sys_sysv_Makefile,v 1.2 2012/12/12 12:04:51 wiz Exp $
 2
 3Adapt canna flags for pkgsrc.
2 4
3--- sys/sysv/Makefile.orig 2012-03-10 08:14:15.662278295 +0000 5--- sys/sysv/Makefile.orig 2012-03-10 08:14:15.662278295 +0000
4+++ sys/sysv/Makefile 6+++ sys/sysv/Makefile
5@@ -15,12 +15,15 @@ 7@@ -15,12 +15,15 @@
6 SYS = sysv 8 SYS = sysv
7  9
8 # Canna configurations 10 # Canna configurations
9-#CANNADEF = -DCANNA 11-#CANNADEF = -DCANNA
10-#CANNALIB = -L/usr/share/lib -lcanna 12-#CANNALIB = -L/usr/share/lib -lcanna
11-#CANNAINC = -I/usr/share/include 13-#CANNAINC = -I/usr/share/include
12+.if ${USE_CANNA} == "YES" 14+.if ${USE_CANNA} == "YES"
13+CANNADEF = -DCANNA 15+CANNADEF = -DCANNA
14+CANNALIB = ${LDFLAGS} -lcanna 16+CANNALIB = ${LDFLAGS} -lcanna