summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorwiz <wiz>2005-12-01 18:29:58 +0000
committerwiz <wiz>2005-12-01 18:29:58 +0000
commit6aa2f951ff2b6df4e44e02c7dd4105c415477e54 (patch)
tree9b5262469714fd068d469ee8ed951de8990bb4db /editors
parent16a5961ec6a319d02cc3659665eca687030fce2f (diff)
downloadpkgsrc-6aa2f951ff2b6df4e44e02c7dd4105c415477e54.tar.gz
Convert to options framework.
Fix lots of pkglint warnings while here. Simplify PLIST handling.
Diffstat (limited to 'editors')
-rw-r--r--editors/nvi-m17n/Makefile61
-rw-r--r--editors/nvi-m17n/PLIST20
-rw-r--r--editors/nvi-m17n/distinfo8
-rw-r--r--editors/nvi-m17n/options.mk15
-rw-r--r--editors/nvi-m17n/patches/patch-aa6
-rw-r--r--editors/nvi-m17n/patches/patch-ab6
-rw-r--r--editors/nvi-m17n/patches/patch-global46
7 files changed, 87 insertions, 75 deletions
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 37d1f617b07..ea34ae20686 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2005/08/08 14:44:07 taca Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/01 18:29:58 wiz Exp $
DISTNAME= nvi-1.79
PKGNAME= nvi-m17n-1.79.20040401
-#PKGREVISION=
CATEGORIES= editors
MASTER_SITES= ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
@@ -14,46 +13,35 @@ COMMENT= Clone of vi/ex, with multilingual patch
CONFLICTS= vigor-[0-9]* nvi-[0-9]*
-WRKSRC= ${WRKDIR}/${DISTNAME}/build
+CONFIGURE_DIRS= ${WRKSRC}/build
GNU_CONFIGURE= YES
-PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -f
-CONFIGURE_ENV= OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
-CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n
-
-CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH}
-USE_TOOLS+= sh
-
-.include "../../mk/bsd.prefs.mk"
+PATCH_DIST_ARGS+= -d ${WRKSRC} --forward --quiet -E -f
PATCH_FUZZ_FACTOR= -F1
-.if !defined(USE_CANNA) || ${USE_CANNA} == YES
-.include "../../inputmethod/canna-lib/buildlink3.mk"
-CONFIGURE_ARGS+=--enable-canna=${BUILDLINK_PREFIX.canna-lib}
-CANNA_OPT.euc-jp=canna cannactrl cannakey=
-CANNA_OPT.sjis=${CANNA_OPT.euc-jp}
-CANNA_OPT.iso-2022-jp=${CANNA_OPT.euc-jp}
-.endif
+CONFIGURE_ENV+= OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
+CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n
-PLIST_TMP= ${WRKDIR}/PLIST
-PLIST_SRC+= ${PKGDIR}/PLIST ${PLIST_TMP}
+CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH:Q}
+USE_TOOLS+= sh
-AUTODETECT.euc-jp=jp
-AUTODETECT.sjis=jp
-AUTODETECT.iso-2022-jp=jp
+.include "options.mk"
-AUTODETECT.euc-cn=cn
AUTODETECT.big5=cn
+AUTODETECT.euc-cn=cn
+AUTODETECT.euc-jp=jp
+AUTODETECT.euc-kr=kr
+AUTODETECT.euc-tw=tw
AUTODETECT.hz=cn
AUTODETECT.iso-2022-cn=cn
-
-AUTODETECT.euc-tw=tw
-
-AUTODETECT.euc-kr=kr
+AUTODETECT.iso-2022-jp=jp
AUTODETECT.iso-2022-kr=kr
+AUTODETECT.sjis=jp
+
+ENCODINGS+= iso-2022-cn iso-2022-jp iso-2022-kr
+ENCODINGS+= euc-jp euc-cn euc-kr sjis big5 euc-tw hz
-ENCODING+= iso-2022-cn iso-2022-jp iso-2022-kr
-ENCODING+= euc-jp euc-cn euc-kr sjis big5 euc-tw hz
+.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
# XXX ignore NetBSD 2.0F and later's grantpt(3) and SysV pty for just now
@@ -62,26 +50,25 @@ CONFIGURE_ENV+= vi_cv_sys5_pty=no
post-patch:
.if ${OPSYS} == "NetBSD"
- ${RM} -f ${WRKSRC}/../include/sys/queue.h
+ ${RM} -f ${WRKSRC}/include/sys/queue.h
.endif
post-build:
-.for encoding in ${ENCODING}
+.for encoding in ${ENCODINGS}
@${SED} -e 's|$${CANNA_OPT}|${CANNA_OPT.${encoding}}|' \
-e 's|$${AUTODETECT}|${AUTODETECT.${encoding}}|' \
-e 's|$${ENCODING}|${encoding}|g' \
-e 's|$${PREFIX}|${PREFIX}|' \
${FILESDIR}/nvi-m17n > ${WRKDIR}/nvi-${encoding}
- @${ECHO} "bin/nvi-${encoding}" >> ${PLIST_TMP}
.endfor
post-install:
-.for encoding in ${ENCODING}
- @${INSTALL_SCRIPT} ${WRKDIR}/nvi-${encoding} ${PREFIX}/bin
+.for encoding in ${ENCODINGS}
+ ${INSTALL_SCRIPT} ${WRKDIR}/nvi-${encoding} ${PREFIX}/bin
.endfor
- @${CP} ${WRKSRC}/../README.english \
+ ${INSTALL_DATA} ${WRKSRC}/README.english \
${PREFIX}/share/vi/
- @${CP} ${WRKSRC}/../README.japanese \
+ ${INSTALL_DATA} ${WRKSRC}/README.japanese \
${PREFIX}/share/vi/
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/nvi-m17n/PLIST b/editors/nvi-m17n/PLIST
index 715ad913cfc..2ca391d6a06 100644
--- a/editors/nvi-m17n/PLIST
+++ b/editors/nvi-m17n/PLIST
@@ -1,15 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:16 zuntum Exp $
-bin/nvi
+@comment $NetBSD: PLIST,v 1.2 2005/12/01 18:29:58 wiz Exp $
bin/nex
+bin/nvi
+bin/nvi-big5
+bin/nvi-euc-cn
+bin/nvi-euc-jp
+bin/nvi-euc-kr
+bin/nvi-euc-tw
+bin/nvi-hz
+bin/nvi-iso-2022-cn
+bin/nvi-iso-2022-jp
+bin/nvi-iso-2022-kr
+bin/nvi-sjis
bin/nview
-bin/regular
bin/qregular
-man/man1/nvi.1
+bin/regular
man/man1/nex.1
+man/man1/nvi.1
man/man1/nview.1
share/vi/README.english
share/vi/README.japanese
-share/vi/recover
share/vi/catalog/dutch
share/vi/catalog/english
share/vi/catalog/french
@@ -21,6 +30,7 @@ share/vi/perl/forall.pl
share/vi/perl/make.pl
share/vi/perl/tk.pl
share/vi/perl/wc.pl
+share/vi/recover
share/vi/tcl/errors.tcl
share/vi/tcl/gnats.tcl
share/vi/tcl/mailprocs.tcl
diff --git a/editors/nvi-m17n/distinfo b/editors/nvi-m17n/distinfo
index bbe6f76743b..3523184a15c 100644
--- a/editors/nvi-m17n/distinfo
+++ b/editors/nvi-m17n/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/08/08 14:44:07 taca Exp $
+$NetBSD: distinfo,v 1.8 2005/12/01 18:29:58 wiz Exp $
SHA1 (nvi-1.79.tar.gz) = 65b49768783372609278ecedd63caa8c1547aa2a
RMD160 (nvi-1.79.tar.gz) = 1c39d480e0d30a87fc061c3219354b50011a8621
@@ -6,6 +6,6 @@ Size (nvi-1.79.tar.gz) = 1295401 bytes
SHA1 (nvi-1.79.m17n-20040401.diff.gz) = 10fa772dad4368727a7ddc740d85cdfda3062414
RMD160 (nvi-1.79.m17n-20040401.diff.gz) = 1b1790448d38a4f92f3b2df5f6aa566f1d8efff0
Size (nvi-1.79.m17n-19991117.diff.gz) = 166609 bytes
-SHA1 (patch-aa) = c246b1533dfbfc93ad9c0a8ea8cff5db157c9ee8
-SHA1 (patch-ab) = f7a382af11f200467ac994d90e108e97c7602b13
-SHA1 (patch-global) = 118bfdcefba77c37c07b29d0c68fb8bbf02cb10e
+SHA1 (patch-aa) = aea78d88e44cfcbaa2327861d945098e3db1ce1a
+SHA1 (patch-ab) = 07d0cb5d617e5c2c5781f93daf3a1e8cbe22cf14
+SHA1 (patch-global) = 8a825c8c68872cdfb38c280616d8cbe444bda4b0
diff --git a/editors/nvi-m17n/options.mk b/editors/nvi-m17n/options.mk
new file mode 100644
index 00000000000..74d142eb23c
--- /dev/null
+++ b/editors/nvi-m17n/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2005/12/01 18:29:58 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.nvi-m17n
+PKG_SUPPORTED_OPTIONS= canna
+PKG_SUGGESTED_OPTIONS= canna
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcanna)
+.include "../../inputmethod/canna-lib/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-canna=${BUILDLINK_PREFIX.canna-lib}
+CANNA_OPT.euc-jp=canna cannactrl cannakey=
+CANNA_OPT.sjis=${CANNA_OPT.euc-jp}
+CANNA_OPT.iso-2022-jp=${CANNA_OPT.euc-jp}
+.endif
diff --git a/editors/nvi-m17n/patches/patch-aa b/editors/nvi-m17n/patches/patch-aa
index 0fa8dae5d52..e7fdeafcb0f 100644
--- a/editors/nvi-m17n/patches/patch-aa
+++ b/editors/nvi-m17n/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 1999/12/28 05:37:28 wiz Exp $
-*** Makefile.in.orig Thu Mar 6 13:19:46 1997
---- Makefile.in Thu Mar 6 13:23:40 1997
+$NetBSD: patch-aa,v 1.3 2005/12/01 18:29:58 wiz Exp $
+*** build/Makefile.in.orig Thu Mar 6 13:19:46 1997
+--- build/Makefile.in Thu Mar 6 13:23:40 1997
***************
*** 87,95 ****
cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
diff --git a/editors/nvi-m17n/patches/patch-ab b/editors/nvi-m17n/patches/patch-ab
index 25ab0adda77..2b2c0813dea 100644
--- a/editors/nvi-m17n/patches/patch-ab
+++ b/editors/nvi-m17n/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 1999/12/28 05:37:28 wiz Exp $
---- configure.bad Fri Jun 26 02:22:51 1998
-+++ configure Fri Jun 26 02:23:39 1998
+$NetBSD: patch-ab,v 1.4 2005/12/01 18:29:58 wiz Exp $
+--- build/configure.bad Fri Jun 26 02:22:51 1998
++++ build/configure Fri Jun 26 02:23:39 1998
@@ -1686,10 +1686,8 @@
case "$host_os" in
bsdi2.1)
diff --git a/editors/nvi-m17n/patches/patch-global b/editors/nvi-m17n/patches/patch-global
index 729ac6a389e..ec31371d4e1 100644
--- a/editors/nvi-m17n/patches/patch-global
+++ b/editors/nvi-m17n/patches/patch-global
@@ -1,8 +1,8 @@
-$NetBSD: patch-global,v 1.1 2000/05/08 11:52:12 sakamoto Exp $
+$NetBSD: patch-global,v 1.2 2005/12/01 18:29:58 wiz Exp $
diff -NrU2 ../build/Makefile.in ../../nvi-1.79/build/Makefile.in
---- ../build/Makefile.in Mon May 8 16:05:17 2000
-+++ ../../nvi-1.79/build/Makefile.in Mon May 8 16:06:15 2000
+--- build/Makefile.in Mon May 8 16:05:17 2000
++++ build/Makefile.in Mon May 8 16:06:15 2000
@@ -4,5 +4,5 @@
CC= @CC@
OPTFLAG=@OPTFLAG@
@@ -11,8 +11,8 @@ diff -NrU2 ../build/Makefile.in ../../nvi-1.79/build/Makefile.in
LDFLAGS=@LDFLAGS@
PERL= @vi_cv_path_perl@
diff -NrU2 ../common/main.c ../../nvi-1.79/common/main.c
---- ../common/main.c Sat Oct 12 07:28:28 1996
-+++ ../../nvi-1.79/common/main.c Mon May 8 16:06:15 2000
+--- common/main.c Sat Oct 12 07:28:28 1996
++++ ../nvi-1.79/common/main.c Mon May 8 16:06:15 2000
@@ -65,4 +65,7 @@
u_int flags;
int ch, flagchk, lflag, secure, startup, readonly, rval, silent;
@@ -59,8 +59,8 @@ diff -NrU2 ../common/main.c ../../nvi-1.79/common/main.c
if (secure)
*oargp++ = O_SECURE;
diff -NrU2 ../common/options.c ../../nvi-1.79/common/options.c
---- ../common/options.c Mon May 8 16:05:18 2000
-+++ ../../nvi-1.79/common/options.c Mon May 8 16:20:26 2000
+--- common/options.c Mon May 8 16:05:18 2000
++++ ../nvi-1.79/common/options.c Mon May 8 16:20:26 2000
@@ -129,4 +129,8 @@
/* O_FLASH HPUX */
{"flash", NULL, OPT_1BOOL, 0},
@@ -79,8 +79,8 @@ diff -NrU2 ../common/options.c ../../nvi-1.79/common/options.c
#endif
{"ht", O_HARDTABS}, /* 4BSD */
diff -NrU2 ../docs/USD.doc/vi.man/vi.1 ../../nvi-1.79/docs/USD.doc/vi.man/vi.1
---- ../docs/USD.doc/vi.man/vi.1 Fri Oct 11 10:34:05 1996
-+++ ../../nvi-1.79/docs/USD.doc/vi.man/vi.1 Mon May 8 16:06:15 2000
+--- docs/USD.doc/vi.man/vi.1 Fri Oct 11 10:34:05 1996
++++ ../nvi-1.79/docs/USD.doc/vi.man/vi.1 Mon May 8 16:06:15 2000
@@ -18,5 +18,5 @@
.B ex
[\c
@@ -134,8 +134,8 @@ diff -NrU2 ../docs/USD.doc/vi.man/vi.1 ../../nvi-1.79/docs/USD.doc/vi.man/vi.1
.TP
.B "hardtabs, ht [8]"
diff -NrU2 ../ex/ex.h ../../nvi-1.79/ex/ex.h
---- ../ex/ex.h Mon May 8 16:05:18 2000
-+++ ../../nvi-1.79/ex/ex.h Mon May 8 16:06:15 2000
+--- ex/ex.h Mon May 8 16:05:18 2000
++++ ../nvi-1.79/ex/ex.h Mon May 8 16:06:15 2000
@@ -165,4 +165,7 @@
#define E_USELASTCMD 0x02000000 /* Use the last command. */
#define E_VISEARCH 0x04000000 /* It's really a vi search command. */
@@ -145,8 +145,8 @@ diff -NrU2 ../ex/ex.h ../../nvi-1.79/ex/ex.h
u_int32_t flags; /* Current flags. */
};
diff -NrU2 ../ex/ex_cmd.c ../../nvi-1.79/ex/ex_cmd.c
---- ../ex/ex_cmd.c Wed Oct 23 22:31:01 1996
-+++ ../../nvi-1.79/ex/ex_cmd.c Mon May 8 16:06:15 2000
+--- ex/ex_cmd.c Wed Oct 23 22:31:01 1996
++++ ../nvi-1.79/ex/ex_cmd.c Mon May 8 16:06:15 2000
@@ -303,4 +303,11 @@
"rew[ind][!]",
"re-edit all the files in the file argument list"},
@@ -160,8 +160,8 @@ diff -NrU2 ../ex/ex_cmd.c ../../nvi-1.79/ex/ex_cmd.c
/*
* !!!
diff -NrU2 ../ex/ex_tag.c ../../nvi-1.79/ex/ex_tag.c
---- ../ex/ex_tag.c Mon Sep 16 05:02:43 1996
-+++ ../../nvi-1.79/ex/ex_tag.c Mon May 8 16:06:15 2000
+--- ex/ex_tag.c Mon Sep 16 05:02:43 1996
++++ ../nvi-1.79/ex/ex_tag.c Mon May 8 16:06:15 2000
@@ -47,4 +47,8 @@
static void ctag_file __P((SCR *, TAGF *, char *, char **, size_t *));
static int ctag_search __P((SCR *, char *, size_t, char *));
@@ -335,8 +335,8 @@ diff -NrU2 ../ex/ex_tag.c ../../nvi-1.79/ex/ex_tag.c
/*
* ctag_slist --
diff -NrU2 ../include/ex_def.h ../../nvi-1.79/include/ex_def.h
---- ../include/ex_def.h Wed Oct 23 22:53:09 1996
-+++ ../../nvi-1.79/include/ex_def.h Mon May 8 16:06:15 2000
+--- include/ex_def.h Wed Oct 23 22:53:09 1996
++++ ../nvi-1.79/include/ex_def.h Mon May 8 16:06:15 2000
@@ -48,31 +48,32 @@
#define C_RESIZE 47
#define C_REWIND 48
@@ -400,8 +400,8 @@ diff -NrU2 ../include/ex_def.h ../../nvi-1.79/include/ex_def.h
+#define C_Z 77
+#define C_SUBTILDE 78
diff -NrU2 ../include/ex_extern.h ../../nvi-1.79/include/ex_extern.h
---- ../include/ex_extern.h Wed Oct 23 22:53:10 1996
-+++ ../../nvi-1.79/include/ex_extern.h Mon May 8 16:06:15 2000
+--- include/ex_extern.h Wed Oct 23 22:53:10 1996
++++ ../nvi-1.79/include/ex_extern.h Mon May 8 16:06:15 2000
@@ -90,4 +90,5 @@
void re_error __P((SCR *, int, regex_t *));
int ex_tag_first __P((SCR *, char *));
@@ -409,8 +409,8 @@ diff -NrU2 ../include/ex_extern.h ../../nvi-1.79/include/ex_extern.h
int ex_tag_push __P((SCR *, EXCMD *));
int ex_tag_next __P((SCR *, EXCMD *));
diff -NrU2 ../include/options_def.h ../../nvi-1.79/include/options_def.h
---- ../include/options_def.h Mon May 8 16:05:18 2000
-+++ ../../nvi-1.79/include/options_def.h Mon May 8 16:24:38 2000
+--- include/options_def.h Mon May 8 16:05:18 2000
++++ ../nvi-1.79/include/options_def.h Mon May 8 16:24:38 2000
@@ -25,65 +25,66 @@
#define O_FILEENCODING 24
#define O_FLASH 25
@@ -542,8 +542,8 @@ diff -NrU2 ../include/options_def.h ../../nvi-1.79/include/options_def.h
+#define O_WRITEANY 88
+#define O_OPTIONCOUNT 89
diff -NrU2 ../vi/v_ex.c ../../nvi-1.79/vi/v_ex.c
---- ../vi/v_ex.c Mon May 8 16:05:18 2000
-+++ ../../nvi-1.79/vi/v_ex.c Mon May 8 16:06:15 2000
+--- vi/v_ex.c Mon May 8 16:05:18 2000
++++ ../nvi-1.79/vi/v_ex.c Mon May 8 16:06:15 2000
@@ -227,4 +227,9 @@
EXCMD cmd;