summaryrefslogtreecommitdiff
path: root/comms/minicom
diff options
context:
space:
mode:
authorJohan van Selst <johans@FreeBSD.org>2012-06-16 12:29:15 +0000
committerJohan van Selst <johans@FreeBSD.org>2012-06-16 12:29:15 +0000
commiteff7f58be05a8bdc4a7364a69d9c4c9b485781d9 (patch)
tree131ea54db19ff7b2d12442cfc0f9d336b8bba493 /comms/minicom
parentDo a configtest before performing a graceful restart (diff)
- Update minicom to 2.6.1 (bugfix release)
- Convert to new options framework - Remove patch file that is no longer needed
Notes
Notes: svn path=/head/; revision=299399
Diffstat (limited to 'comms/minicom')
-rw-r--r--comms/minicom/Makefile36
-rw-r--r--comms/minicom/distinfo4
-rw-r--r--comms/minicom/files/patch-src-main.c11
3 files changed, 21 insertions, 30 deletions
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 9afb465d4be5..2b3961263d35 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -7,28 +7,16 @@
#
PORTNAME= minicom
-PORTVERSION= 2.6
+PORTVERSION= 2.6.1
CATEGORIES= comms
-MASTER_SITES= http://alioth.debian.org/frs/download.php/3689/
+MASTER_SITES= http://alioth.debian.org/frs/download.php/3700/
MAINTAINER= johans@FreeBSD.org
COMMENT= An MS-DOS Telix serial communication program "workalike"
-OPTIONS= LRZSZ "Install X/Y/ZMODEM protocol handlers" on
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_LRZSZ)
-RUN_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz
-.endif
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
-.endif
+OPTIONS_DEFINE= LRZSZ
+OPTIONS_DEFAULT=LRZSZ
+LRZSZ_DESC= Install X/Y/ZMODEM protocol handlers
USE_ICONV= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -43,6 +31,20 @@ MAKE_ARGS+= LIBS+="-liconv -lcurses"
MAN1= minicom.1 runscript.1 ascii-xfr.1 xminicom.1
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLRZSZ}
+RUN_DEPENDS+= lrz:${PORTSDIR}/comms/lrzsz
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 800045
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index da90a5537cac..0fa7de98528e 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minicom-2.6.tar.gz) = ea5fe79c22dcb115cf5ed287b0e7a69e069bedd39889aa89b1a23f64f53fceb3
-SIZE (minicom-2.6.tar.gz) = 830255
+SHA256 (minicom-2.6.1.tar.gz) = a6e7bf533c3796f3a67a7d109f328d46497c687ed13885bd1be4ce0548fc4f56
+SIZE (minicom-2.6.1.tar.gz) = 830485
diff --git a/comms/minicom/files/patch-src-main.c b/comms/minicom/files/patch-src-main.c
deleted file mode 100644
index 2dd01963c443..000000000000
--- a/comms/minicom/files/patch-src-main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c.orig 2011-09-30 09:57:00.000000000 +0200
-+++ src/main.c 2011-12-28 16:07:59.000000000 +0100
-@@ -112,7 +112,7 @@ char *esc_key(void)
- static void get_alrm(int dummy)
- {
- (void)dummy;
-- errno = ETIME;
-+ errno = ETIMEDOUT;
- longjmp(albuf, 1);
- }
-