aboutsummaryrefslogtreecommitdiffstats
path: root/comms
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2013-04-20 13:15:05 +0800
committerdanfe <danfe@FreeBSD.org>2013-04-20 13:15:05 +0800
commit255048ffcbff9efe165a1bc31b179ba6fc76c7bd (patch)
tree6c75b8297aa45485b1c00bc349ed87f8c704b785 /comms
parent4a21f317972f889a6ff207b97a0a8598e7cd72c4 (diff)
downloadfreebsd-ports-gnome-255048ffcbff9efe165a1bc31b179ba6fc76c7bd.tar.gz
freebsd-ports-gnome-255048ffcbff9efe165a1bc31b179ba6fc76c7bd.tar.zst
freebsd-ports-gnome-255048ffcbff9efe165a1bc31b179ba6fc76c7bd.zip
- 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
Diffstat (limited to 'comms')
-rw-r--r--comms/zmtx-zmrx/Makefile21
-rw-r--r--comms/zmtx-zmrx/files/patch-zmrx.c9
-rw-r--r--comms/zmtx-zmrx/files/patch-zmtx.c9
3 files changed, 27 insertions, 12 deletions
diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile
index b659f22a4321..09bc7f58cf10 100644
--- a/comms/zmtx-zmrx/Makefile
+++ b/comms/zmtx-zmrx/Makefile
@@ -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>
diff --git a/comms/zmtx-zmrx/files/patch-zmrx.c b/comms/zmtx-zmrx/files/patch-zmrx.c
index 392c88537979..68f2df57ab08 100644
--- a/comms/zmtx-zmrx/files/patch-zmrx.c
+++ b/comms/zmtx-zmrx/files/patch-zmrx.c
@@ -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);
+ }
+
diff --git a/comms/zmtx-zmrx/files/patch-zmtx.c b/comms/zmtx-zmrx/files/patch-zmtx.c
index 83e297641cef..920b478974cf 100644
--- a/comms/zmtx-zmrx/files/patch-zmtx.c
+++ b/comms/zmtx-zmrx/files/patch-zmtx.c
@@ -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);
+ }
+