Update to 2.1.

This commit is contained in:
Anders Nordby 2003-07-22 22:34:12 +00:00
parent 97e800949f
commit 4d3f5f625f
6 changed files with 106 additions and 119 deletions

View file

@ -7,11 +7,10 @@
#
PORTNAME= minicom
PORTVERSION= 2.00.0
PORTVERSION= 2.1
CATEGORIES= comms
MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \
http://atreides.freenix.no/~anders/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= anders@FreeBSD.org
COMMENT= An MS-DOS Telix serial communication program "workalike"
@ -20,6 +19,7 @@ RUN_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz \
lsz:${PORTSDIR}/comms/lrzsz
WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//}
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-dfl-baud=57600 \
--sysconfdir=${PREFIX}/etc/minicom \
@ -30,18 +30,12 @@ CONFIGURE_ARGS+= --enable-dfl-port=/dev/cuaa0
CONFIGURE_ARGS+= --enable-dfl-port=/dev/modem
.endif
MAN1= minicom.1 runscript.1 ascii-xfr.1
MAN1= minicom.1 runscript.1 ascii-xfr.1 xminicom.1
post-patch:
${MV} ${WRKSRC}/src/rwconf.c ${WRKSRC}/src/rwconf.c.pre_sed
${SED} -e "s:/usr/local/bin/:${LOCALBASE}/bin/:g" \
-e "s:/sz:/lsz:g" \
-e "s:/sb:/lsb:g" \
-e "s:/sx:/lsx:g" \
-e "s:/rz:/lrz:g" \
-e "s:/rb:/lrb:g" \
-e "s:/rx:/lrx:g" \
< ${WRKSRC}/src/rwconf.c.pre_sed > ${WRKSRC}/src/rwconf.c
${REINPLACE_CMD} -e "s@/usr/local/bin/@${LOCALBASE}/bin/@; \
s@/sz@/lsz@;s@/sb@/lsb@;s@/sx@/lsx@;s@/rz@/lrz@; \
s@/rb@/lrb@;s@/rx@/lrx@" ${WRKSRC}/src/rwconf.c
pre-configure:
.if !defined(BATCH)

View file

@ -1 +1 @@
MD5 (minicom-2.00.0.src.tar.gz) = cfae090b087b67ed04e124ab5c658e70
MD5 (minicom-2.1.tar.gz) = 1c8f3b247c38fb16c3c2170df9fc102a

View file

@ -1,24 +1,15 @@
--- lib/Makefile.in.orig Mon Oct 1 16:21:53 2001
+++ lib/Makefile.in Sun Jan 27 19:41:15 2002
@@ -73,7 +73,7 @@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
--- lib/Makefile.in.orig Wed Jul 23 04:04:52 2003
+++ lib/Makefile.in Wed Jul 23 04:05:33 2003
@@ -76,7 +76,7 @@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
KEYSERV = @KEYSERV@
LIBICONV = @LIBICONV@
-LIBOBJS = @LIBOBJS@
+LIBOBJS = @LIBOBJS@ getopt.o getopt_long.o
LIBPORT_GETOPT_LONG_DEP = @LIBPORT_GETOPT_LONG_DEP@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -93,7 +93,7 @@
libport_a_SOURCES =
-libport_a_LIBADD = @LIBOBJS@
+libport_a_LIBADD = @LIBOBJS@ getopt.o getopt_long.o
AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0
mkinstalldirs = $(SHELL) $(top_srcdir)/aux/mkinstalldirs
@@ -106,7 +106,7 @@
@@ -109,7 +109,7 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@

View file

@ -1,14 +1,14 @@
--- src/Makefile.in.orig Sun Jan 27 19:22:40 2002
+++ src/Makefile.in Sun Jan 27 19:23:19 2002
@@ -108,9 +108,9 @@
--- src/Makefile.in.orig Sun May 18 11:46:03 2003
+++ src/Makefile.in Wed Jul 23 04:12:27 2003
@@ -119,9 +119,9 @@
AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0
CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib
-minicom_LDADD = @INTLLIBS@
+minicom_LDADD = @INTLLIBS@ ../lib/getopt.o ../lib/getopt_long.o
-minicom_LDADD = @INTLLIBS@ $(MINICOM_LIBPORT)
+minicom_LDADD = @INTLLIBS@ $(MINICOM_LIBPORT) ../lib/getopt.o ../lib/getopt_long.o
-runscript_LDADD = @INTLLIBS@
+runscript_LDADD = @INTLLIBS@ ../lib/getopt.o ../lib/getopt_long.o
LDADD = $(top_builddir)/lib/libport.a
CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib
EXTRA_DIST = functions.c xminicom
mkinstalldirs = $(SHELL) $(top_srcdir)/aux/mkinstalldirs

View file

@ -1,35 +1,37 @@
--- src/sysdep1.c.orig Sat Jun 24 18:01:29 2000
+++ src/sysdep1.c Sun Jan 27 19:15:37 2002
@@ -71,12 +71,12 @@
void m_setrts(fd)
int fd;
{
--- src/sysdep1.c.orig Wed Jul 23 04:06:53 2003
+++ src/sysdep1.c Wed Jul 23 04:10:29 2003
@@ -82,13 +82,13 @@
if (portfd_is_socket)
return;
#endif
-#if defined(TIOCM_RTS) && defined(TIOCMODG)
+#if defined(TIOCM_RTS) && defined(TIOCMGET)
int mcs=0;
{
int mcs=0;
- ioctl(fd, TIOCMODG, &mcs);
+ ioctl(fd, TIOCMGET, &mcs);
mcs |= TIOCM_RTS;
- ioctl(fd, TIOCMODS, &mcs);
+ ioctl(fd, TIOCMSET, &mcs);
- ioctl(fd, TIOCMODG, &mcs);
+ ioctl(fd, TIOCMGET, &mcs);
mcs |= TIOCM_RTS;
- ioctl(fd, TIOCMODS, &mcs);
+ ioctl(fd, TIOCMSET, &mcs);
}
#endif
#ifdef _COHERENT
ioctl(fd, TIOCSRTS, 0);
@@ -182,10 +182,10 @@
int m_getdcd(fd)
int fd;
{
@@ -215,11 +215,11 @@
return portfd_is_connected;
}
#endif
-#ifdef TIOCMODG
+#ifdef TIOCMGET
int mcs=0;
- ioctl(fd, TIOCMODG, &mcs);
+ ioctl(fd, TIOCMGET, &mcs);
return(mcs & TIOCM_CAR ? 1 : 0);
{
int mcs=0;
- ioctl(fd, TIOCMODG, &mcs);
+ ioctl(fd, TIOCMGET, &mcs);
return(mcs & TIOCM_CAR ? 1 : 0);
}
#else
(void)fd;
@@ -223,8 +223,8 @@
@@ -262,8 +262,8 @@
ioctl(fd, TIOCLGET, &lsw);
# endif
#endif
@ -40,7 +42,7 @@
#endif
}
@@ -245,8 +245,8 @@
@@ -288,8 +288,8 @@
ioctl(fd, TIOCLSET, &lsw);
# endif
#endif

View file

@ -3,12 +3,12 @@ bin/xminicom
bin/runscript
bin/ascii-xfr
etc/minicom/minicom.users
share/locale/cs_CZ/LC_MESSAGES/minicom.mo
share/locale/cs/LC_MESSAGES/minicom.mo
share/locale/es/LC_MESSAGES/minicom.mo
share/locale/fi_FI/LC_MESSAGES/minicom.mo
share/locale/fi/LC_MESSAGES/minicom.mo
share/locale/fr/LC_MESSAGES/minicom.mo
share/locale/hu/LC_MESSAGES/minicom.mo
share/locale/ja/LC_MESSAGES/minicom.mo
share/locale/ja_JP.SJIS/LC_MESSAGES/minicom.mo
share/locale/pl/LC_MESSAGES/minicom.mo
share/locale/pt_BR/LC_MESSAGES/minicom.mo
share/locale/ru/LC_MESSAGES/minicom.mo
@ -17,57 +17,57 @@ share/locale/ru/LC_MESSAGES/minicom.mo
@unexec rmdir %D/share/locale 2>/dev/null || true
@exec /usr/sbin/chown uucp %D/etc/minicom
@unexec rmdir %D/etc/minicom 2>/dev/null || true
%%PORTDOCS%%share/doc/minicom/AUTHORS
%%PORTDOCS%%share/doc/minicom/COPYING
%%PORTDOCS%%share/doc/minicom/ChangeLog
%%PORTDOCS%%share/doc/minicom/doc/Announce-1.78
%%PORTDOCS%%share/doc/minicom/doc/Announce-1.82
%%PORTDOCS%%share/doc/minicom/doc/Announce-1.82.1
%%PORTDOCS%%share/doc/minicom/doc/Announce-1.83
%%PORTDOCS%%share/doc/minicom/doc/COMPATABILITY.lrzsz
%%PORTDOCS%%share/doc/minicom/doc/ChangeLog.old
%%PORTDOCS%%share/doc/minicom/doc/HistSearch
%%PORTDOCS%%share/doc/minicom/doc/Locales
%%PORTDOCS%%share/doc/minicom/doc/Macros
%%PORTDOCS%%share/doc/minicom/doc/QuickStart.modemu
%%PORTDOCS%%share/doc/minicom/doc/README.lrzsz
%%PORTDOCS%%share/doc/minicom/doc/RedHat
%%PORTDOCS%%share/doc/minicom/doc/TODO.lrzsz
%%PORTDOCS%%share/doc/minicom/doc/Todo
%%PORTDOCS%%share/doc/minicom/doc/Todo.175
%%PORTDOCS%%share/doc/minicom/doc/Todo.Irix.dif
%%PORTDOCS%%share/doc/minicom/doc/Todo.emacskey.dif
%%PORTDOCS%%share/doc/minicom/doc/Todo.fsel
%%PORTDOCS%%share/doc/minicom/doc/copyright.modemu
%%PORTDOCS%%share/doc/minicom/doc/fselector.txt
%%PORTDOCS%%share/doc/minicom/doc/japanese
%%PORTDOCS%%share/doc/minicom/doc/minicom.FAQ
%%PORTDOCS%%share/doc/minicom/doc/minicom.users
%%PORTDOCS%%share/doc/minicom/doc/minirc.dfl
%%PORTDOCS%%share/doc/minicom/doc/modemu.README
%%PORTDOCS%%share/doc/minicom/doc/pl-translation.txt
%%PORTDOCS%%share/doc/minicom/doc/portugues-brasil
%%PORTDOCS%%share/doc/minicom/doc/suomeksi
%%PORTDOCS%%share/doc/minicom/extras/htsalogin
%%PORTDOCS%%share/doc/minicom/extras/linux/INSTALL
%%PORTDOCS%%share/doc/minicom/extras/linux/README-FIRST
%%PORTDOCS%%share/doc/minicom/extras/linux/mtelnet
%%PORTDOCS%%share/doc/minicom/extras/saralogin
%%PORTDOCS%%share/doc/minicom/extras/scriptdemo
%%PORTDOCS%%share/doc/minicom/extras/tables/mc.iso
%%PORTDOCS%%share/doc/minicom/extras/tables/mc.noconv
%%PORTDOCS%%share/doc/minicom/extras/tables/mc.pc8
%%PORTDOCS%%share/doc/minicom/extras/tables/mc.sf7
%%PORTDOCS%%share/doc/minicom/extras/termcap/README
%%PORTDOCS%%share/doc/minicom/extras/termcap/termcap.long
%%PORTDOCS%%share/doc/minicom/extras/termcap/termcap.short
%%PORTDOCS%%share/doc/minicom/extras/terminfo/README
%%PORTDOCS%%share/doc/minicom/extras/terminfo/minicom
%%PORTDOCS%%share/doc/minicom/extras/unixlogin
%%PORTDOCS%%@dirrm share/doc/minicom/doc
%%PORTDOCS%%@dirrm share/doc/minicom/extras/linux
%%PORTDOCS%%@dirrm share/doc/minicom/extras/tables
%%PORTDOCS%%@dirrm share/doc/minicom/extras/termcap
%%PORTDOCS%%@dirrm share/doc/minicom/extras/terminfo
%%PORTDOCS%%@dirrm share/doc/minicom/extras
%%PORTDOCS%%@dirrm share/doc/minicom
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.78
%%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.82
%%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.82.1
%%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.83
%%PORTDOCS%%%%DOCSDIR%%/doc/COMPATABILITY.lrzsz
%%PORTDOCS%%%%DOCSDIR%%/doc/ChangeLog.old
%%PORTDOCS%%%%DOCSDIR%%/doc/HistSearch
%%PORTDOCS%%%%DOCSDIR%%/doc/Locales
%%PORTDOCS%%%%DOCSDIR%%/doc/Macros
%%PORTDOCS%%%%DOCSDIR%%/doc/QuickStart.modemu
%%PORTDOCS%%%%DOCSDIR%%/doc/README.lrzsz
%%PORTDOCS%%%%DOCSDIR%%/doc/RedHat
%%PORTDOCS%%%%DOCSDIR%%/doc/TODO.lrzsz
%%PORTDOCS%%%%DOCSDIR%%/doc/Todo
%%PORTDOCS%%%%DOCSDIR%%/doc/Todo.175
%%PORTDOCS%%%%DOCSDIR%%/doc/Todo.Irix.dif
%%PORTDOCS%%%%DOCSDIR%%/doc/Todo.emacskey.dif
%%PORTDOCS%%%%DOCSDIR%%/doc/Todo.fsel
%%PORTDOCS%%%%DOCSDIR%%/doc/copyright.modemu
%%PORTDOCS%%%%DOCSDIR%%/doc/fselector.txt
%%PORTDOCS%%%%DOCSDIR%%/doc/japanese
%%PORTDOCS%%%%DOCSDIR%%/doc/minicom.FAQ
%%PORTDOCS%%%%DOCSDIR%%/doc/minicom.users
%%PORTDOCS%%%%DOCSDIR%%/doc/minirc.dfl
%%PORTDOCS%%%%DOCSDIR%%/doc/modemu.README
%%PORTDOCS%%%%DOCSDIR%%/doc/pl-translation.txt
%%PORTDOCS%%%%DOCSDIR%%/doc/portugues-brasil
%%PORTDOCS%%%%DOCSDIR%%/doc/suomeksi
%%PORTDOCS%%%%DOCSDIR%%/extras/htsalogin
%%PORTDOCS%%%%DOCSDIR%%/extras/linux/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/extras/linux/README-FIRST
%%PORTDOCS%%%%DOCSDIR%%/extras/linux/mtelnet
%%PORTDOCS%%%%DOCSDIR%%/extras/saralogin
%%PORTDOCS%%%%DOCSDIR%%/extras/scriptdemo
%%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.iso
%%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.noconv
%%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.pc8
%%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.sf7
%%PORTDOCS%%%%DOCSDIR%%/extras/termcap/README
%%PORTDOCS%%%%DOCSDIR%%/extras/termcap/termcap.long
%%PORTDOCS%%%%DOCSDIR%%/extras/termcap/termcap.short
%%PORTDOCS%%%%DOCSDIR%%/extras/terminfo/README
%%PORTDOCS%%%%DOCSDIR%%/extras/terminfo/minicom
%%PORTDOCS%%%%DOCSDIR%%/extras/unixlogin
%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras/linux
%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras/tables
%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras/termcap
%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras/terminfo
%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras
%%PORTDOCS%%@dirrm %%DOCSDIR%%