Date: Mon, 28 Jul 2014 18:13:50 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363213 - in head/editors: apel apel/files bpatch/files bvi/files flim/files gnotepad+/files nedit/files nvi-m17n/files semi/files uemacs/files vigor/files Message-ID: <201407281813.s6SIDoIU007645@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 18:13:49 2014 New Revision: 363213 URL: http://svnweb.freebsd.org/changeset/ports/363213 QAT: https://qat.redports.org/buildarchive/r363213/ Log: Rename editors/ patch-xy patches to reflect the files they modify. Added: head/editors/apel/files/patch-APEL-MK - copied unchanged from r363209, head/editors/apel/files/patch-ac head/editors/bpatch/files/patch-Makefile - copied unchanged from r363209, head/editors/bpatch/files/patch-aa head/editors/bpatch/files/patch-bpatch.c - copied unchanged from r363209, head/editors/bpatch/files/patch-ab head/editors/bvi/files/patch-io.c - copied unchanged from r363209, head/editors/bvi/files/patch-ab head/editors/flim/files/patch-FLIM-CFG - copied unchanged from r363209, head/editors/flim/files/patch-aa head/editors/flim/files/patch-mime-en.texi - copied unchanged from r363209, head/editors/flim/files/patch-ac head/editors/flim/files/patch-mime-ja.texi - copied unchanged from r363209, head/editors/flim/files/patch-ad head/editors/gnotepad+/files/patch-Makefile.in - copied unchanged from r363209, head/editors/gnotepad+/files/patch-aa head/editors/nedit/files/patch-Makefile - copied unchanged from r363209, head/editors/nedit/files/patch-aa head/editors/nedit/files/patch-doc_nc.man - copied unchanged from r363209, head/editors/nedit/files/patch-ad head/editors/nedit/files/patch-makefiles_Makefile.freebsd - copied unchanged from r363209, head/editors/nedit/files/patch-ac head/editors/nedit/files/patch-source_Makefile.common - copied unchanged from r363209, head/editors/nedit/files/patch-ab head/editors/nvi-m17n/files/patch-include_sys_queue.h - copied unchanged from r363209, head/editors/nvi-m17n/files/patch-ac head/editors/semi/files/patch-SEMI-CFG - copied unchanged from r363209, head/editors/semi/files/patch-ac head/editors/semi/files/patch-mime-ui-en.texi - copied unchanged from r363209, head/editors/semi/files/patch-aa head/editors/semi/files/patch-mime-ui-ja.texi - copied unchanged from r363209, head/editors/semi/files/patch-ab head/editors/uemacs/files/patch-Makefile - copied unchanged from r363209, head/editors/uemacs/files/patch-aa head/editors/uemacs/files/patch-freebsd_estruct.h - copied unchanged from r363209, head/editors/uemacs/files/patch-ab head/editors/uemacs/files/patch-freebsd_makefile - copied unchanged from r363209, head/editors/uemacs/files/patch-af head/editors/uemacs/files/patch-h_epath.h - copied unchanged from r363209, head/editors/uemacs/files/patch-ae head/editors/uemacs/files/patch-src_bind.c - copied unchanged from r363209, head/editors/uemacs/files/patch-ac head/editors/uemacs/files/patch-src_lock.c - copied unchanged from r363209, head/editors/uemacs/files/patch-ad head/editors/uemacs/files/patch-src_unix.c - copied unchanged from r363209, head/editors/uemacs/files/patch-ag head/editors/vigor/files/patch-Makefile.in - copied unchanged from r363209, head/editors/vigor/files/patch-aa Deleted: head/editors/apel/files/patch-ac head/editors/bpatch/files/patch-aa head/editors/bpatch/files/patch-ab head/editors/bvi/files/patch-ab head/editors/flim/files/patch-aa head/editors/flim/files/patch-ac head/editors/flim/files/patch-ad head/editors/gnotepad+/files/patch-aa head/editors/nedit/files/patch-aa head/editors/nedit/files/patch-ab head/editors/nedit/files/patch-ac head/editors/nedit/files/patch-ad head/editors/nvi-m17n/files/patch-ac head/editors/semi/files/patch-aa head/editors/semi/files/patch-ab head/editors/semi/files/patch-ac head/editors/uemacs/files/patch-aa head/editors/uemacs/files/patch-ab head/editors/uemacs/files/patch-ac head/editors/uemacs/files/patch-ad head/editors/uemacs/files/patch-ae head/editors/uemacs/files/patch-af head/editors/uemacs/files/patch-ag head/editors/vigor/files/patch-aa Modified: head/editors/apel/Makefile Modified: head/editors/apel/Makefile ============================================================================== --- head/editors/apel/Makefile Mon Jul 28 18:09:24 2014 (r363212) +++ head/editors/apel/Makefile Mon Jul 28 18:13:49 2014 (r363213) @@ -32,9 +32,8 @@ MAKE_ARGS+= PREFIX="${STAGEDIR}${LOCALBA VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${APEL_VERSION_SPECIFIC_LISPDIR}" OPTIONS_DEFINE= DOCS -OPTINOS_DEFAULT= DOCS +OPTIONS_DEFAULT=DOCS -.include <bsd.port.options.mk> .include <bsd.port.pre.mk> .if ${EMACS_VER:C/\..*//} >= 23 Copied: head/editors/apel/files/patch-APEL-MK (from r363209, head/editors/apel/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/apel/files/patch-APEL-MK Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/apel/files/patch-ac) @@ -0,0 +1,11 @@ +--- APEL-MK.orig Wed Dec 22 13:14:21 1999 ++++ APEL-MK Wed May 10 23:45:36 2000 +@@ -41,7 +41,7 @@ + ;; Make "emu" subdirectory. + "emu" + ;; Don't make "emu" subdirectory. +- "")) ++ "emu")) + + ;; The directories where APEL and EMU modules will be installed. + ;; These two variables will be generated from other variables above. Copied: head/editors/bpatch/files/patch-Makefile (from r363209, head/editors/bpatch/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/bpatch/files/patch-Makefile Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/bpatch/files/patch-aa) @@ -0,0 +1,42 @@ +--- /dev/null Mon Mar 18 12:50:49 1996 ++++ Makefile Mon Mar 18 19:30:47 1996 +@@ -0,0 +1,39 @@ ++# This may have to change on your system. ++# You may have to fiddle with various combinations of curses, termcap, ++# terminfo, etc. Good luck! ++PREFIX?= /usr/local ++BINDIR= ${PREFIX}/bin ++MANDIR= ${PREFIX}/man/man1 ++ ++LIBS = -lncurses ++#LIBS = -ltermlib ++#LIBS = -lterminfo ++#for sysV ++#LIBS = -lcurses ++ ++# However you need getopt. ++#GETOPT = -lgetopt ++#not for sysV! (nor for some BSD) ++#GETOPT = ++ ++# If you're running on a 4.[23] system, you probably want this. ++#WORK = -DMOD_HAX ++#sysV ++#WORK = ++ ++#BSD or thereabouts ++CFLAGS+= $(WORK) ++#Microport sysV/AT, large model, for sdb debugger ++#CFLAGS = -g -Ml ++ ++all: bpatch ++ ++clean: ++ rm -f bpatch bpatch.o *.core ++ ++bpatch: bpatch.o ++ $(CC) -o bpatch $(CFLAGS) bpatch.o $(GETOPT) $(LIBS) ++ ++install: bpatch bpatch.1 ++ $(BSD_INSTALL_PROGRAM) bpatch $(DESTDIR)$(BINDIR) ++ $(BSD_INSTALL_MAN) bpatch.1 $(DESTDIR)$(MANDIR) Copied: head/editors/bpatch/files/patch-bpatch.c (from r363209, head/editors/bpatch/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/bpatch/files/patch-bpatch.c Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/bpatch/files/patch-ab) @@ -0,0 +1,347 @@ +--- bpatch.c.orig 1990-01-17 15:33:33.000000000 +0100 ++++ bpatch.c 2012-11-30 15:20:18.000000000 +0100 +@@ -90,10 +90,15 @@ + /*E*/ + /*S includes, globals, and defines */ + /*Page Eject*/ +-#include <curses.h> ++#include <ncurses.h> + #include <fcntl.h> + #include <signal.h> + #include <ctype.h> ++#include <stdlib.h> ++#include <string.h> ++#include <unistd.h> ++#include <stdio.h> ++#include <termios.h> + #include <sys/types.h> + #include <sys/stat.h> + +@@ -103,14 +108,18 @@ + void icc (); + void copyrec (); + void schwapp (); +- +-/* added declarations, mostly for cleanliness */ +-extern long lseek(); +-extern long atol(); +-extern char *strncpy(); +-extern void exit(); +-extern unsigned sleep(); /* signal problems ??? if sleep called */ +-extern void perror(); ++void breakp (); ++void reset (); ++int ckfile (char *, long *); ++int bread (int, char *, int, int); ++void errmsg (char *, unsigned); ++void show (int, char[16][16], char *, long, int, long, char, int, int, int, int, int, int); ++void dbg_msg (register char *); ++void dohelp (); ++void search (register int); ++int arrow (register int, register int*, register int *); ++void outstr (char *); ++void outch (register char); + + /* set up for calls to outstr and errmsg, etc, */ + /* by use of sprintf to fill outbuf */ +@@ -190,7 +199,7 @@ + #ifdef MOD_HAX + #else /* use original code... */ + /* plus some more for restoring terminal function */ +- struct termio asis, aswas; ++ struct termios asis, aswas; + #endif /* MOD_HAX */ + + /*S main - control all the work from here */ +@@ -202,6 +211,7 @@ + * + *********************************************************************/ + /*E*/ ++int + main (argc, argv) + int argc; + char *argv[]; +@@ -210,12 +220,10 @@ + extern WINDOW *newwin (); + + register char *cp; /* general purpose char ptr */ +- extern char *gets (); /* get string from stdin */ + char m = '\017'; /* mask for hex edit */ + char response[512]; /* general purpose buffer */ + int z; /* character read in */ + +- int breakp (); /* signal trapping function */ + int c; /* current screen column */ + int change = 0; /* true if cmd line option toggled */ + int fid; /* file descriptor */ +@@ -234,8 +242,7 @@ + extern char *optarg; /* getopt pointer to opt arg */ + + extern long getnum (); +- extern char *instr (); /* get a string from the cmd line */ +- extern int reset (); /* exit function - reset terminal */ ++ extern char *myinstr (); /* get a string from the cmd line */ + + /* ------------------------------------------------------------ */ + /* set up signal handling */ +@@ -333,19 +340,27 @@ + alphawin = subwin (stdscr, 16, 16, 4, 57); + keypad (alphawin, TRUE); + errwin = subwin (stdscr, 1, 80, 23, 0); ++ if (errwin == NULL) ++ errwin = stdscr; ++ if (hexwin == NULL || alphawin == NULL) ++ { ++ fprintf(stderr, "Can't create all necessary curses windows.\n"); ++ reset (0); ++ exit (2); ++ } + + #ifdef MOD_HAX + /* This is not exactly what the original code does, + but it's good enough. -r$ */ + raw(); + #else /* use original code... */ +- ioctl (0, TCGETA, &asis); ++ tcgetattr (0, &asis); + aswas = asis; /* save termio stuff for later restore */ + asis.c_cc[VINTR] = '\0'; + asis.c_iflag &= ~IXON; + asis.c_iflag &= ~IXOFF; + asis.c_iflag &= ~IXANY; +- ioctl (0, TCSETA, &asis); ++ tcsetattr (0, TCSANOW, &asis); + #endif /* MOD_HAX */ + } + +@@ -398,7 +413,7 @@ + { + position = lseek (fid, ((long )recno) * 256, 0); + +- if ((bytes = bread (fid, record, 256, block)) < 0) ++ if ((bytes = bread (fid, (char *)record, 256, block)) < 0) + { + sprintf(outbuf, "error on reading file %s", filename); + errmsg (outbuf, SLEEP_TIME); +@@ -478,7 +493,9 @@ + } + pbrk = 0; + fprintf (stderr, "\007"); +- gets (response); ++ fgets (response, 512, stdin); ++ if ((cp = strchr (response, '\n'))) ++ *cp = 0; + + if (pbrk) status = EOF; + } +@@ -617,7 +634,7 @@ + + case '\006': /* new file (^F) */ + close (fid); +- fid = ckfile (cp = instr (), &size); ++ fid = ckfile (cp = myinstr (), &size); + if (fid < 0) + { + fid = ckfile (filename, &size); +@@ -832,7 +849,8 @@ + touchwin (alphawin); + wrefresh (alphawin); + +- while ((z = wgetch (alphawin)) != DEL) ++ while ((z = wgetch (alphawin)) != KEY_DC && ++ z != KEY_BACKSPACE) + { + if (!arrow (z, &r, &c)) + { +@@ -902,7 +920,8 @@ + touchwin (hexwin); + wrefresh (hexwin); + +- while ((z = wgetch (hexwin)) != DEL) ++ while ((z = wgetch (hexwin)) != KEY_DC ++ && z != KEY_BACKSPACE) + { + if (!arrow (z, &r, &c)) + { +@@ -1083,21 +1102,9 @@ + /*E*/ + /*checked typing of parameters as declared in fucntion */ + /* versus declarations at call */ +-show (bytes, record, filename, size, recno, position, +- m,reclen, dump, ebcdic, swab_opt, block, honly) +-int bytes; +-char record[16][16]; +-char *filename; +-long size; +-int recno; +-long position; +-char m; +-int reclen; +-int dump; +-int ebcdic; +-int swab_opt; +-int block; +-int honly; ++void ++show (int bytes, char record[16][16], char *filename, long size, int recno, long position, ++ char m, int reclen, int dump, int ebcdic, int swab_opt, int block, int honly) + { + int i; + int j; +@@ -1281,7 +1288,7 @@ + /*S breakp - set pbrk on interrupt */ + /*H breakp */ + /*E*/ +-int breakp (i) ++void breakp (i) + int i; + { + int s; +@@ -1448,6 +1455,7 @@ + /*S ckfile - check on existence, accessibility, and type of file */ + /*H ckfile */ + /*E*/ ++int + ckfile (filename, sizep) + char *filename; + long *sizep; +@@ -1515,6 +1523,7 @@ + /*S dohelp - display help text */ + /*H dohelp */ + /*E*/ ++void + dohelp () + { + static char *helptxt[] = { +@@ -1592,6 +1601,7 @@ + /*S reset - reset terminal to original state */ + /*H reset */ + /*E*/ ++void + reset (sig) + int sig; + { +@@ -1600,7 +1610,7 @@ + move (23, 0); + refresh (); + #ifndef MOD_HAX +- ioctl (0, TCSETA, &aswas); ++ tcsetattr (0, TCSANOW, &aswas); + #endif + endwin (); + } +@@ -1610,17 +1620,17 @@ + fprintf (stderr, "killed with signal %d\n", sig); + exit (sig); + } +- return (0); + } + /*S arrow - determine if current character is a cursor control key */ + /*H arrow */ + /*E*/ ++int + arrow (k, r, c) + register int k; + register int *r; + register int *c; + { +- register ret = 1; ++ register int ret = 1; + + /* watch out for conflict of VI_* amd KEY_* definitions */ + if (k == KEY_UP || k == VI_UP) +@@ -1673,6 +1683,7 @@ + /*S dbg_msg - print a debug message */ + /*H dbg_msg */ + /*E*/ ++void + dbg_msg (msg) + register char *msg; + { +@@ -1683,11 +1694,11 @@ + + return; + } +-/*S instr - get a character string from the terminal */ +-/*H instr */ ++/*S myinstr - get a character string from the terminal */ ++/*H myinstr */ + /*E*/ + char * +-instr () ++myinstr () + { + static char buf[512]; + +@@ -1815,6 +1826,7 @@ + /*S search - look for an ascii string in the file */ + /*H search */ + /*E*/ ++void + search (fid) + register int fid; + { +@@ -1827,13 +1839,13 @@ + register int matched = 0; + register int srch_len; + +- register char *cp = instr (); ++ register char *cp = myinstr (); + register char *rp; + + int row, col; + + srch_len = strlen (cp); +- copyrec (record, lrecord, sizeof record); ++ copyrec ((char *)record, lrecord, sizeof record); + lrecord[256] = '\0'; + + pbrk = 0; +@@ -1875,7 +1887,7 @@ + { + recno = currec; + stay = 0; +- copyrec (record, unch_rec, sizeof record); ++ copyrec ((char *)record, (char *)unch_rec, sizeof record); + werase (errwin); + touchwin (errwin); + wrefresh (errwin); +@@ -1891,6 +1903,7 @@ + } + /* simplified call to errmsg(), by using sprintf to load format */ + /* sleep_time is not implemented and awaits cleaning up of the signals (?) */ ++void + errmsg (fmt, sleep_time) + unsigned sleep_time; + char *fmt; +@@ -1911,7 +1924,7 @@ + } + else + { +- fprintf (stderr, fmt); ++ fprintf (stderr, "%s", fmt); + fprintf (stderr, "\n"); + } + /* signal problem ?? if sleep called +@@ -1921,16 +1934,17 @@ + return; + } + /* simplified call to outstr(), by using sprintf to load format */ ++void + outstr (fmt) + char *fmt; + { +- if (dump) printf (fmt); +- else printw (fmt); ++ if (dump) printf ("%s", fmt); ++ else printw ("%s", fmt); + + return; + } +-outch (ch) +-register char ch; ++void ++outch (register char ch) + { + if (dump) putchar (ch); + else addch (ch); Copied: head/editors/bvi/files/patch-io.c (from r363209, head/editors/bvi/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/bvi/files/patch-io.c Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/bvi/files/patch-ab) @@ -0,0 +1,11 @@ +--- io.c.orig Tue Nov 2 04:44:10 1999 ++++ io.c Fri Nov 26 18:06:58 1999 +@@ -119,7 +119,7 @@ + } else if (S_ISBLK(buf.st_mode)) { + filemode = BLOCK_SPECIAL; + } else if (S_ISREG(buf.st_mode)) { +- if ((unsigned long)buf.st_size > (unsigned long)SIZE_T_MAX) { ++ if (buf.st_size > SIZE_T_MAX) { + move(maxy, 0); + endwin(); + printf("File too large\n"); Copied: head/editors/flim/files/patch-FLIM-CFG (from r363209, head/editors/flim/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/flim/files/patch-FLIM-CFG Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/flim/files/patch-aa) @@ -0,0 +1,11 @@ +--- FLIM-CFG.orig Tue Sep 15 15:26:08 1998 ++++ FLIM-CFG Sun May 9 01:33:26 1999 +@@ -8,6 +8,8 @@ + + (add-to-list 'load-path + (expand-file-name "../../site-lisp/apel" data-directory)) ++(add-to-list 'load-path ++ (expand-file-name "../site-lisp/emu" data-directory)) + + (if (boundp 'LISPDIR) + (progn Copied: head/editors/flim/files/patch-mime-en.texi (from r363209, head/editors/flim/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/flim/files/patch-mime-en.texi Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/flim/files/patch-ac) @@ -0,0 +1,15 @@ +--- ./mime-en.texi.orig 2002-10-08 15:50:05.000000000 +0000 ++++ ./mime-en.texi 2014-06-28 06:58:47.000000000 +0000 +@@ -1,7 +1,11 @@ + \input texinfo.tex + @c Generated automatically from mime-en.sgml by sinfo 3.7. + @setfilename mime-en.info +-@settitle{FLIM 1.14 Reference Manual about MIME Features} ++@settitle FLIM 1.14 Reference Manual about MIME Features ++@dircategory The Emacs editor and associated tools ++@direntry ++* mime-en: (mime-en). MIME features for GNU Emacs. (English) ++@end direntry + @titlepage + @title FLIM 1.14 Reference Manual about MIME Features + @author MORIOKA Tomohiko <morioka@@jaist.ac.jp> Copied: head/editors/flim/files/patch-mime-ja.texi (from r363209, head/editors/flim/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/flim/files/patch-mime-ja.texi Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/flim/files/patch-ad) @@ -0,0 +1,15 @@ +--- ./mime-ja.texi.orig 2002-10-08 15:50:05.000000000 +0000 ++++ ./mime-ja.texi 2014-06-28 06:59:01.000000000 +0000 +@@ -1,7 +1,11 @@ + \input texinfo.tex + @c Generated automatically from mime-ja.sgml by sinfo 3.7. + @setfilename mime-ja.info +-@settitle{FLIM 1.14 MIME $B5!G=@bL@=q(B} ++@settitle FLIM 1.14 MIME $B5!G=@bL@=q(B ++@dircategory The Emacs editor and associated tools ++@direntry ++* mime-ja: (mime-ja). MIME features for GNU Emacs. (Japanese) ++@end direntry + @titlepage + @title FLIM 1.14 MIME $B5!G=@bL@=q(B + @author $B<i2,(B $BCNI'(B <morioka@@jaist.ac.jp> Copied: head/editors/gnotepad+/files/patch-Makefile.in (from r363209, head/editors/gnotepad+/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/gnotepad+/files/patch-Makefile.in Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/gnotepad+/files/patch-aa) @@ -0,0 +1,30 @@ +--- Makefile.in.orig Wed May 10 09:11:34 2000 ++++ Makefile.in Mon Jun 5 20:59:43 2000 +@@ -97,8 +97,8 @@ + + CLEANFILES = *~ .deps/* + +-Applicationsdir = $(datadir)/gnome/apps/Applications +-Applications_DATA = gnotepad+.desktop gnotepad+.spec ++@HAVE_GNOME_TRUE@Applicationsdir = $(datadir)/gnome/apps/Applications ++@HAVE_GNOME_TRUE@Applications_DATA = gnotepad+.desktop gnotepad+.spec + + SUBDIRS = docs po intl src + +@@ -217,7 +217,6 @@ + + install-ApplicationsDATA: $(Applications_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(Applicationsdir) + @list='$(Applications_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Applicationsdir)/$$p"; \ +@@ -431,7 +430,7 @@ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Applicationsdir) \ ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 \ + $(DESTDIR)$(pkgdatadir) + + Copied: head/editors/nedit/files/patch-Makefile (from r363209, head/editors/nedit/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/nedit/files/patch-Makefile Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/nedit/files/patch-aa) @@ -0,0 +1,15 @@ +--- Makefile.orig 2004-10-01 04:51:05.000000000 +0800 ++++ Makefile 2014-06-15 11:03:09.564113068 +0800 +@@ -44,6 +44,12 @@ docs: + # that doesn't work since we require the user to specify the target. More + # thought is needed + ++install:: ++ (cd source; make -f Makefile.freebsd install) ++ ${INSTALL} ${COPY} -m 644 doc/nedit.man $(DESTDIR)${PREFIX}/man/man1/nedit.1 ++ ${INSTALL} ${COPY} -m 644 doc/nc.man $(DESTDIR)${PREFIX}/man/man1/nclient.1 ++ ${INSTALL} ${COPY} -m 644 NEdit.ad $(DESTDIR)${LOCALBASE}/lib/X11/app-defaults/NEdit.ad ++ + clean: + (cd util; $(MAKE) -f Makefile.common clean) + (cd Xlt; $(MAKE) -f Makefile.common clean) Copied: head/editors/nedit/files/patch-doc_nc.man (from r363209, head/editors/nedit/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/nedit/files/patch-doc_nc.man Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/nedit/files/patch-ad) @@ -0,0 +1,12 @@ +--- doc/nc.man.orig Thu Nov 20 18:40:13 2003 ++++ doc/nc.man Sat Feb 7 14:54:18 2004 +@@ -285,6 +285,9 @@ + .PP + For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit + distribution kit. ++.PP ++In FreeBSD, \fInc\fR is installed as \fInclient\fR so it does not ++conflict with the \fInetcat\fR port which also installs an \fInc\fR. + .SH "SEE ALSO" + .IX Header "SEE ALSO" + \&\fInedit\fR\|(1), X(1), \fImwm\fR\|(1), \fIctags\fR\|(1), \fIetags\fR\|(1) Copied: head/editors/nedit/files/patch-makefiles_Makefile.freebsd (from r363209, head/editors/nedit/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/nedit/files/patch-makefiles_Makefile.freebsd Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/nedit/files/patch-ac) @@ -0,0 +1,22 @@ +--- makefiles/Makefile.freebsd.orig Sun Sep 28 15:03:10 2003 ++++ makefiles/Makefile.freebsd Sat Feb 7 15:00:18 2004 +@@ -1,6 +1,6 @@ + # $Id: Makefile.freebsd,v 1.5.2.1 2003/09/28 15:03:10 edg Exp $ +-CC=cc +-AR=ar ++CC?=cc ++AR?=ar + + # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS + # +@@ -10,8 +10,8 @@ + # To test if the Motif library exports the runtime version + # add -DHAVE__XMVERSIONSTRING to CFLAGS + # +-CFLAGS=-O -I${PREFIX}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM +-LIBS= ${MOTIFLIB} -L${PREFIX}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11 ++CFLAGS+=-O -I${LOCALBASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM -DBUILD_UNTESTED_NEDIT ++LIBS+= ${MOTIFLIB} -L${LOCALBASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11 + + include Makefile.common + Copied: head/editors/nedit/files/patch-source_Makefile.common (from r363209, head/editors/nedit/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/nedit/files/patch-source_Makefile.common Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/nedit/files/patch-ab) @@ -0,0 +1,13 @@ +--- source/Makefile.common.orig 2004-03-21 22:25:56.000000000 +0800 ++++ source/Makefile.common 2014-06-15 11:03:55.335101520 +0800 +@@ -28,6 +28,10 @@ nedit: $(OBJS) ../util/libNUtil.a $(XMLL + nc: nc.o server_common.o ../util/libNUtil.a + $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@ + ++install: nedit nc ++ ${INSTALL} ${COPY} ${STRIP} nedit $(DESTDIR)${PREFIX}/bin ++ ${INSTALL} ${COPY} ${STRIP} nc $(DESTDIR)${PREFIX}/bin/nclient ++ + help.o: help.c + $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@ + Copied: head/editors/nvi-m17n/files/patch-include_sys_queue.h (from r363209, head/editors/nvi-m17n/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/nvi-m17n/files/patch-include_sys_queue.h Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/nvi-m17n/files/patch-ac) @@ -0,0 +1,51 @@ +--- ../include/sys/queue.h.old Wed Jan 10 07:16:01 2001 ++++ ../include/sys/queue.h Wed Jan 10 07:17:02 2001 +@@ -33,8 +33,10 @@ + * @(#)queue.h 8.5 (Berkeley) 8/20/94 + */ + +-#ifndef _SYS_QUEUE_H_ +-#define _SYS_QUEUE_H_ ++#ifndef _SYS_QUEUE_HACK_H_ ++#define _SYS_QUEUE_HACK_H_ ++ ++#include <sys/queue_dist.h> + + /* + * This file defines three types of data structures: lists, tail queues, +@@ -65,6 +67,7 @@ + * For details on the use of these macros, see the queue(3) manual page. + */ + ++#ifndef LIST_HEAD + /* + * List definitions. + */ +@@ -114,7 +117,9 @@ + (elm)->field.le_prev; \ + *(elm)->field.le_prev = (elm)->field.le_next; \ + } ++#endif /* LIST_HEAD */ + ++#ifndef TAILQ_HEAD + /* + * Tail queue definitions. + */ +@@ -180,7 +185,9 @@ + (head)->tqh_last = (elm)->field.tqe_prev; \ + *(elm)->field.tqe_prev = (elm)->field.tqe_next; \ + } ++#endif /* TAILQ_HEAD */ + ++#ifndef CIRCLEQ_HEAD + /* + * Circular queue definitions. + */ +@@ -256,4 +263,6 @@ + (elm)->field.cqe_prev->field.cqe_next = \ + (elm)->field.cqe_next; \ + } +-#endif /* !_SYS_QUEUE_H_ */ ++#endif /* CIRCLEQ_HEAD */ ++ ++#endif /* !_SYS_QUEUE_HACK_H_ */ Copied: head/editors/semi/files/patch-SEMI-CFG (from r363209, head/editors/semi/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/semi/files/patch-SEMI-CFG Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/semi/files/patch-ac) @@ -0,0 +1,11 @@ +--- SEMI-CFG.orig Wed Sep 16 15:48:58 1998 ++++ SEMI-CFG Sun May 9 21:54:02 1999 +@@ -11,6 +11,8 @@ + (add-to-list 'load-path + (expand-file-name "../../site-lisp/apel" data-directory)) + (add-to-list 'load-path ++ (expand-file-name "../site-lisp/emu" data-directory)) ++(add-to-list 'load-path + (expand-file-name "." data-directory)) + + (when (boundp 'LISPDIR) Copied: head/editors/semi/files/patch-mime-ui-en.texi (from r363209, head/editors/semi/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/semi/files/patch-mime-ui-en.texi Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/semi/files/patch-aa) @@ -0,0 +1,14 @@ +--- ./mime-ui-en.texi.orig 2002-10-15 06:59:21.000000000 +0000 ++++ ./mime-ui-en.texi 2014-06-29 07:49:25.000000000 +0000 +@@ -1,6 +1,10 @@ + \input texinfo.tex + @setfilename mime-ui-en.info +-@settitle{SEMI 1.14 Manual} ++@settitle SEMI 1.14 Manual ++@dircategory The Emacs editor and associated tools ++@direntry ++* mime-ui-en: (mime-ui-en). MIME user interface for GNU Emacs. (English) ++@end direntry + @titlepage + @title SEMI 1.14 Manual + @author MORIOKA Tomohiko <morioka@@jaist.ac.jp> Copied: head/editors/semi/files/patch-mime-ui-ja.texi (from r363209, head/editors/semi/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/semi/files/patch-mime-ui-ja.texi Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/semi/files/patch-ab) @@ -0,0 +1,14 @@ +--- ./mime-ui-ja.texi.orig 2002-10-15 06:59:21.000000000 +0000 ++++ ./mime-ui-ja.texi 2014-06-29 07:49:58.000000000 +0000 +@@ -1,6 +1,10 @@ + \input texinfo.tex + @setfilename mime-ui-ja.info +-@settitle{SEMI 1.14 $B@bL@=q(B} ++@settitle SEMI 1.14 $B@bL@=q(B ++@dircategory The Emacs editor and associated tools ++@direntry ++* mime-ui-ja: (mime-ui-ja). MIME user interface for GNU Emacs. (Japanese) ++@end direntry + @titlepage + @title SEMI 1.14 $B@bL@=q(B + @author $B<i2,(B $BCNI'(B <morioka@@jaist.ac.jp> Copied: head/editors/uemacs/files/patch-Makefile (from r363209, head/editors/uemacs/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/uemacs/files/patch-Makefile Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/uemacs/files/patch-aa) @@ -0,0 +1,15 @@ +--- Makefile.orig 2014-05-11 17:18:47.000000000 -0700 ++++ Makefile 2014-05-11 17:20:45.000000000 -0700 +@@ -0,0 +1,12 @@ ++# ++# simple makefile for uemacs ++# ++ ++all: ++ (cd freebsd; make emacs) ++ ++install: all ++ ${BSD_INSTALL_PROGRAM} freebsd/emacs ${DESTDIR}${PREFIX}/bin/uemacs ++ mkdir -p ${DESTDIR}${PREFIX}/share/uemacs ++ ${BSD_INSTALL_DATA} cmd/* ${DESTDIR}${PREFIX}/share/uemacs ++ mv ${DESTDIR}${PREFIX}/share/uemacs/emacs.rc ${DESTDIR}${PREFIX}/share/uemacs/.emacsrc Copied: head/editors/uemacs/files/patch-freebsd_estruct.h (from r363209, head/editors/uemacs/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/uemacs/files/patch-freebsd_estruct.h Mon Jul 28 18:13:49 2014 (r363213, copy of r363209, head/editors/uemacs/files/patch-ab) @@ -0,0 +1,1257 @@ +--- freebsd/estruct.h.orig Wed Mar 25 14:21:05 1998 ++++ freebsd/estruct.h Wed Mar 25 14:25:34 1998 +@@ -0,0 +1,1254 @@ ++/* ESTRUCT: Structure and preprocesser defined for ++ MicroEMACS 4.00 ++ ++ (C)Copyright 1995 by Daniel Lawrence ++ written by Daniel Lawrence ++ based on code by Dave G. Conroy, ++ Steve Wilhite and George Jones ++*/ ++ ++#ifdef LATTICE ++#undef LATTICE /* don't use their definitions...use ours */ ++#endif ++#ifdef MSDOS ++#undef MSDOS ++#endif ++#ifdef WINNT ++#undef WINNT ++#endif ++#ifdef AMIGA ++#undef AMIGA ++#endif ++#ifdef EGA ++#undef EGA ++#endif ++#ifdef CTRLZ ++#undef CTRLZ ++#endif ++ ++/* Program Identification..... ++ ++ PROGNAME should always be MicroEMACS for a distribution ++ unmodified version. People using MicroEMACS as a shell ++ for other products should change this to reflect their ++ product. Macros can query this via the $progname variable ++*/ ++ ++#define PROGNAME "MicroEMACS" ++#define VERSION "4.00" ++ ++/* Machine/OS definitions */ ++/* [Set one of these!!] */ ++ ++#define AMIGA 0 /* AmigaDOS */ ++#define AOSVS 0 /* Data General AOS/VS */ ++#define AUX 0 /* Apple UNIX for Macintosh */ ++#define AIX 0 /* IBM UNIX for various machines*/ ++#define AVIION 0 /* Data General AViiON */ ++#define BSD 0 /* UNIX BSD 4.2 and ULTRIX */ ++#define FINDER 0 /* Macintosh OS */ ++#define FREEBSD 1 /* FREEBSD 386 version 2 or + */ ++#define HPUX8 0 /* HPUX HP 9000 ver 8 or less */ ++#define HPUX9 0 /* HPUX HP 9000 ver 9 */ ++#define MPE 0 /* HP MPE/XL */ ++#define MSDOS 0 /* MS-DOS */ ++#define WINNT 0 /* MS-Win NT */ ++#define OS2 0 /* Microsoft or IBM OS/2 */ ++#define SMOS 0 /* Supermax UNIX System V */ ++#define SUN 0 /* SUN v4.0 */ ++#define TOS 0 /* ST520, TOS */ ++#define USG 0 /* UNIX system V */ ++#define VMS 0 /* VAX/VMS */ ++#define WMCS 0 /* Wicat's MCS */ ++#define XENIX 0 /* IBM-PC SCO XENIX */ ++ ++/* Compiler definitions */ ++/* [Set one of these!!] */ ++#define ALCYON 0 /* ALCYON Atari ST compiler */ ++#define AZTEC 0 /* Aztec C 4.00e ONLY for the amiga now... */ ++#define DGC 0 /* Data General AOS/VS C... */ ++#define GCC 1 /* the GNU C compiler */ ++#define IC 0 /* Rational Systems Instant C */ ++#define LATTICE 0 /* Lattice 2.14 through 3.0 compilers */ ++#define MSC 0 /* MicroSoft C compile version 3 thru 7 */ ++#define MWC 0 /* Mark Williams C */ ++#define TURBO 0 /* Turbo C and Borland C++ under MSDOS */ ++#define UNIX 0 /* a standard UNIX compiler (cc) */ ++#define ZTC 0 /* Zortech C/C++ 1.02 thru 2.10 under MSDOS */ ++ ++/* Machine stack growth direction. */ ++/* [Set this to 1 if your machine stack grows UP!!!] */ ++/* data general mv/eclipse series stack grows up. */ ++/* dec vax series stack grows down... got it??? */ ++ ++#define STACK_GROWS_UP 0 ++ ++/* Debugging options */ ++#define RAMSIZE 0 /* dynamic RAM memory usage tracking */ ++#define RAMSHOW 0 /* auto dynamic RAM reporting */ ++#define RAMTRCK 0 /* send debug info to MALLOC.DAT */ ++#define DEBUG_SEARCH 0 /* pop some search info on patterns */ ++ ++/* Special keyboard/network definitions */ ++ ++#define ATKBD 0 /* AT-style keyboard with F11, F12 & grey keys */ ++#define WANGPC 0 /* WangPC - mostly escape sequences */ ++#define VT100 1 /* Handle VT100 style keypad - NOT VMS. */ ++#define KEYPAD 0 /* VMS - turn on and off application */ ++ /* keypad automatically */ ++#define XONDATA 0 /* VMS - set to force /NOTTSYNC/NOHOSTSY */ ++#define RMSIO 0 /* VMS - skip the rotten C runtime and */ ++ /* use RMS directly */ ++#define OPTMEM 0 /* VMS 5.0 and up - use a less standard */ ++ /* but more efficient memory allocator */ ++ ++/* Terminal Output definitions */ ++/* [Set one of these!!] */ ++ ++#define ANSI 0 /* ANSI escape sequences */ ++#define DASHER 0 /* DG Dasher 2xx/4xx crts */ ++#define DG10 0 /* Data General system/10 */ ++#define FMR 0 /* Fujitsu FMR series driver */ ++#define HP110 0 /* HP110 screen driver */ ++#define HP150 0 /* HP150 screen driver */ ++#define I55 0 /* IBM PS55 DOS J4.0/V */ ++#define IBMPC 0 /* IBM-PC CGA/MONO/EGA/VGA drvr */ ++#define MAC 0 /* Macintosh */ ++#define NEC 0 /* NEC-9801VM driver */ ++#define OS2NPM 0 /* OS/2 non-Presentation Mgr. */ ++#define SMG 0 /* SMG library on VMS */ ++#define ST52 0 /* Atari 520/1040ST screen */ ++#define TERMCAP 1 /* Use TERMCAP */ ++#define TIPC 0 /* TI Profesional PC driver */ ++#define VT52 0 /* VT52 terminal (Zenith). */ ++#define NTCON 0 /* Windows NT console */ ++#define XVT 0 /* XVT windowing system */ ++#define Z309 0 /* Zenith 100 PC family driver */ ++ ++/* Windowing system style (pick one) */ ++ ++#define WINDOW_TEXT 1 /* [default] Text mode */ ++#define WINDOW_MSWIN 0 /* MicroSoft Windows */ ++#define WINDOW_MSWIN32 0 /* MicroSoft Windows 32 bit API */ ++#define WINDOW_X 0 /* X/Unix */ ++ ++/* Language text options (pick one) */ ++ ++#define ENGLISH 1 /* [default] */ ++#define FRENCH 0 ++#define SPANISH 0 ++#define GERMAN 0 ++#define DUTCH 0 ++#define PLATIN 0 /* Pig Latin */ ++#define JAPAN 0 ++#define LATIN 0 /* real Latin */ ++ ++/* Configuration options */ ++ ++#define TYPEAH 1 /* type ahead causes update to be skipped */ ++#define LOGFLG 0 /* send all executed commands to EMACS.LOG */ ++#define VISMAC 0 /* update display during keyboard macros */ ++#define CTRLZ 0 /* add a ^Z at end of files under MSDOS only */ ++#define CLEAN 0 /* de-alloc memory on exit */ ++#define CALLED 0 /* is emacs a called subroutine? or stand alone */ ++ ++#define REVSTA 1 /* Status line appears in reverse video */ ++#define COLOR 1 /* color commands and windows */ ++ ++#define FILOCK 0 /* file locking under unix BSD 4.2 */ ++#define ISRCH 1 /* Incremental searches like ITS EMACS */ ++#define FLABEL 0 /* function key label code [HP150] */ ++#define CRYPT 1 /* file encryption enabled? */ ++#define MAGIC 1 /* include regular expression matching? */ ++#define MOUSE 1 /* Include routines for mouse actions */ ++#define NOISY 1 /* Use a fancy BELL if it exists */ ++#define CTAGS 1 /* include vi-like tagging? */ ++#define SPEECH 0 /* spoken EMACS, for the sight impared [not ready] */ ++#define VARARG 1 /* use varargs.h for mlwrite() */ ++ ++#if XVT ++#undef COLOR ++#define COLOR 1 /* overide this to be TRUE for XVT always */ ++#endif ++ ++/* Character set options */ ++/* [Set one of these!!] */ ++#define ASCII 1 /* always using ASCII char sequences for now */ ++#define EBCDIC 0 /* later IBM mainfraim versions will use EBCDIC */ ++ ++/* handle constant and voids properly */ ++ ++#if VMS ++#define CONST readonly ++#define VOID void ++#define NOSHARE noshare ++#else ++#if AOSVS ++#define CONST $shared $align(1) /* fake a const */ ++#define VOID ++#define NOSHARE $low32k $align(1) /* attempt to optimize read/write vars. */ ++#else ++ ++#if __STDC__ || MSC || TURBO || GCC || (AMIGA && LATTICE) ++#define CONST const ++#define VOID void ++#define NOSHARE ++#else ++#define CONST ++#if IC ++#define VOID void ++#else ++#define VOID ++#endif ++#define NOSHARE ++#endif ++ ++#endif ++#endif ++ ++/* System dependant library redefinitions, structures and includes */ ++ ++/* multibyte character support? */ ++ ++#if NEC || FMR || I55 ++#define DBCS 1 /* double byte character sets enabled */ ++#define INSDEL 1 /* use insert/delete line display optimizations */ ++ ++/* define DBCS prefix bytes */ ++#define is2char(ch) (((ch&0xff) >= 0x81 && (ch&0xff) <= 0x9f) || ((ch&0xff) >=0xe0 && (ch&0xff) <= 0xfc)) ++ ++#else ++#define DBCS 0 ++#define INSDEL 0 ++#endif ++ ++/* Can we catch the SIGWINCH (the window size change signal)? */ ++ ++#if AIX || HPUX9 || FREEBSD ++#define HANDLE_WINCH 1 ++#else ++#define HANDLE_WINCH 0 ++#endif ++ ++/* Prototypes in use? */ ++ ++#if MSC || TURBO || IC || VMS || GCC || ZTC ++#define PROTO 1 ++#else ++#define PROTO 0 ++#endif ++ ++/* the following define allows me to initialize unions... ++ otherwise we make them structures (like the keybinding table) */ ++ ++#if __STDC__ || MSC || TURBO || IC || ZTC ++#define ETYPE union ++#else ++#define ETYPE struct ++#endif ++ ++/* Instant C can't do stat()s. Arrrg. No file locking for you */ ++#if IC && MSDOS ++#undef FILOCK ++#define FILOCK 0 ++#endif ++ ++/* Mark Williams/Atari has no standard or varargs or directory functions */ ++#if TOS & MWC ++#undef VARARG ++#define VARARG 0 ++#undef FILOCK ++#define FILOCK 0 ++#endif ++ ++/* MS-Windows */ ++ ++#if WINNT || WINDOW_MSWIN || WINDOW_MSWIN32 ++#if WINDOW_MSWIN32 ++#undef WINDOW_MSWIN ++#define WINDOW_MSWIN 1 ++#endif ++#if WINDOW_MSWIN && WINNT ++#undef WINDOW_MSWIN32 ++#define WINDOW_MSWIN32 1 ++#endif ++#undef VOID /* windows.h will wind up defining this */ ++#include <windows.h> /* --------- Huge include file here !!! ---------*/ ++#if NTCON ++#include <wincon.h> ++#include <stdio.h> ++#include <dos.h> ++#endif *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407281813.s6SIDoIU007645>