upgrade to screen 3.9.9
- DESTDIR, "CFLAGS & LDFLAGS" patches integrated
This commit is contained in:
brad
parent
be8baa25f5
commit
f92cc3421a
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.34 2001/05/06 00:46:50 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.35 2001/07/28 04:00:36 brad Exp $
|
||||
|
||||
COMMENT= "multi-screen window manager"
|
||||
|
||||
VERSION= 3.9.8
|
||||
VERSION= 3.9.9
|
||||
DISTNAME= screen-${VERSION}
|
||||
CATEGORIES= misc
|
||||
NEED_VERSION= 1.384
|
||||
NEED_VERSION= 1.413
|
||||
MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/
|
||||
|
||||
HOMEPAGE= http://www.gnu.org/software/screen/
|
||||
@ -27,6 +27,6 @@ ALL_TARGET= screen screen.info
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
|
||||
${PREFIX}/share/examples/screen/screenrc-sample
|
||||
${PREFIX}/share/examples/screen/screenrc-sample
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (screen-3.9.8.tar.gz) = 8ddfebe32c2d45410ce89ea9779bb1cf
|
||||
RMD160 (screen-3.9.8.tar.gz) = 31605acadc4817583f0b46c2d278c484f56846ff
|
||||
SHA1 (screen-3.9.8.tar.gz) = 9f0c93d3f1f84e4d23cd58c9c62a8fb525f71f6c
|
||||
MD5 (screen-3.9.9.tar.gz) = 9a8b1d6c7438c64b884c4f7d7662afdc
|
||||
RMD160 (screen-3.9.9.tar.gz) = 7706eb88c95eaa92cbfbd7f840f9206696eddcbd
|
||||
SHA1 (screen-3.9.9.tar.gz) = e9336f92fc323ebababc671a381c8dfd94d8ccae
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
--- Makefile.in.orig Fri Sep 1 12:07:26 2000
|
||||
+++ Makefile.in Tue Sep 5 20:11:29 2000
|
||||
@@ -7,6 +7,8 @@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
+DESTDIR =
|
||||
+
|
||||
# Where to install screen.
|
||||
|
||||
prefix = @prefix@
|
||||
@@ -21,9 +23,9 @@
|
||||
ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
|
||||
|
||||
CC = @CC@
|
||||
-CFLAGS = -O
|
||||
+CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
-LDFLAGS =
|
||||
+LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
|
||||
CPP=@CPP@
|
||||
@@ -68,14 +70,14 @@
|
||||
$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
|
||||
|
||||
install_bin: .version screen
|
||||
- -if [ -f $(bindir)/$(SCREEN) ] && [ ! -f $(bindir)/$(SCREEN).old ]; \
|
||||
- then mv $(bindir)/$(SCREEN) $(bindir)/$(SCREEN).old; fi
|
||||
- $(INSTALL_PROGRAM) screen $(bindir)/$(SCREEN)
|
||||
- -chown root $(bindir)/$(SCREEN) && chmod 4755 $(bindir)/$(SCREEN)
|
||||
+ -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
|
||||
+ then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
|
||||
+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
+ -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
# This doesn't work if $(bindir)/screen is a symlink
|
||||
- -if [ -f $(bindir)/screen ] && [ ! -f $(bindir)/screen.old ]; then mv $(bindir)/screen $(bindir)/screen.old; fi
|
||||
- rm -f $(bindir)/screen
|
||||
- ln -s $(SCREEN) $(bindir)/screen
|
||||
+ -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
|
||||
+ rm -f $(DESTDIR)$(bindir)/screen
|
||||
+ cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen
|
||||
|
||||
###############################################################################
|
||||
install: installdirs install_bin
|
||||
@@ -91,14 +93,14 @@
|
||||
|
||||
installdirs:
|
||||
# Path leading to ETCSCREENRC and Socketdirectory not checked.
|
||||
- $(srcdir)/etc/mkinstalldirs $(bindir)
|
||||
+ $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir)
|
||||
cd doc ; $(MAKE) installdirs
|
||||
|
||||
uninstall: .version
|
||||
- rm -f $(bindir)/$(SCREEN)
|
||||
- rm -f $(bindir)/screen
|
||||
- -mv $(bindir)/screen.old $(bindir)/screen
|
||||
- rm -f $(ETCSCREENRC)
|
||||
+ rm -f $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
+ rm -f $(DESTDIR)$(bindir)/screen
|
||||
+ -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen
|
||||
+ rm -f $(DESTDIR)$(ETCSCREENRC)
|
||||
cd doc; $(MAKE) uninstall
|
||||
|
||||
shadow:
|
||||
@ -1,51 +1,11 @@
|
||||
--- doc/Makefile.in.orig Fri Sep 1 14:48:22 2000
|
||||
+++ doc/Makefile.in Fri Sep 1 14:50:30 2000
|
||||
@@ -3,13 +3,15 @@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
+DESTDIR =
|
||||
+
|
||||
prefix = @prefix@
|
||||
mandir = @mandir@
|
||||
infodir = @infodir@
|
||||
--- doc/Makefile.in.orig Fri Jul 27 23:07:30 2001
|
||||
+++ doc/Makefile.in Fri Jul 27 23:07:45 2001
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
-MAKEINFO = makeinfo
|
||||
+MAKEINFO = makeinfo --no-split
|
||||
TEXI2DVI = texi2dvi
|
||||
TEXI2PDF = texi2pdf
|
||||
|
||||
SHELL = /bin/sh
|
||||
@@ -20,25 +22,23 @@
|
||||
$(TEXI2DVI) $(srcdir)/screen.texinfo
|
||||
|
||||
info screen.info: screen.texinfo
|
||||
+ @rm -f screen.info*
|
||||
$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
|
||||
|
||||
install: installdirs
|
||||
- $(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1
|
||||
+ $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
|
||||
-$(MAKE) screen.info
|
||||
-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
|
||||
if test -f $$d/screen.info; then \
|
||||
- for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \
|
||||
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
|
||||
- install-info --info-dir=$(infodir) $$d/screen.info; \
|
||||
- else true; fi; \
|
||||
+ for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \
|
||||
fi
|
||||
|
||||
uninstall:
|
||||
- rm -f $(mandir)/man1/screen.1
|
||||
- rm -f $(infodir)/screen.info*
|
||||
+ rm -f $(DESTDIR)$(mandir)/man1/screen.1
|
||||
+ rm -f $(DESTDIR)$(infodir)/screen.info*
|
||||
|
||||
installdirs:
|
||||
- $(srcdir)/../etc/mkinstalldirs $(mandir)/man1 $(infodir)
|
||||
+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir)
|
||||
|
||||
mostlyclean:
|
||||
-rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- pty.c.orig Fri Aug 27 06:00:12 1999
|
||||
+++ pty.c Tue Nov 9 22:49:52 1999
|
||||
--- pty.c.orig Sat Apr 28 09:26:43 2001
|
||||
+++ pty.c Fri Jul 27 23:11:16 2001
|
||||
@@ -32,6 +32,23 @@
|
||||
#include "config.h"
|
||||
#include "screen.h"
|
||||
@ -24,7 +24,7 @@
|
||||
#ifndef sun
|
||||
# include <sys/ioctl.h>
|
||||
#endif
|
||||
@@ -315,25 +332,25 @@
|
||||
@@ -316,25 +333,25 @@
|
||||
OpenPTY(ttyn)
|
||||
char **ttyn;
|
||||
{
|
||||
@ -63,7 +63,7 @@
|
||||
if (eff_uid && access(TtyName, R_OK | W_OK))
|
||||
{
|
||||
close(f);
|
||||
@@ -356,9 +373,11 @@
|
||||
@@ -357,9 +374,11 @@
|
||||
#endif
|
||||
initmaster(f);
|
||||
*ttyn = TtyName;
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- teln.c.orig Fri Dec 31 17:53:35 1999
|
||||
+++ teln.c Fri Dec 31 17:53:54 1999
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <sys/socket.h>
|
||||
#include <fcntl.h>
|
||||
#include <netdb.h>
|
||||
+#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include "config.h"
|
||||
@ -1,11 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.14 2001/05/06 00:46:51 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.15 2001/07/28 04:00:36 brad Exp $
|
||||
bin/screen
|
||||
@mode 4755
|
||||
bin/screen-${VERSION}
|
||||
@mode
|
||||
man/man1/screen.1
|
||||
@unexec install-info --delete %D/info/screen.info %D/info/dir
|
||||
@unexec install-info --delete --info-dir=%D/info %D/info/screen.info
|
||||
info/screen.info
|
||||
@exec install-info %D/info/screen.info %D/info/dir
|
||||
@exec install-info --info-dir=%D/info %D/info/screen.info
|
||||
man/man1/screen.1
|
||||
share/examples/screen/screenrc-sample
|
||||
@dirrm share/examples/screen
|
||||
|
||||
Loading…
Reference in New Issue
Block a user