Remove japanese/groff

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Remove japanese/groff

Anthony J. Bentley-4
Hi,

japanese/groff is an ancient patchset on top of even more ancient
groff (specifically groff-1.10, released in 1995).

Nothing uses it anymore. So remove it as below (plus quirks of course).

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/japanese/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 19 Apr 2017 05:58:48 -0000 1.30
+++ Makefile 16 Apr 2018 09:56:29 -0000
@@ -3,7 +3,6 @@
      SUBDIR =
      SUBDIR += Wnn
      SUBDIR += canna
-     SUBDIR += groff
      SUBDIR += gwaei
      SUBDIR += kakasi
      SUBDIR += kanatest
Index: groff/Makefile
===================================================================
RCS file: groff/Makefile
diff -N groff/Makefile
--- groff/Makefile 26 Jul 2017 22:45:25 -0000 1.18
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:25 sthen Exp $
-
-COMMENT= japanese groff
-
-CATEGORIES= japanese textproc print
-
-PKGNAME= ja-groff-1.10_0.99
-REVISION = 2
-DISTNAME= groff-1.10
-
-PATCHFILES= jgroff-0.99.diff.gz:0
-
-MASTER_SITES= ${MASTER_SITE_GNU:=groff/}
-
-MASTER_SITES0= ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
-                ftp://ftp.tohoku.ac.jp/pub/GNU/japanese/
-
-
-PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c ${COMPILER_LIBCXX} m
-
-PATCH_DIST_STRIP= -p1
-
-CONFIGURE_STYLE= gnu old dest
-USE_GROFF = Yes
-
-#post-configure:
-# @cd ${WRKSRC}/xditview && ${SETENV} ${MAKE_ENV} ${XMKMF}
-#
-#post-build:
-# @cd ${WRKBUILD}/xditview && ${SETENV} ${MAKE_ENV} \
-#    make ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
-#
-#post-install:
-# @cd ${WRKBUILD}/xditview && ${SETENV} ${MAKE_ENV} \
-#    make ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} install install.man
-
-MAINTAINER= Marc Espie <[hidden email]>
-
-.include <bsd.port.mk>
Index: groff/distinfo
===================================================================
RCS file: groff/distinfo
diff -N groff/distinfo
--- groff/distinfo 18 Jan 2015 03:14:16 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-SHA256 (groff-1.10.tar.gz) = WffsLElBTE/JZ7N5ZBj9/UTI0ZbnSG3Snd6BXKb2XTE=
-SHA256 (jgroff-0.99.diff.gz) = wOj1w6LEVpE0gbzob0rzwbGlk8cYbtI9GhRnN4rvjQs=
-SIZE (groff-1.10.tar.gz) = 986431
-SIZE (jgroff-0.99.diff.gz) = 84778
Index: groff/patches/patch-Makefile_comm
===================================================================
RCS file: groff/patches/patch-Makefile_comm
diff -N groff/patches/patch-Makefile_comm
--- groff/patches/patch-Makefile_comm 9 May 2010 21:26:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-Install everything with a `j' prefix, including all manpages.
-$OpenBSD: patch-Makefile_comm,v 1.2 2010/05/09 21:26:54 robert Exp $
---- Makefile.comm.orig Tue Jun 27 13:08:27 1995
-+++ Makefile.comm Sun May  9 22:33:01 2010
-@@ -44,7 +44,7 @@ MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS
- CLEANFILES=$(LIBCLEAN)
- DISTCLEANFILES=TAGS Makefile
- REALCLEANFILES=$(YTABC) $(YTABH)
--NAMEPREFIX=
-+NAMEPREFIX=j
- HDRS=
- MANPAGES=$(MAN1) $(MAN5) $(MAN7)
- MANCLEAN=$(MANPAGES)
-@@ -144,7 +144,7 @@ install_man:
- -test -d $(man5dir) || mkdir $(man5dir)
- @-pages="$(MAN5)"; \
- for p in $$pages; do \
-- target=$(man5dir)/`basename $$p .n`.$(man5ext); \
-+ target=$(man5dir)/$(NAMEPREFIX)`basename $$p .n`.$(man5ext); \
- rm -f $$target; \
- echo $(INSTALL_DATA) $$p $$target; \
- $(INSTALL_DATA) $$p $$target; \
-@@ -152,7 +152,7 @@ install_man:
- -test -d $(man7dir) || mkdir $(man7dir)
- @-pages="$(MAN7)"; \
- for p in $$pages; do \
-- target=$(man7dir)/`basename $$p .n`.$(man7ext); \
-+ target=$(man7dir)/$(NAMEPREFIX)`basename $$p .n`.$(man7ext); \
- rm -f $$target; \
- echo $(INSTALL_DATA) $$p $$target; \
- $(INSTALL_DATA) $$p $$target; \
Index: groff/patches/patch-Makefile_in
===================================================================
RCS file: groff/patches/patch-Makefile_in
diff -N groff/patches/patch-Makefile_in
--- groff/patches/patch-Makefile_in 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Put data into jgroff.
-Issue: don't install everything, but link redundant stuff from
-/usr/share/groff ?
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- Makefile.in.orig Tue Apr 11 23:43:40 2000
-+++ Makefile.in Tue Apr 11 23:44:42 2000
-@@ -75,7 +75,7 @@ bindir=$(exec_prefix)/bin
-
- # datasubdir says where to install data files
- datadir=$(prefix)/share
--datasubdir=$(datadir)/groff
-+datasubdir=$(datadir)/jgroff
-
- # fontdir says where to install dev*/*.
- fontdir=$(datasubdir)/font
Index: groff/patches/patch-afmtodit_Makefile_sub
===================================================================
RCS file: groff/patches/patch-afmtodit_Makefile_sub
diff -N groff/patches/patch-afmtodit_Makefile_sub
--- groff/patches/patch-afmtodit_Makefile_sub 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Avoid surprises, install jafmtodit.
-$OpenBSD: patch-afmtodit_Makefile_sub,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- afmtodit/Makefile.sub.orig Wed Apr 12 13:53:52 2000
-+++ afmtodit/Makefile.sub Wed Apr 12 13:54:10 2000
-@@ -15,7 +15,7 @@ afmtodit: afmtodit.pl
- install_data: afmtodit
- -test -d $(bindir) || mkdir $(bindir)
- -rm -f $(bindir)/afmtodit
-- $(INSTALL_PROGRAM) afmtodit $(bindir)/afmtodit
-+ $(INSTALL_PROGRAM) afmtodit $(bindir)/$(NAMEPREFIX)afmtodit
-
- uninstall_sub:
- -rm -f $(bindir)/afmtodit
Index: groff/patches/patch-configure
===================================================================
RCS file: groff/patches/patch-configure
diff -N groff/patches/patch-configure
--- groff/patches/patch-configure 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-Use j prefix elsewhere as well.
-$OpenBSD: patch-configure,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- configure.orig Wed Apr 12 14:35:51 2000
-+++ configure Wed Apr 12 14:36:03 2000
-@@ -1901,18 +1901,7 @@ fi
- test -n "$PAGE" || PAGE=letter
- echo "$ac_t""$PAGE" 1>&6
-
--echo $ac_n "checking for existing troff installation""... $ac_c" 1>&6
--if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" \
--  = x0
--then
-- echo "$ac_t""yes" 1>&6
-- g=g
--else
-- echo "$ac_t""no" 1>&6
-- g=
--fi
--
--
-+g=j
-
- echo $ac_n "checking for prefix of system macro packages""... $ac_c" 1>&6
- sys_tmac_prefix=
Index: groff/patches/patch-devascii_DESC_proto
===================================================================
RCS file: groff/patches/patch-devascii_DESC_proto
diff -N groff/patches/patch-devascii_DESC_proto
--- groff/patches/patch-devascii_DESC_proto 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-devascii_DESC_proto,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- devascii/DESC.proto.orig Wed Apr 12 16:47:35 2000
-+++ devascii/DESC.proto Wed Apr 12 16:47:39 2000
-@@ -5,4 +5,4 @@ unitwidth 10
- sizes 10 0
- fonts 4 R I B BI
- tcommand
--postpro grotty
-+postpro jgrotty
Index: groff/patches/patch-devdvi_DESC_in
===================================================================
RCS file: groff/patches/patch-devdvi_DESC_in
diff -N groff/patches/patch-devdvi_DESC_in
--- groff/patches/patch-devdvi_DESC_in 9 May 2010 21:26:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-devdvi_DESC_in,v 1.2 2010/05/09 21:26:54 robert Exp $
---- devdvi/DESC.in.orig Sun May  9 22:33:01 2010
-+++ devdvi/DESC.in Sun May  9 22:33:01 2010
-@@ -8,4 +8,4 @@ sizes 500 600 700 800 900 1000 1100 1200 1400 1440 160
- fonts 15 R I B BI 0 0 0 0 0 MI S EX CW M G
- ondemand M G
- tcommand
--postpro grodvi
-+postpro jgrodvi
Index: groff/patches/patch-devlatin1_DESC_proto
===================================================================
RCS file: groff/patches/patch-devlatin1_DESC_proto
diff -N groff/patches/patch-devlatin1_DESC_proto
--- groff/patches/patch-devlatin1_DESC_proto 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-devlatin1_DESC_proto,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- devlatin1/DESC.proto.orig Wed Apr 12 16:48:05 2000
-+++ devlatin1/DESC.proto Wed Apr 12 16:48:08 2000
-@@ -5,4 +5,4 @@ unitwidth 10
- sizes 10 0
- fonts 4 R I B BI
- tcommand
--postpro grotty
-+postpro jgrotty
Index: groff/patches/patch-devlj4_DESC_in
===================================================================
RCS file: groff/patches/patch-devlj4_DESC_in
diff -N groff/patches/patch-devlj4_DESC_in
--- groff/patches/patch-devlj4_DESC_in 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-devlj4_DESC_in,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- devlj4/DESC.in.orig Wed Apr 12 14:52:13 2000
-+++ devlj4/DESC.in Wed Apr 12 14:52:20 2000
-@@ -6,4 +6,4 @@ styles R I B BI
- fonts 6 0 0 0 0 0 S
- family T
- tcommand
--postpro grolj4
-+postpro jgrolj4
Index: groff/patches/patch-devnippon_DESC_proto
===================================================================
RCS file: groff/patches/patch-devnippon_DESC_proto
diff -N groff/patches/patch-devnippon_DESC_proto
--- groff/patches/patch-devnippon_DESC_proto 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-devnippon_DESC_proto,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- devnippon/DESC.proto.orig Wed Apr 12 20:59:54 2000
-+++ devnippon/DESC.proto Wed Apr 12 20:59:58 2000
-@@ -6,4 +6,4 @@ sizes 10 0
- fonts 6 R I B BI M G
- ondemand M G
- tcommand
--postpro grotty
-+postpro jgrotty
Index: groff/patches/patch-devnippon_Makefile_sub
===================================================================
RCS file: groff/patches/patch-devnippon_Makefile_sub
diff -N groff/patches/patch-devnippon_Makefile_sub
--- groff/patches/patch-devnippon_Makefile_sub 23 Sep 2006 15:50:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-devnippon_Makefile_sub,v 1.1 2006/09/23 15:50:09 espie Exp $
---- devnippon/Makefile.sub.orig Sat Sep 23 17:48:02 2006
-+++ devnippon/Makefile.sub Sat Sep 23 17:48:38 2006
-@@ -13,6 +13,9 @@ PROG=createM
- OBJS=createM.o
- CSRCS=createM.c
-
-+$(PROG): $(OBJS)
-+ $(CC) -o $@ $(OBJS)
-+
- $(FONTS): R.proto
- @echo Making $@
- @-rm -f $@
Index: groff/patches/patch-devps_DESC_in
===================================================================
RCS file: groff/patches/patch-devps_DESC_in
diff -N groff/patches/patch-devps_DESC_in
--- groff/patches/patch-devps_DESC_in 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-devps_DESC_in,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- devps/DESC.in.orig Wed Apr 12 14:52:13 2000
-+++ devps/DESC.in Wed Apr 12 14:52:24 2000
-@@ -11,4 +11,4 @@ family T
- fonts 11 0 0 0 0 0 SS S ZD ZDR M G
- ondemand M G
- tcommand
--postpro grops
-+postpro jgrops
Index: groff/patches/patch-grog_Makefile_sub
===================================================================
RCS file: groff/patches/patch-grog_Makefile_sub
diff -N groff/patches/patch-grog_Makefile_sub
--- groff/patches/patch-grog_Makefile_sub 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-grog_Makefile_sub,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- grog/Makefile.sub.orig Wed Apr 12 13:53:31 2000
-+++ grog/Makefile.sub Wed Apr 12 13:53:42 2000
-@@ -16,7 +16,7 @@ grog: grog.pl grog.sh
- install_data: grog
- -test -d $(bindir) || mkdir $(bindir)
- -rm -f $(bindir)/grog
-- $(INSTALL_PROGRAM) grog $(bindir)/grog
-+ $(INSTALL_PROGRAM) grog $(bindir)/$(NAMEPREFIX)grog
-
- uninstall_sub:
- -rm -f $(bindir)/grog
Index: groff/patches/patch-grog_grog_pl
===================================================================
RCS file: groff/patches/patch-grog_grog_pl
diff -N groff/patches/patch-grog_grog_pl
--- groff/patches/patch-grog_grog_pl 12 Apr 2000 20:34:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-grog_grog_pl,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
---- grog/grog.pl.orig Wed Apr 12 15:47:16 2000
-+++ grog/grog.pl Wed Apr 12 15:47:28 2000
-@@ -6,7 +6,7 @@
- $prog = $0;
- $prog =~ s@.*/@@;
-
--push(@command, "groff");
-+push(@command, "jgroff");
-
- while ($ARGV[0] =~ /^-./) {
-     $arg = shift(@ARGV);
Index: groff/patches/patch-grops_ps_cc
===================================================================
RCS file: groff/patches/patch-grops_ps_cc
diff -N groff/patches/patch-grops_ps_cc
--- groff/patches/patch-grops_ps_cc 9 May 2010 21:26:54 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-grops_ps_cc,v 1.3 2010/05/09 21:26:54 robert Exp $
---- grops/ps.cc.orig Sun May  9 22:33:01 2010
-+++ grops/ps.cc Sun May  9 22:33:01 2010
-@@ -684,7 +684,7 @@ void ps_printer::define_encoding(const char *encoding,
-     fatal("can't open encoding file `%1'", encoding);
-   int lineno = 1;
-   char buf[256];
--  while (fgets(buf, 512, fp) != 0) {
-+  while (fgets(buf, 256, fp) != 0) {
-     char *p = buf;
-     while (csspace(*p))
-       p++;
-@@ -1506,7 +1506,7 @@ int main(int argc, char **argv)
-       }
-     case 'c':
-       if (sscanf(optarg, "%d", &ncopies) != 1 || ncopies <= 0) {
-- error("bad number of copies `%s'", optarg);
-+ error("bad number of copies `%1'", optarg);
- ncopies = 1;
-       }
-       break;
Index: groff/patches/patch-hpftodit_hpftodit_cc
===================================================================
RCS file: groff/patches/patch-hpftodit_hpftodit_cc
diff -N groff/patches/patch-hpftodit_hpftodit_cc
--- groff/patches/patch-hpftodit_hpftodit_cc 9 May 2010 21:26:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Missing include, probably due to jgroff-0.99 being based on groff-1.9
-initially.
-$OpenBSD: patch-hpftodit_hpftodit_cc,v 1.2 2010/05/09 21:26:54 robert Exp $
---- hpftodit/hpftodit.cc.orig Tue Jun 27 14:59:39 1995
-+++ hpftodit/hpftodit.cc Sun May  9 22:33:01 2010
-@@ -34,6 +34,7 @@ put filename in error messages (or fix lib)
- #include <string.h>
- #include <errno.h>
- #include "assert.h"
-+#include "eucmac.h"
- #include "lib.h"
- #include "posix.h"
- #include "errarg.h"
Index: groff/patches/patch-indxbib_indxbib_cc
===================================================================
RCS file: groff/patches/patch-indxbib_indxbib_cc
diff -N groff/patches/patch-indxbib_indxbib_cc
--- groff/patches/patch-indxbib_indxbib_cc 20 Apr 2000 22:40:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-indxbib_indxbib_cc,v 1.1 2000/04/20 22:40:42 espie Exp $
---- indxbib/indxbib.cc.orig Fri Apr 21 00:26:10 2000
-+++ indxbib/indxbib.cc Fri Apr 21 00:27:44 2000
-@@ -222,12 +222,11 @@ int main(int argc, char **argv)
-   else {
-     temp_index_file = strsave(TEMP_INDEX_TEMPLATE);
-   }
--  if (!mktemp(temp_index_file) || !temp_index_file[0])
-+  int fd = mkstemp(temp_index_file);
-+  if (fd == -1 || !temp_index_file[0])
-     fatal("cannot create file name for temporary file");
--  catch_fatal_signals();
--  int fd = creat(temp_index_file, S_IRUSR|S_IRGRP|S_IROTH);
--  if (fd < 0)
--    fatal("can't create temporary index file: %1", strerror(errno));
-+  if (fchmod(fd, S_IRUSR|S_IRGRP|S_IROTH) < 0)
-+    fatal("cannot change permissions for temporary file");
-   indxfp = fdopen(fd, "w");
-   if (indxfp == 0)
-     fatal("fdopen failed");
Index: groff/patches/patch-nroff_nroff_sh
===================================================================
RCS file: groff/patches/patch-nroff_nroff_sh
diff -N groff/patches/patch-nroff_nroff_sh
--- groff/patches/patch-nroff_nroff_sh 20 Apr 2000 22:40:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-nroff_nroff_sh,v 1.2 2000/04/20 22:40:42 espie Exp $
---- nroff/nroff.sh.orig Fri Apr 21 00:24:56 2000
-+++ nroff/nroff.sh Fri Apr 21 00:29:37 2000
-@@ -24,7 +24,7 @@ do
- echo "$prog: option $1 requires an argument" >&2
- exit 1
- ;;
-- -i|-[mrno]*)
-+ -i|-S|-[mrno]*)
- opts="$opts $1";
- ;;
-
-@@ -58,4 +58,4 @@ done
-
- # This shell script is intended for use with man, so warnings are
- # probably not wanted.  Also load nroff-style character definitions.
--exec groff -Wall -mtty-char $T $opts ${1+"$@"}
-+exec jgroff -S -Wall -mtty-char $T $opts ${1+"$@"}
Index: groff/patches/patch-refer_refer_cc
===================================================================
RCS file: groff/patches/patch-refer_refer_cc
diff -N groff/patches/patch-refer_refer_cc
--- groff/patches/patch-refer_refer_cc 9 May 2010 21:26:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-refer_refer_cc,v 1.1 2010/05/09 21:26:54 robert Exp $
---- refer/refer.cc.orig Sun May  9 23:24:19 2010
-+++ refer/refer.cc Sun May  9 23:25:34 2010
-@@ -513,7 +513,7 @@ static void do_file(const char *filename)
-  if ((flags & FORCE_LEFT_BRACKET) || !have_text)
-    pending_line += PRE_LABEL_MARKER;
-  pending_line += pre;
--  pending_line += LABEL_MARKER + lt;
-+  pending_line += LABEL_MARKER + (int)lt;
-  pending_line += post;
-  if ((flags & FORCE_RIGHT_BRACKET) || !have_text)
-    pending_line += POST_LABEL_MARKER;
Index: groff/patches/patch-tmac_doc-common
===================================================================
RCS file: groff/patches/patch-tmac_doc-common
diff -N groff/patches/patch-tmac_doc-common
--- groff/patches/patch-tmac_doc-common 20 Apr 2000 22:40:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-tmac_doc-common,v 1.1 2000/04/20 22:40:42 espie Exp $
---- tmac/doc-common.orig Fri Apr 21 00:30:41 2000
-+++ tmac/doc-common Fri Apr 21 00:31:20 2000
-@@ -245,7 +245,8 @@
- . if "\\n(mo"10" .ds dD October
- . if "\\n(mo"11" .ds dD November
- . if "\\n(mo"12" .ds dD December
--. as dD \&\ \\n(dy, 19\\n(yr
-+.               nr *year \\n(yr+1900
-+.               as dD \&\ \\n(dy, \\n([*year]
- . \}
- .\}
- .el \{\
Index: groff/patches/patch-tmac_tmac_e
===================================================================
RCS file: groff/patches/patch-tmac_tmac_e
diff -N groff/patches/patch-tmac_tmac_e
--- groff/patches/patch-tmac_tmac_e 20 Apr 2000 22:40:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-tmac_tmac_e,v 1.1 2000/04/20 22:40:42 espie Exp $
---- tmac/tmac.e.orig Fri Apr 21 00:31:29 2000
-+++ tmac/tmac.e Fri Apr 21 00:31:59 2000
-@@ -1519,7 +1519,8 @@ in \\f2\\*([B\\f1, \c
- .if \n(dw=5 .ds dw Thursday
- .if \n(dw=6 .ds dw Friday
- .if \n(dw=7 .ds dw Saturday
--.ds td \*(mo \n(dy, 19\n(yr
-+.nr *year \n(yr+1900
-+.ds td \*(mo \n(dy, \n[*year]
- .\" *** PARAMETRIC INITIALIZATIONS ***
- .rr x
- .nr $v \n(.v00+\n(.sp-1/\n(.sp \" vs as percentage of ps for .sz request
Index: groff/patches/patch-troff_input_cc
===================================================================
RCS file: groff/patches/patch-troff_input_cc
diff -N groff/patches/patch-troff_input_cc
--- groff/patches/patch-troff_input_cc 9 May 2010 21:26:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-troff_input_cc,v 1.1 2010/05/09 21:26:54 robert Exp $
---- troff/input.cc.orig Sun May  9 23:21:57 2010
-+++ troff/input.cc Sun May  9 23:22:15 2010
-@@ -75,6 +75,9 @@ void vjustify();
- #endif /* COLUMN */
- void transparent();
- void transparent_file();
-+void process_input_stack();
-+extern void end_diversions();
-+extern void title();
-
- const char *program_name = 0;
- token tok;
Index: groff/patches/patch-troff_node_cc
===================================================================
RCS file: groff/patches/patch-troff_node_cc
diff -N groff/patches/patch-troff_node_cc
--- groff/patches/patch-troff_node_cc 9 May 2010 21:26:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-troff_node_cc,v 1.1 2010/05/09 21:26:54 robert Exp $
---- troff/node.cc.orig Sun May  9 23:21:17 2010
-+++ troff/node.cc Sun May  9 23:22:54 2010
-@@ -171,6 +171,7 @@ class tfont : public tfont_spec { (public)
-   hunits get_subscript_correction(charinfo *);
-   friend tfont *make_tfont(tfont_spec &);
- };
-+tfont *make_tfont(tfont_spec &);
-
- inline int env_definite_font(environment *env)
- {
-@@ -1527,7 +1528,7 @@ void glyph_node::operator delete(void *p)
-
- void ligature_node::operator delete(void *p)
- {
--  delete p;
-+  delete[] (char *)p;
- }
-
- glyph_node::glyph_node(charinfo *c, tfont *t, node *x)
Index: groff/patches/patch-xditview_Dvi_c
===================================================================
RCS file: groff/patches/patch-xditview_Dvi_c
diff -N groff/patches/patch-xditview_Dvi_c
--- groff/patches/patch-xditview_Dvi_c 20 Apr 2000 22:40:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-xditview_Dvi_c,v 1.1 2000/04/20 22:40:42 espie Exp $
---- xditview/Dvi.c.orig Fri Apr 21 00:32:15 2000
-+++ xditview/Dvi.c Fri Apr 21 00:32:41 2000
-@@ -353,8 +353,8 @@ static void OpenFile (dw)
- dw->dvi.tmpFile = 0;
- if (!dw->dvi.seek) {
- strcpy (tmpName, "/tmp/dviXXXXXX");
-- mktemp (tmpName);
-- dw->dvi.tmpFile = fopen (tmpName, "w+");
-+ fd = mkstemp (tmpName);
-+ dw->dvi.tmpFile = fdopen (fd, "w+");
- unlink (tmpName);
- }
- dw->dvi.requested_page = 1;
Index: groff/pkg/DESCR
===================================================================
RCS file: groff/pkg/DESCR
diff -N groff/pkg/DESCR
--- groff/pkg/DESCR 12 Apr 2000 20:34:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-Jgroff is based on GNU groff, with a patch to handle japanese EUC encoded
-documents.
Index: groff/pkg/PLIST
===================================================================
RCS file: groff/pkg/PLIST
diff -N groff/pkg/PLIST
--- groff/pkg/PLIST 15 Sep 2004 00:56:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,328 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:56:28 espie Exp $
-bin/jaddftinfo
-bin/jafmtodit
-bin/jeqn
-bin/jgrodvi
-bin/jgroff
-bin/jgrog
-bin/jgrolj4
-bin/jgrops
-bin/jgrotty
-bin/jhpftodit
-bin/jindxbib
-bin/jlkbib
-bin/jlookbib
-bin/jneqn
-bin/jnroff
-bin/jpfbtops
-bin/jpic
-bin/jpsbb
-bin/jrefer
-bin/jsoelim
-bin/jtbl
-bin/jtfmtodit
-bin/jtroff
-@man man/man1/jaddftinfo.1
-@man man/man1/jafmtodit.1
-@man man/man1/jeqn.1
-@man man/man1/jgrodvi.1
-@man man/man1/jgroff.1
-@man man/man1/jgrog.1
-@man man/man1/jgrolj4.1
-@man man/man1/jgrops.1
-@man man/man1/jgrotty.1
-@man man/man1/jhpftodit.1
-@man man/man1/jindxbib.1
-@man man/man1/jlkbib.1
-@man man/man1/jlookbib.1
-@man man/man1/jnroff.1
-@man man/man1/jpfbtops.1
-@man man/man1/jpic.1
-@man man/man1/jpsbb.1
-@man man/man1/jrefer.1
-@man man/man1/jsoelim.1
-@man man/man1/jtbl.1
-@man man/man1/jtfmtodit.1
-@man man/man1/jtroff.1
-@man man/man5/jgroff_font.5
-@man man/man5/jgroff_out.5
-@man man/man7/jgroff_char.7
-@man man/man7/jgroff_mm.7
-@man man/man7/jgroff_mmse.7
-@man man/man7/jgroff_ms.7
-@man man/man7/jme.7
-@man man/man7/jmsafer.7
-share/jgroff/
-share/jgroff/eign
-share/jgroff/font/
-share/jgroff/font/devX100/
-share/jgroff/font/devX100-12/
-share/jgroff/font/devX100-12/CB
-share/jgroff/font/devX100-12/CBI
-share/jgroff/font/devX100-12/CI
-share/jgroff/font/devX100-12/CR
-share/jgroff/font/devX100-12/DESC
-share/jgroff/font/devX100-12/G
-share/jgroff/font/devX100-12/HB
-share/jgroff/font/devX100-12/HBI
-share/jgroff/font/devX100-12/HI
-share/jgroff/font/devX100-12/HR
-share/jgroff/font/devX100-12/M
-share/jgroff/font/devX100-12/NB
-share/jgroff/font/devX100-12/NBI
-share/jgroff/font/devX100-12/NI
-share/jgroff/font/devX100-12/NR
-share/jgroff/font/devX100-12/S
-share/jgroff/font/devX100-12/TB
-share/jgroff/font/devX100-12/TBI
-share/jgroff/font/devX100-12/TI
-share/jgroff/font/devX100-12/TR
-share/jgroff/font/devX100/CB
-share/jgroff/font/devX100/CBI
-share/jgroff/font/devX100/CI
-share/jgroff/font/devX100/CR
-share/jgroff/font/devX100/DESC
-share/jgroff/font/devX100/G
-share/jgroff/font/devX100/HB
-share/jgroff/font/devX100/HBI
-share/jgroff/font/devX100/HI
-share/jgroff/font/devX100/HR
-share/jgroff/font/devX100/M
-share/jgroff/font/devX100/NB
-share/jgroff/font/devX100/NBI
-share/jgroff/font/devX100/NI
-share/jgroff/font/devX100/NR
-share/jgroff/font/devX100/S
-share/jgroff/font/devX100/TB
-share/jgroff/font/devX100/TBI
-share/jgroff/font/devX100/TI
-share/jgroff/font/devX100/TR
-share/jgroff/font/devX75/
-share/jgroff/font/devX75-12/
-share/jgroff/font/devX75-12/CB
-share/jgroff/font/devX75-12/CBI
-share/jgroff/font/devX75-12/CI
-share/jgroff/font/devX75-12/CR
-share/jgroff/font/devX75-12/DESC
-share/jgroff/font/devX75-12/G
-share/jgroff/font/devX75-12/HB
-share/jgroff/font/devX75-12/HBI
-share/jgroff/font/devX75-12/HI
-share/jgroff/font/devX75-12/HR
-share/jgroff/font/devX75-12/M
-share/jgroff/font/devX75-12/NB
-share/jgroff/font/devX75-12/NBI
-share/jgroff/font/devX75-12/NI
-share/jgroff/font/devX75-12/NR
-share/jgroff/font/devX75-12/S
-share/jgroff/font/devX75-12/TB
-share/jgroff/font/devX75-12/TBI
-share/jgroff/font/devX75-12/TI
-share/jgroff/font/devX75-12/TR
-share/jgroff/font/devX75/CB
-share/jgroff/font/devX75/CBI
-share/jgroff/font/devX75/CI
-share/jgroff/font/devX75/CR
-share/jgroff/font/devX75/DESC
-share/jgroff/font/devX75/G
-share/jgroff/font/devX75/HB
-share/jgroff/font/devX75/HBI
-share/jgroff/font/devX75/HI
-share/jgroff/font/devX75/HR
-share/jgroff/font/devX75/M
-share/jgroff/font/devX75/NB
-share/jgroff/font/devX75/NBI
-share/jgroff/font/devX75/NI
-share/jgroff/font/devX75/NR
-share/jgroff/font/devX75/S
-share/jgroff/font/devX75/TB
-share/jgroff/font/devX75/TBI
-share/jgroff/font/devX75/TI
-share/jgroff/font/devX75/TR
-share/jgroff/font/devascii/
-share/jgroff/font/devascii/B
-share/jgroff/font/devascii/BI
-share/jgroff/font/devascii/DESC
-share/jgroff/font/devascii/I
-share/jgroff/font/devascii/R
-share/jgroff/font/devdvi/
-share/jgroff/font/devdvi/B
-share/jgroff/font/devdvi/BI
-share/jgroff/font/devdvi/CW
-share/jgroff/font/devdvi/DESC
-share/jgroff/font/devdvi/EX
-share/jgroff/font/devdvi/G
-share/jgroff/font/devdvi/H
-share/jgroff/font/devdvi/HB
-share/jgroff/font/devdvi/HI
-share/jgroff/font/devdvi/I
-share/jgroff/font/devdvi/M
-share/jgroff/font/devdvi/MI
-share/jgroff/font/devdvi/R
-share/jgroff/font/devdvi/S
-share/jgroff/font/devdvi/SA
-share/jgroff/font/devdvi/SB
-share/jgroff/font/devdvi/generate/
-share/jgroff/font/devdvi/generate/CompileFonts
-share/jgroff/font/devdvi/generate/Makefile
-share/jgroff/font/devdvi/generate/msam.map
-share/jgroff/font/devdvi/generate/msbm.map
-share/jgroff/font/devdvi/generate/texb.map
-share/jgroff/font/devdvi/generate/texex.map
-share/jgroff/font/devdvi/generate/texi.map
-share/jgroff/font/devdvi/generate/texmi.map
-share/jgroff/font/devdvi/generate/texr.map
-share/jgroff/font/devdvi/generate/texsy.map
-share/jgroff/font/devdvi/generate/textt.map
-share/jgroff/font/devlatin1/
-share/jgroff/font/devlatin1/B
-share/jgroff/font/devlatin1/BI
-share/jgroff/font/devlatin1/DESC
-share/jgroff/font/devlatin1/I
-share/jgroff/font/devlatin1/R
-share/jgroff/font/devlj4/
-share/jgroff/font/devlj4/ALBB
-share/jgroff/font/devlj4/ALBR
-share/jgroff/font/devlj4/AOB
-share/jgroff/font/devlj4/AOI
-share/jgroff/font/devlj4/AOR
-share/jgroff/font/devlj4/CB
-share/jgroff/font/devlj4/CBI
-share/jgroff/font/devlj4/CI
-share/jgroff/font/devlj4/CLARENDON
-share/jgroff/font/devlj4/CORONET
-share/jgroff/font/devlj4/CR
-share/jgroff/font/devlj4/DESC
-share/jgroff/font/devlj4/GB
-share/jgroff/font/devlj4/GBI
-share/jgroff/font/devlj4/GI
-share/jgroff/font/devlj4/GR
-share/jgroff/font/devlj4/LGB
-share/jgroff/font/devlj4/LGI
-share/jgroff/font/devlj4/LGR
-share/jgroff/font/devlj4/MARIGOLD
-share/jgroff/font/devlj4/OB
-share/jgroff/font/devlj4/OBI
-share/jgroff/font/devlj4/OI
-share/jgroff/font/devlj4/OR
-share/jgroff/font/devlj4/S
-share/jgroff/font/devlj4/TB
-share/jgroff/font/devlj4/TBI
-share/jgroff/font/devlj4/TI
-share/jgroff/font/devlj4/TR
-share/jgroff/font/devlj4/UB
-share/jgroff/font/devlj4/UBI
-share/jgroff/font/devlj4/UCB
-share/jgroff/font/devlj4/UCBI
-share/jgroff/font/devlj4/UCI
-share/jgroff/font/devlj4/UCR
-share/jgroff/font/devlj4/UI
-share/jgroff/font/devlj4/UR
-share/jgroff/font/devlj4/generate/
-share/jgroff/font/devlj4/generate/Makefile
-share/jgroff/font/devlj4/generate/special.map
-share/jgroff/font/devlj4/generate/text.map
-share/jgroff/font/devnippon/
-share/jgroff/font/devnippon/B
-share/jgroff/font/devnippon/BI
-share/jgroff/font/devnippon/DESC
-share/jgroff/font/devnippon/G
-share/jgroff/font/devnippon/I
-share/jgroff/font/devnippon/M
-share/jgroff/font/devnippon/R
-share/jgroff/font/devps/
-share/jgroff/font/devps/AB
-share/jgroff/font/devps/ABI
-share/jgroff/font/devps/AI
-share/jgroff/font/devps/AR
-share/jgroff/font/devps/BMB
-share/jgroff/font/devps/BMBI
-share/jgroff/font/devps/BMI
-share/jgroff/font/devps/BMR
-share/jgroff/font/devps/CB
-share/jgroff/font/devps/CBI
-share/jgroff/font/devps/CI
-share/jgroff/font/devps/CR
-share/jgroff/font/devps/DESC
-share/jgroff/font/devps/G
-share/jgroff/font/devps/HB
-share/jgroff/font/devps/HBI
-share/jgroff/font/devps/HI
-share/jgroff/font/devps/HNB
-share/jgroff/font/devps/HNBI
-share/jgroff/font/devps/HNI
-share/jgroff/font/devps/HNR
-share/jgroff/font/devps/HR
-share/jgroff/font/devps/M
-share/jgroff/font/devps/NB
-share/jgroff/font/devps/NBI
-share/jgroff/font/devps/NI
-share/jgroff/font/devps/NR
-share/jgroff/font/devps/PB
-share/jgroff/font/devps/PBI
-share/jgroff/font/devps/PI
-share/jgroff/font/devps/PR
-share/jgroff/font/devps/S
-share/jgroff/font/devps/SS
-share/jgroff/font/devps/TB
-share/jgroff/font/devps/TBI
-share/jgroff/font/devps/TI
-share/jgroff/font/devps/TR
-share/jgroff/font/devps/ZCMI
-share/jgroff/font/devps/ZD
-share/jgroff/font/devps/ZDR
-share/jgroff/font/devps/download
-share/jgroff/font/devps/generate/
-share/jgroff/font/devps/generate/Makefile
-share/jgroff/font/devps/generate/afmname
-share/jgroff/font/devps/generate/dingbatsmap
-share/jgroff/font/devps/generate/dingbatsrmap
-share/jgroff/font/devps/generate/lgreekmap
-share/jgroff/font/devps/generate/symbol.sed
-share/jgroff/font/devps/generate/symbolchars
-share/jgroff/font/devps/generate/symbolsl.afm
-share/jgroff/font/devps/generate/textmap
-share/jgroff/font/devps/prologue
-share/jgroff/font/devps/symbolsl.pfa
-share/jgroff/font/devps/text.enc
-share/jgroff/font/devps/zapfdr.pfa
-share/jgroff/tmac/
-share/jgroff/tmac/eqnrc
-share/jgroff/tmac/hyphen.us
-share/jgroff/tmac/man.local
-share/jgroff/tmac/mdoc/
-share/jgroff/tmac/mdoc/doc-common
-share/jgroff/tmac/mdoc/doc-ditroff
-share/jgroff/tmac/mdoc/doc-nroff
-share/jgroff/tmac/mdoc/doc-syms
-share/jgroff/tmac/mm/
-share/jgroff/tmac/mm/0.MT
-share/jgroff/tmac/mm/4.MT
-share/jgroff/tmac/mm/5.MT
-share/jgroff/tmac/mm/locale
-share/jgroff/tmac/mm/ms.cov
-share/jgroff/tmac/mm/se_locale
-share/jgroff/tmac/mm/se_ms.cov
-share/jgroff/tmac/tmac.X
-share/jgroff/tmac/tmac.Xps
-share/jgroff/tmac/tmac.an
-share/jgroff/tmac/tmac.andoc
-share/jgroff/tmac/tmac.doc
-share/jgroff/tmac/tmac.doc.old
-share/jgroff/tmac/tmac.dvi
-share/jgroff/tmac/tmac.e
-share/jgroff/tmac/tmac.latin1
-share/jgroff/tmac/tmac.lj4
-share/jgroff/tmac/tmac.m
-share/jgroff/tmac/tmac.mse
-share/jgroff/tmac/tmac.pic
-share/jgroff/tmac/tmac.ps
-share/jgroff/tmac/tmac.psatk
-share/jgroff/tmac/tmac.psnew
-share/jgroff/tmac/tmac.psold
-share/jgroff/tmac/tmac.pspic
-share/jgroff/tmac/tmac.s
-share/jgroff/tmac/tmac.safer
-share/jgroff/tmac/tmac.tty
-share/jgroff/tmac/tmac.tty-char
-share/jgroff/tmac/troffrc

Reply | Threaded
Open this post in threaded view
|

Re: Remove japanese/groff

Ingo Schwarze
Hi Anthony,

Anthony J. Bentley wrote on Mon, Apr 16, 2018 at 03:58:05AM -0600:

> japanese/groff is an ancient patchset on top of even more ancient
> groff (specifically groff-1.10, released in 1995).

Indeed, we are now almost at 1.22.4, and i regard anything older
than 1.22 as ancient and anything older than 1.17 as extremely
ancient.  The technical and functional improvements in 1.17 were
so major that going back beyond that seems like a really bad idea.

> Nothing uses it anymore. So remove it as below (plus quirks of course).

Certainly no objection from me to removing it.

I can't think of a reason why anyone might still need it.
If people still have non-UTF-8 input files, they can be
converted before running modern groff.  If people still require
non-UTF-8 nroff(1) output, they can use -Tutf8 and postprocess
with a character set converter.  Multibyte character support
is likely to be better in modern groff than in such an old version.

So unless somebody objects, OK schwarze@
  Ingo


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/japanese/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 19 Apr 2017 05:58:48 -0000 1.30
> +++ Makefile 16 Apr 2018 09:56:29 -0000
> @@ -3,7 +3,6 @@
>       SUBDIR =
>       SUBDIR += Wnn
>       SUBDIR += canna
> -     SUBDIR += groff
>       SUBDIR += gwaei
>       SUBDIR += kakasi
>       SUBDIR += kanatest
> Index: groff/Makefile
> ===================================================================
> RCS file: groff/Makefile
> diff -N groff/Makefile
> --- groff/Makefile 26 Jul 2017 22:45:25 -0000 1.18
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,40 +0,0 @@
> -# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:25 sthen Exp $
> -
> -COMMENT= japanese groff
> -
> -CATEGORIES= japanese textproc print
> -
> -PKGNAME= ja-groff-1.10_0.99
> -REVISION = 2
> -DISTNAME= groff-1.10
> -
> -PATCHFILES= jgroff-0.99.diff.gz:0
> -
> -MASTER_SITES= ${MASTER_SITE_GNU:=groff/}
> -
> -MASTER_SITES0= ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
> -                ftp://ftp.tohoku.ac.jp/pub/GNU/japanese/
[...]