- update to 4.16.0.73
- adjust license marker
This commit is contained in:
jasper
parent
c2a5121f0e
commit
5e327acad9
@ -1,24 +1,23 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2011/11/06 14:56:38 jasper Exp $
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.23 2011/11/11 20:08:40 jasper Exp $
|
||||
|
||||
COMMENT= Jonathan's Own Version of Emacs
|
||||
|
||||
DISTNAME= jove-4.16
|
||||
REVISION= 2
|
||||
V= 4.16.0.73
|
||||
DISTNAME= jove${V}
|
||||
PKGNAME= jove-${V}
|
||||
CATEGORIES= editors
|
||||
|
||||
MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/
|
||||
|
||||
PERMIT_PACKAGE_CDROM= No
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= No
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB= c termcap
|
||||
MASTER_SITES= ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
||||
WRKDIST= ${WRKDIR}/jove
|
||||
WANTLIB= c termcap
|
||||
|
||||
USE_GROFF = Yes
|
||||
NO_REGRESS= Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (jove-4.16.tar.gz) = OOvWQ1Wpmw0Aeq7xew0AsQ==
|
||||
RMD160 (jove-4.16.tar.gz) = rBwOWmjDiotVRxeN7qxAIJ45COA=
|
||||
SHA1 (jove-4.16.tar.gz) = RycoFqusDEt7nkGonTkNBqmIz8s=
|
||||
SHA256 (jove-4.16.tar.gz) = DOS0+OLHbJcnvAEXkc6jJIBCXgtNoWsKil5kKwtJAYo=
|
||||
SIZE (jove-4.16.tar.gz) = 432274
|
||||
MD5 (jove4.16.0.73.tgz) = 1egmvwX8H74bfxBXEVbHNQ==
|
||||
RMD160 (jove4.16.0.73.tgz) = 9ckbOSuvXZwF7aOayFgF4+jSACw=
|
||||
SHA1 (jove4.16.0.73.tgz) = /KbzNGWwju1bkOJM+2fmG8Uknc8=
|
||||
SHA256 (jove4.16.0.73.tgz) = nJ4gJgf1lyw4IJjRC2PIFawB5Xj0MmJsmC5qplAAxjA=
|
||||
SIZE (jove4.16.0.73.tgz) = 465214
|
||||
|
||||
@ -1,14 +1,10 @@
|
||||
$OpenBSD: patch-Makefile,v 1.2 2006/04/09 11:10:09 alek Exp $
|
||||
--- Makefile.orig Tue Mar 19 06:44:33 1996
|
||||
+++ Makefile Mon Mar 13 08:51:30 2006
|
||||
@@ -27,16 +27,16 @@
|
||||
$OpenBSD: patch-Makefile,v 1.3 2011/11/11 20:08:40 jasper Exp $
|
||||
--- Makefile.orig Wed May 26 06:46:38 2010
|
||||
+++ Makefile Fri Nov 11 20:59:04 2011
|
||||
@@ -21,9 +21,9 @@ SHELL = /bin/sh
|
||||
# If they don't exist, this makefile will try to create the directories
|
||||
# LIBDIR and SHAREDIR. All others must already exist.
|
||||
|
||||
SHELL = /bin/sh
|
||||
-TMPDIR = /usr/tmp
|
||||
+TMPDIR = /var/tmp
|
||||
RECDIR = /usr/preserve
|
||||
|
||||
-JOVEHOME = /usr/local
|
||||
-SHAREDIR = $(JOVEHOME)/lib/jove
|
||||
-LIBDIR = $(JOVEHOME)/lib/jove
|
||||
@ -16,55 +12,51 @@ $OpenBSD: patch-Makefile,v 1.2 2006/04/09 11:10:09 alek Exp $
|
||||
+SHAREDIR = $(JOVEHOME)/share/jove
|
||||
+LIBDIR = $(JOVEHOME)/libexec/jove
|
||||
BINDIR = $(JOVEHOME)/bin
|
||||
XEXT=
|
||||
MANDIR = $(JOVEHOME)/man/man$(MANEXT)
|
||||
MANEXT = 1
|
||||
-DFLTSHELL = /bin/csh
|
||||
+DFLTSHELL = /bin/sh
|
||||
|
||||
# The install commands of BSD and System V differ in unpleasant ways:
|
||||
# -c: copy (BSD); -c dir: destination directory (SysV)
|
||||
@@ -50,12 +50,12 @@ DFLTSHELL = /bin/csh
|
||||
@@ -56,14 +56,16 @@ DFLTSHELL = /bin/csh
|
||||
INSTALLFLAGS = # -g bin -o root
|
||||
|
||||
# to install executable files
|
||||
-XINSTALL=cp
|
||||
-#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
|
||||
+#XINSTALL=cp
|
||||
#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
|
||||
#CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
|
||||
+XINSTALL=${BSD_INSTALL_PROGRAM}
|
||||
|
||||
# to install text files
|
||||
-TINSTALL=cp
|
||||
-#TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
|
||||
+#TINSTALL=cp
|
||||
#TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
|
||||
#CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
|
||||
+TINSTALL=${BSD_INSTALL_DATA}
|
||||
|
||||
# These should all just be right if the above ones are.
|
||||
# You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
|
||||
@@ -79,7 +79,7 @@ JOVETOOLM = $(MANDIR)/jovetool.$(MANEXT)
|
||||
# compiler, adding -Xa -v will increase compiler checking.
|
||||
# On DEC OSF/1, -std1 -O
|
||||
@@ -138,6 +140,7 @@ JOVETOOLM = $(MANDIR)/jovetool.$(MANEXT)
|
||||
# to exit using exit(), instead of _exit()).
|
||||
|
||||
SYSDEFS = -DBSDPOSIX_STDC
|
||||
+#SYSDEFS = -DBSDPOSIX
|
||||
|
||||
# Select optimization level (flags passed to compiling and linking steps).
|
||||
# On most systems: -g for debugging, -O for optimization.
|
||||
@@ -146,7 +149,7 @@ SYSDEFS = -DBSDPOSIX_STDC
|
||||
# On DEC OSF/1 and Digital UNIX VV4.0, add -std1 to enable ANSI C features
|
||||
# and perhaps -g3 for more debugging info with optimization.
|
||||
|
||||
-OPTFLAGS = -O
|
||||
+#OPTFLAGS = -O
|
||||
|
||||
# For making dependencies under BSD systems
|
||||
DEPENDFLAG = -M
|
||||
@@ -115,7 +115,7 @@ LIBS = -ltermcap
|
||||
@@ -181,13 +184,13 @@ EXTRALIBS =
|
||||
# PDP-11 with separate I&D: -i
|
||||
# PDP-11 without separate I&D: -n
|
||||
|
||||
|
||||
-LDFLAGS =
|
||||
+#LDFLAGS =
|
||||
|
||||
# define a symbol for your OS if it hasn't got one. See sysdep.h.
|
||||
# Jove has very few defaults, you will almost certainly need to define
|
||||
@@ -163,13 +163,13 @@ LDFLAGS =
|
||||
#
|
||||
# You can just say 'make SYSDEFS=-Dwhatever' on these systems.
|
||||
|
||||
-SYSDEFS =
|
||||
+SYSDEFS = -DBSDPOSIX
|
||||
|
||||
# for SCO Xenix, set
|
||||
# MEMFLAGS = -Mle
|
||||
# CFLAGS = -LARGE -O -F 3000 -K -Mle (say -Mle2 for an 80286)
|
||||
@ -73,17 +65,17 @@ $OpenBSD: patch-Makefile,v 1.2 2006/04/09 11:10:09 alek Exp $
|
||||
+CFLAGS += $(SYSDEFS)
|
||||
|
||||
# For SYSVR4 (/usr/ucb/cc will NOT work because of setjmp.h):
|
||||
# CC = /usr/bin/cc
|
||||
@@ -213,7 +213,7 @@ NROFF = nroff
|
||||
# CC = /usr/bin/cc
|
||||
@@ -236,7 +239,7 @@ NROFF = nroff
|
||||
TROFF = troff -Tpost
|
||||
TROFFPOST = | /usr/lib/lp/postscript/dpost - >troff.out.ps
|
||||
TROFFPOST = | /usr/lib/lp/postscript/dpost -
|
||||
|
||||
-MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM)
|
||||
+MANUALS = $(JOVEM) $(TEACHJOVEM) # $(XJOVEM) $(JOVETOOLM)
|
||||
|
||||
C_SRC = commands.c commands.tab abbrev.c argcount.c ask.c buf.c c.c case.c jctype.c \
|
||||
delete.c disp.c extend.c fp.c fmt.c insert.c io.c iproc.c \
|
||||
@@ -329,8 +329,12 @@ install: $(LIBDIR) $(SHAREDIR) \
|
||||
@@ -362,8 +365,12 @@ install: $(LIBDIR) $(SHAREDIR) \
|
||||
$(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \
|
||||
$(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS)
|
||||
$(TINSTALL) doc/jove.rc $(JOVERC)
|
||||
@ -97,55 +89,4 @@ $OpenBSD: patch-Makefile,v 1.2 2006/04/09 11:10:09 alek Exp $
|
||||
+ @echo ""
|
||||
|
||||
$(LIBDIR)::
|
||||
test -d $(LIBDIR) || mkdir $(LIBDIR)
|
||||
@@ -373,11 +377,10 @@ $(TEACHJOVE): teachjove
|
||||
|
||||
$(JOVEM): doc/jove.nr
|
||||
@sed -e 's;<TMPDIR>;$(TMPDIR);' \
|
||||
- -e 's;<LIBDIR>;$(LIBDIR);' \
|
||||
- -e 's;<SHAREDIR>;$(SHAREDIR);' \
|
||||
- -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > /tmp/jove.nr
|
||||
- $(TINSTALL) /tmp/jove.nr $(JOVEM)
|
||||
- rm /tmp/jove.nr
|
||||
+ -e 's;<LIBDIR>;${LOCALBASE}/libexec/jove;' \
|
||||
+ -e 's;<SHAREDIR>;${LOCALBASE}/share/jove;' \
|
||||
+ -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > jove.$(MANEXT)
|
||||
+ $(TINSTALL) jove.$(MANEXT) $(JOVEM)
|
||||
|
||||
# doc/jove.doc is the formatted manpage (only needed by DOS)
|
||||
# Building it should be like building $(JOVEM) except that we
|
||||
@@ -389,20 +392,18 @@ doc/jove.doc: doc/jove.nr
|
||||
|
||||
$(TEACHJOVEM): doc/teachjove.nr
|
||||
@sed -e 's;<TMPDIR>;$(TMPDIR);' \
|
||||
- -e 's;<LIBDIR>;$(LIBDIR);' \
|
||||
- -e 's;<SHAREDIR>;$(SHAREDIR);' \
|
||||
- -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > /tmp/teachjove.nr
|
||||
- $(TINSTALL) /tmp/teachjove.nr $(TEACHJOVEM)
|
||||
- rm /tmp/teachjove.nr
|
||||
+ -e 's;<LIBDIR>;${LOCALBASE}/libexec/jove;' \
|
||||
+ -e 's;<SHAREDIR>;${LOCALBASE}/share/jove;' \
|
||||
+ -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > teachjove.$(MANEXT)
|
||||
+ $(TINSTALL) teachjove.$(MANEXT) $(TEACHJOVEM)
|
||||
|
||||
$(XJOVEM): doc/xjove.nr
|
||||
$(TINSTALL) doc/xjove.nr $(XJOVEM)
|
||||
|
||||
$(JOVETOOLM): doc/jovetool.nr
|
||||
@sed -e 's;<MANDIR>;$(MANDIR);' \
|
||||
- -e 's;<MANEXT>;$(MANEXT);' doc/jovetool.nr > /tmp/jovetool.nr
|
||||
- $(TINSTALL) /tmp/jovetool.nr $(JOVETOOLM)
|
||||
- rm /tmp/jovetool.nr
|
||||
+ -e 's;<MANEXT>;$(MANEXT);' doc/jovetool.nr > jovetool.$(MANEXT)
|
||||
+ $(TINSTALL) jovetool.$(MANEXT) $(JOVETOOLM)
|
||||
|
||||
echo:
|
||||
@echo $(C-FILES) $(HEADERS)
|
||||
@@ -500,6 +501,7 @@ clean:
|
||||
rm -f a.out core *.o keys.c jjove portsrv recover setmaps \
|
||||
teachjove paths.h \#* *~ make.log *.map jjove.ico \
|
||||
doc/cmds.doc doc/jove.man doc/jove.doc doc/troff.out.ps \
|
||||
+ jove.$(MANEXT) teachjove.$(MANEXT) jovetool.$(MANEXT) \
|
||||
jjove.pure_* tags ID .filelist
|
||||
|
||||
cleanall: clean
|
||||
test -d $(LIBDIR) || mkdir -p $(LIBDIR)
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-abbrev_c,v 1.1 2006/04/09 10:10:25 alek Exp $
|
||||
--- abbrev.c.orig Thu Mar 7 18:34:41 1996
|
||||
+++ abbrev.c Sun Apr 9 12:05:56 2006
|
||||
@@ -274,7 +274,16 @@ EditAbbrevs()
|
||||
"jabbXXXXXX"
|
||||
#endif
|
||||
);
|
||||
+#if 1
|
||||
+ {
|
||||
+ int fd = mkstemp(tname);
|
||||
+ if ( fd == -1 )
|
||||
+ err( 1, "can't create temp file %s", tname );
|
||||
+ close( fd );
|
||||
+ }
|
||||
+#else
|
||||
(void) mktemp(tname);
|
||||
+#endif
|
||||
save_abbrevs(tname);
|
||||
setfname(ebuf, tname);
|
||||
read_file(tname, NO);
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-io_c,v 1.1 2006/04/09 10:10:25 alek Exp $
|
||||
--- io.c.orig Thu Mar 7 18:34:42 1996
|
||||
+++ io.c Sun Apr 9 12:05:56 2006
|
||||
@@ -1193,10 +1193,16 @@ tmpinit()
|
||||
#endif
|
||||
);
|
||||
tfname = copystr(buf);
|
||||
+#if 0
|
||||
tfname = mktemp(tfname);
|
||||
+#endif
|
||||
#ifndef MSFILESYSTEM
|
||||
+#if 1
|
||||
+ tmpfd = mkstemp(tfname);
|
||||
+#else
|
||||
(void) close(creat(tfname, 0600));
|
||||
tmpfd = open(tfname, 2);
|
||||
+#endif
|
||||
#else /* MSFILESYSTEM */
|
||||
tmpfd = open(tfname, O_CREAT|O_EXCL|O_BINARY|O_RDWR, S_IWRITE|S_IREAD);
|
||||
#endif /* MSFILESYSTEM */
|
||||
@ -1,38 +0,0 @@
|
||||
$OpenBSD: patch-proc_c,v 1.1 2006/04/09 10:10:25 alek Exp $
|
||||
--- proc.c.orig Fri Mar 8 22:46:40 1996
|
||||
+++ proc.c Sun Apr 9 12:05:56 2006
|
||||
@@ -827,8 +827,14 @@ UnixToBuf(flags, bnm, InFName, cmd)
|
||||
int ph;
|
||||
|
||||
swritef(pnbuf, sizeof(pnbuf), "%s/%s", TmpDir, "jpXXXXXX");
|
||||
+#if 1
|
||||
+ pipename = pnbuf;
|
||||
+ ph = mkstemp( pipename );
|
||||
+#else
|
||||
pipename = mktemp(pnbuf);
|
||||
- if ((ph = creat(pipename, S_IWRITE|S_IREAD)) < 0)
|
||||
+ ph = creat(pipename, S_IWRITE|S_IREAD);
|
||||
+#endif
|
||||
+ if (ph == -1)
|
||||
complain("cannot make pipe for filter: %s", strerror(errno));
|
||||
close(1);
|
||||
close(2);
|
||||
@@ -923,7 +929,18 @@ bool wrap;
|
||||
jmp_buf sav_jmp;
|
||||
|
||||
swritef(tnambuf, sizeof(tnambuf), "%s/%s", TmpDir, "jfXXXXXX");
|
||||
+#if 1
|
||||
+ {
|
||||
+ int fd = mkstemp(tnambuf);
|
||||
+ if ( fd == -1 )
|
||||
+ complain( "can't create temp file %s: %s",
|
||||
+ tnambuf, strerror(errno) );
|
||||
+ close( fd );
|
||||
+ tname = tnambuf;
|
||||
+ }
|
||||
+#else
|
||||
tname = mktemp(tnambuf);
|
||||
+#endif
|
||||
fp = open_file(tname, iobuff, F_WRITE, YES);
|
||||
push_env(sav_jmp);
|
||||
if (setjmp(mainjmp) == 0) {
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-rec_c,v 1.1 2006/04/09 10:10:25 alek Exp $
|
||||
--- rec.c.orig Thu Mar 7 18:34:43 1996
|
||||
+++ rec.c Sun Apr 9 12:05:56 2006
|
||||
@@ -55,8 +55,12 @@ recinit()
|
||||
#endif
|
||||
);
|
||||
recfname = copystr(buf);
|
||||
+#if 1
|
||||
+ rec_fd = mkstemp(recfname);
|
||||
+#else
|
||||
recfname = mktemp(recfname);
|
||||
rec_fd = creat(recfname, 0644);
|
||||
+#endif
|
||||
if (rec_fd == -1) {
|
||||
complain("Cannot create \"%s\"; recovery disabled.", recfname);
|
||||
/*NOTREACHED*/
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-sysdep_h,v 1.1 2006/04/09 11:10:09 alek Exp $
|
||||
--- sysdep.h.orig Tue Mar 19 05:44:33 1996
|
||||
+++ sysdep.h Sun Apr 9 13:03:06 2006
|
||||
@@ -568,7 +568,8 @@
|
||||
$OpenBSD: patch-sysdep_h,v 1.2 2011/11/11 20:08:40 jasper Exp $
|
||||
--- sysdep.h.orig Fri Nov 11 20:49:39 2011
|
||||
+++ sysdep.h Fri Nov 11 20:50:09 2011
|
||||
@@ -670,7 +670,8 @@
|
||||
#endif
|
||||
|
||||
#ifndef MSDOS /* maximum path length (including '\0') */
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2005/09/04 23:28:43 espie Exp $
|
||||
bin/jove
|
||||
bin/teachjove
|
||||
@comment $OpenBSD: PLIST,v 1.9 2011/11/11 20:08:40 jasper Exp $
|
||||
@bin bin/jove
|
||||
@bin bin/teachjove
|
||||
libexec/jove/
|
||||
libexec/jove/portsrv
|
||||
libexec/jove/recover
|
||||
@bin libexec/jove/recover
|
||||
@man man/man1/jove.1
|
||||
@man man/man1/teachjove.1
|
||||
share/jove/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user