Index: head/sysutils/screen/Makefile =================================================================== --- head/sysutils/screen/Makefile (revision 401773) +++ head/sysutils/screen/Makefile (revision 401774) @@ -1,108 +1,106 @@ # Created by: Andrey Chernov # $FreeBSD$ PORTNAME= screen PORTVERSION= 4.3.1 PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \ ftp://ftp.gnu.org/gnu/screen/ \ ftp://gnu.mirror.iweb.com/screen/ \ http://gnu.mirror.iweb.com/screen/ \ http://mirror.sdunix.com/gnu/ \ ftp://mirrors.kernel.org/gnu/screen/ \ http://komquats.com/distfiles/ \ http://people.freebsd.org/~cy/distfiles/ \ GNU MAINTAINER= cy@FreeBSD.org COMMENT= Multi-screen window manager LICENSE= GPLv3 OPTIONS_DEFINE= INFO MAN NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC OPTIONS_DEFAULT= INFO MAN NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC OPTIONS_SINGLE= IPC OPTIONS_SINGLE_IPC= SOCKETS NAMED_PIPES INFO_DESC= Build and install info documentation MAN_DESC= Build and install man pages NETHACK_DESC= Enable nethack-style messages XTERM_256_DESC= Enable support for 256 colour xterm SHOWENC_DESC= Show encoding on the status line SOCKETS_DESC= Use new (4.2.1+) sockets for IPC (default) NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override) SYSTEM_SCREENRC_DESC= Install system screenrc with helpful status line OPTIONS_SUB= -MAKE_JOBS_UNSAFE= yes - USES= gmake cpe CPE_VENDOR= gnu .include GNU_CONFIGURE= yes .if ${PORT_OPTIONS:MMAN} MAKE_ARGS+= WITH_MAN=1 PLIST_SUB+= MAN="" .else PLIST_SUB+= MAN="@comment" .endif .if ${PORT_OPTIONS:MINFO} .if !exists(/usr/bin/install-info) RUN_DEPENDS+= install-info:${PORTSDIR}/print/texinfo .endif INFO= screen MAKE_ARGS+= WITH_INFO=1 .endif # Enables support for 256 colour xterm. Note that you may need to # set up a custom termcap entry or .screenrc which modifies termcap # to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm # .if ${PORT_OPTIONS:MXTERM_256} CFLAGS+= -DCOLORS256 .endif .if ! ${PORT_OPTIONS:MNETHACK} CFLAGS+= -DNONETHACK .endif # show encoding on the status line via option "showenc" .if ${PORT_OPTIONS:MSHOWENC} EXTRA_PATCHES+= ${FILESDIR}/opt-showencoding .endif post-patch: @${RM} ${WRKSRC}/doc/screen.info* @${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure # Bug 191029: Users can choose whether to use sockets or named pipes. # Choose sockets if you don't know what the difference is. # Choose named pipes if your environment is heterogeneous, # using both screen 4.0.3 and 4.2.1. # Bug 191017 post-configure-NAMED_PIPES-on: @${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h @${ECHO_CMD} User selected named pipes override set. ETCDIR?= ${PREFIX}/etc post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1 ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \ ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2 @${MKDIR} ${STAGEDIR}${ETCDIR} .if ${PORT_OPTIONS:MSYSTEM_SCREENRC} ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \ ${STAGEDIR}${ETCDIR}/screenrc.sample .else ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ ${STAGEDIR}${ETCDIR}/screenrc.sample .endif .include Index: head/sysutils/screen/files/patch-Makefile.in =================================================================== --- head/sysutils/screen/files/patch-Makefile.in (revision 401773) +++ head/sysutils/screen/files/patch-Makefile.in (revision 401774) @@ -1,34 +1,48 @@ ---- Makefile.in.orig 2014-04-26 03:58:35.000000000 -0700 -+++ Makefile.in 2014-04-29 18:55:12.050906602 -0700 -@@ -83,19 +83,13 @@ +--- Makefile.in.orig 2015-06-28 21:22:55 UTC ++++ Makefile.in +@@ -83,19 +83,13 @@ screen: $(OFILES) $(OPTIONS) $(CFLAGS) $< install_bin: .version 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 $(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 -f -s $(SCREEN) screen) + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen + -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) ############################################################################### install: installdirs install_bin - cd doc ; $(MAKE) install + cd doc ; $(MAKE) $(MAKE_ARGS) install -if [ -d /usr/lib/terminfo ]; then \ PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ chmod 644 /usr/lib/terminfo/s/screen*; \ -@@ -108,7 +102,7 @@ +@@ -108,7 +102,7 @@ install: installdirs install_bin installdirs: # Path leading to ETCSCREENRC and Socketdirectory not checked. $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) - cd doc ; $(MAKE) installdirs + cd doc ; $(MAKE) $(MAKE_ARGS) installdirs uninstall: .version rm -f $(DESTDIR)$(bindir)/$(SCREEN) +@@ -350,7 +344,10 @@ layout.o: layout.h viewport.h canvas.h l + viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ + comm.h layer.h term.h image.h display.h window.h extern.h \ + braille.h +-list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h +-list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h +-list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h ++list_generic.o: list_generic.h list_generic.c layer.h screen.h os.h osdef.h ansi.h acls.h \ ++ comm.h layer.h term.h image.h display.h window.h ++list_display.o: list_generic.h list_display.c layer.h screen.h os.h osdef.h ansi.h acls.h \ ++ comm.h layer.h term.h image.h display.h window.h ++list_window.o: list_generic.h list_window.c window.h layer.h screen.h os.h osdef.h ansi.h acls.h \ ++ comm.h layer.h term.h image.h display.h window.h +