- upgrade to wily 0.13.41
- remove GNU_CONFIGURE and add USE_AUTOCONF - use SEPARATE_BUILD
This commit is contained in:
brad
parent
afd45d12f9
commit
4bc0731f85
@ -1,12 +1,6 @@
|
||||
# OpenBSD Makefile for: wily
|
||||
# Version required: 0.13.36
|
||||
# Date created: May 16 1998
|
||||
# Whom: Angelos D. Keromytis
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 1998/05/17 03:01:58 angelos Exp $
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.2 1999/05/11 21:21:59 brad Exp $
|
||||
|
||||
DISTNAME= wily-0.13.36
|
||||
DISTNAME= wily-0.13.41
|
||||
CATEGORIES= plan9 editors
|
||||
MASTER_SITES= ftp://ftp.northsea.com/pub/plan9_unix/wily/wily/src/ \
|
||||
ftp://ftp.cs.york.ac.uk/pub/mhw/wily/src/ \
|
||||
@ -15,23 +9,28 @@ EXTRACT_SUFX= .tgz
|
||||
|
||||
MAINTAINER= angelos@openbsd.org
|
||||
|
||||
USE_X11= YES
|
||||
GNU_CONFIGURE= YES
|
||||
USE_X11= yes
|
||||
USE_AUTOCONF= yes
|
||||
SEPARATE_BUILD= yes
|
||||
|
||||
WILYDOCDIR= ${PREFIX}/share/doc/wily
|
||||
WILYDOCFILES= index.html intro.html download.html credits.html FAQ.txt \
|
||||
WILYTUTEDIR= ${WILYDOCDIR}/tute
|
||||
WILYDOCFILES= index.html intro.html download.html credits.html FAQ.html \
|
||||
onepage.html user.html idioms.html C.html python.html \
|
||||
perl.txt hack.html changes.txt AcmeVsWily.html Tcl.html \
|
||||
pythonpaper.html winmanager.html
|
||||
hack.html AcmeVsWily.html Tcl.html \
|
||||
pythonpaper.html winmanager.html auug.html one.html \
|
||||
example.gif thumb.gif cartoon.gif \
|
||||
FAQ.txt Tcl.txt changes.txt perl.txt \
|
||||
Credits fonts mouse\
|
||||
tute/findword tute/script tute/start tute/hello.c \
|
||||
tute/send_to_gary
|
||||
|
||||
# The default Wily makefile does not install any documentation. Rectify.
|
||||
post-install:
|
||||
strip ${PREFIX}/bin/wily
|
||||
.if !defined(NOPORTDOCS)
|
||||
${MKDIR} ${WILYDOCDIR}
|
||||
${MKDIR} ${WILYDOCDIR} ${WILYTUTEDIR}
|
||||
set -e; for f in ${WILYDOCFILES}; do \
|
||||
${INSTALL_DATA} ${WRKSRC}/Doc/$${f} ${WILYDOCDIR}/$${f}; \
|
||||
done
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (wily-0.13.36.tgz) = c58344ef2aea2203400b63ed12bcb91b
|
||||
RMD160 (wily-0.13.36.tgz) = 276e0cec8c420b33053b19f8b78c917f203dd324
|
||||
SHA1 (wily-0.13.36.tgz) = 683715a1573b5e572de989d21f40cf6d49295e8c
|
||||
MD5 (wily-0.13.41.tgz) = 6fd6052741a4c3915982878405f752ca
|
||||
RMD160 (wily-0.13.41.tgz) = 970e6b90b1093ce1c8bad535aff9db90200763e6
|
||||
SHA1 (wily-0.13.41.tgz) = 2d6c6dfbda2c7b7b37181aaac20b02f8954c69ee
|
||||
|
||||
@ -1,28 +1,17 @@
|
||||
*** wily/text2.c.orig Sat May 16 22:56:50 1998
|
||||
--- wily/text2.c Sat May 16 22:58:05 1998
|
||||
***************
|
||||
*** 136,146 ****
|
||||
int
|
||||
text_fd(Text *t, Range sel)
|
||||
{
|
||||
! char *file = tmpnam(0);
|
||||
int fd;
|
||||
int input;
|
||||
|
||||
! if ((fd = open(file, O_WRONLY|O_CREAT, 0600)) < 0) {
|
||||
perror("open temp file");
|
||||
(void) unlink(file);
|
||||
return(-1);
|
||||
--- 136,147 ----
|
||||
int
|
||||
text_fd(Text *t, Range sel)
|
||||
{
|
||||
! char file[40];
|
||||
int fd;
|
||||
int input;
|
||||
|
||||
! sprintf(file, "ff.XXXXXXXX");
|
||||
! if ((fd = mkstemp(file)) < 0) {
|
||||
perror("open temp file");
|
||||
(void) unlink(file);
|
||||
return(-1);
|
||||
--- wily/text2.c.orig Tue May 11 13:43:17 1999
|
||||
+++ wily/text2.c Tue May 11 13:44:20 1999
|
||||
@@ -136,11 +136,12 @@
|
||||
int
|
||||
text_fd(Text *t, Range sel)
|
||||
{
|
||||
- char *file = tmpnam(0);
|
||||
+ char file[40];
|
||||
int fd;
|
||||
int input;
|
||||
|
||||
- if ((fd = open(file, O_WRONLY|O_CREAT, 0600)) < 0) {
|
||||
+ sprintf(file, "ff.XXXXXXXX");
|
||||
+ if ((fd = mkstemp(file)) < 0) {
|
||||
perror("open temp file");
|
||||
(void) unlink(file);
|
||||
return(-1);
|
||||
|
||||
@ -1,46 +1,32 @@
|
||||
*** libmsg/connect.c.orig Sat May 16 22:55:34 1998
|
||||
--- libmsg/connect.c Sat May 16 23:00:59 1998
|
||||
***************
|
||||
*** 106,116 ****
|
||||
|
||||
/* bind it to a unix-domain at a temporary address */
|
||||
addr.sun_family = AF_UNIX;
|
||||
! tmpnam(addr.sun_path);
|
||||
path = strdup(addr.sun_path);
|
||||
len = strlen(addr.sun_path);
|
||||
|
||||
if (bind(s, (struct sockaddr *) &addr, sizeof addr) < 0){
|
||||
perror("bind");
|
||||
return -1;
|
||||
}
|
||||
--- 106,118 ----
|
||||
|
||||
/* bind it to a unix-domain at a temporary address */
|
||||
addr.sun_family = AF_UNIX;
|
||||
! sprintf(addr.sun_path, "%s/xx.XXXXXXXX", P_tmpdir);
|
||||
! close(mkstemp(addr.sun_path));
|
||||
path = strdup(addr.sun_path);
|
||||
len = strlen(addr.sun_path);
|
||||
|
||||
if (bind(s, (struct sockaddr *) &addr, sizeof addr) < 0){
|
||||
+ unlink(path);
|
||||
perror("bind");
|
||||
return -1;
|
||||
}
|
||||
***************
|
||||
*** 119,128 ****
|
||||
--- 121,134 ----
|
||||
|
||||
fd = wilyfifotalk(); /* fifo to wily */
|
||||
if(fd<0)
|
||||
+ {
|
||||
+ unlink(path);
|
||||
return -1;
|
||||
+ }
|
||||
nwritten = write(fd, addr.sun_path, len);
|
||||
close(fd);
|
||||
if(nwritten !=len){
|
||||
+ unlink(path);
|
||||
perror("write to wily");
|
||||
return -1;
|
||||
}
|
||||
--- libmsg/connect.c.orig Tue May 11 13:45:26 1999
|
||||
+++ libmsg/connect.c Tue May 11 13:48:06 1999
|
||||
@@ -106,11 +106,13 @@
|
||||
|
||||
/* bind it to a unix-domain at a temporary address */
|
||||
addr.sun_family = AF_UNIX;
|
||||
- tmpnam(addr.sun_path);
|
||||
+ sprintf(addr.sun_path, "%s/xx.XXXXXXXX", P_tmpdir);
|
||||
+ close(mkstemp(addr.sun_path));
|
||||
path = strdup(addr.sun_path);
|
||||
len = strlen(addr.sun_path);
|
||||
|
||||
if (bind(s, (struct sockaddr *) &addr, sizeof addr) < 0){
|
||||
+ unlink(path);
|
||||
perror("bind");
|
||||
return -1;
|
||||
}
|
||||
@@ -119,10 +121,14 @@
|
||||
|
||||
fd = wilyfifotalk(); /* fifo to wily */
|
||||
if(fd<0)
|
||||
+ {
|
||||
+ unlink(path);
|
||||
return -1;
|
||||
+ }
|
||||
nwritten = write(fd, addr.sun_path, len);
|
||||
close(fd);
|
||||
if(nwritten !=len){
|
||||
+ unlink(path);
|
||||
perror("write to wily");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -3,17 +3,33 @@ share/doc/wily/index.html
|
||||
share/doc/wily/intro.html
|
||||
share/doc/wily/download.html
|
||||
share/doc/wily/credits.html
|
||||
share/doc/wily/FAQ.txt
|
||||
share/doc/wily/FAQ.html
|
||||
share/doc/wily/onepage.html
|
||||
share/doc/wily/user.html
|
||||
share/doc/wily/idioms.html
|
||||
share/doc/wily/C.html
|
||||
share/doc/wily/python.html
|
||||
share/doc/wily/perl.txt
|
||||
share/doc/wily/hack.html
|
||||
share/doc/wily/changes.txt
|
||||
share/doc/wily/AcmeVsWily.html
|
||||
share/doc/wily/Tcl.html
|
||||
share/doc/wily/pythonpaper.html
|
||||
share/doc/wily/winmanager.html
|
||||
share/doc/wily/auug.html
|
||||
share/doc/wily/one.html
|
||||
share/doc/wily/example.gif
|
||||
share/doc/wily/thumb.gif
|
||||
share/doc/wily/cartoon.gif
|
||||
share/doc/wily/FAQ.txt
|
||||
share/doc/wily/Tcl.txt
|
||||
share/doc/wily/changes.txt
|
||||
share/doc/wily/perl.txt
|
||||
share/doc/wily/Credits
|
||||
share/doc/wily/fonts
|
||||
share/doc/wily/mouse
|
||||
share/doc/wily/tute/findword
|
||||
share/doc/wily/tute/script
|
||||
share/doc/wily/tute/start
|
||||
share/doc/wily/tute/hello.c
|
||||
share/doc/wily/tute/send_to_gary
|
||||
@dirrm share/doc/wily/tute
|
||||
@dirrm share/doc/wily
|
||||
|
||||
Loading…
Reference in New Issue
Block a user