From owner-svn-ports-head@FreeBSD.ORG Sat Apr 20 05:15:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 11019879; Sat, 20 Apr 2013 05:15:07 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DAD00EF4; Sat, 20 Apr 2013 05:15:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3K5F6rb099538; Sat, 20 Apr 2013 05:15:06 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3K5F6NX099526; Sat, 20 Apr 2013 05:15:06 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201304200515.r3K5F6NX099526@svn.freebsd.org> From: Alexey Dokuchaev Date: Sat, 20 Apr 2013 05:15:06 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2013 05:15:07 -0000 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 -# +# Created by: David O'Brien # $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 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); + } +