Date: Sat, 20 Apr 2013 05:15:06 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316126 - in head/comms/zmtx-zmrx: . files Message-ID: <201304200515.r3K5F6NX099526@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Apr 20 05:15:05 2013 New Revision: 316126 URL: http://svnweb.freebsd.org/changeset/ports/316126 Log: - Do not call cleanup() in usage() (read: before fd_init()). Doing so can mangle your terminal badly (in fact, it does very noticeably on Linux) - While here, trim Makefile header, improve COMMENT, use MANPREFIX when installing manual pages, sort knobs, et cetera Submitted by: Andy Xie (andy.xie.sz@gmail.com) Approved by: delphij (maintainer) Feature safe: yes Modified: head/comms/zmtx-zmrx/Makefile head/comms/zmtx-zmrx/files/patch-zmrx.c head/comms/zmtx-zmrx/files/patch-zmtx.c Modified: head/comms/zmtx-zmrx/Makefile ============================================================================== --- head/comms/zmtx-zmrx/Makefile Sat Apr 20 00:29:32 2013 (r316125) +++ head/comms/zmtx-zmrx/Makefile Sat Apr 20 05:15:05 2013 (r316126) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: zmtx-zmrx -# Date created: 29 July 1996 -# Whom: David O'Brien <obrien@cs.ucdavis.edu> -# +# Created by: David O'Brien <obrien@cs.ucdavis.edu> # $FreeBSD$ -# PORTNAME= zmtx-zmrx PORTVERSION= 1.02 @@ -12,24 +7,26 @@ CATEGORIES= comms MASTER_SITES= ftp://ftp.netsw.org/net/modem/protocols/zmodem/zmtx-zmrx/ MAINTAINER= delphij@FreeBSD.org -COMMENT= Receive/Send files via ZMODEM protocol. (unrestrictive) +COMMENT= Send and receive files via ZMODEM protocol (unrestrictive) + +USE_CSTD= gnu89 -WRKSRC= ${WRKDIR}/${PORTNAME} MAKEFILE= makefile MAKE_JOBS_SAFE= yes +WRKSRC= ${WRKDIR}/${PORTNAME} + MAN1= zmrx.1 zmtx.1 PLIST_FILES= bin/zmrx bin/zmtx -USE_CSTD= gnu89 do-install: .for f in zmrx zmtx ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${MANPREFIX}/man/man1 .endfor post-install: - @${ECHO_MSG} "" + @${ECHO_MSG} @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} "" + @${ECHO_MSG} .include <bsd.port.mk> Modified: head/comms/zmtx-zmrx/files/patch-zmrx.c ============================================================================== --- head/comms/zmtx-zmrx/files/patch-zmrx.c Sat Apr 20 00:29:32 2013 (r316125) +++ head/comms/zmtx-zmrx/files/patch-zmrx.c Sat Apr 20 05:15:05 2013 (r316126) @@ -35,3 +35,12 @@ } } +@@ -386,8 +387,6 @@ + printf(" -q quiet\n"); + printf(" (only one of -n -c or -p may be specified)\n"); + +- cleanup(); +- + exit(1); + } + Modified: head/comms/zmtx-zmrx/files/patch-zmtx.c ============================================================================== --- head/comms/zmtx-zmrx/files/patch-zmtx.c Sat Apr 20 00:29:32 2013 (r316125) +++ head/comms/zmtx-zmrx/files/patch-zmtx.c Sat Apr 20 05:15:05 2013 (r316126) @@ -35,3 +35,12 @@ } } while (type != ZRPOS); +@@ -441,8 +442,6 @@ + printf(" -v verbose output\n"); + printf(" (only one of -n -c or -p may be specified)\n"); + +- cleanup(); +- + exit(1); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304200515.r3K5F6NX099526>