diff options
author | veego <veego> | 2005-06-19 11:34:45 +0000 |
---|---|---|
committer | veego <veego> | 2005-06-19 11:34:45 +0000 |
commit | 73368368d01a8a5ae5d3498a1d4ad8246bf9a140 (patch) | |
tree | 793a905c506e98c027fa17fbb4a939a8d93f30f0 /comms | |
parent | ea0b4a393a272b190d4a52634091eb14ac3d2fc3 (diff) | |
download | pkgsrc-73368368d01a8a5ae5d3498a1d4ad8246bf9a140.tar.gz |
Update to 2.1.
Too many Changes to list here (Changelog is too long), so only whats new in 2.1:
- applied some pending patches (see ChangeLog for a complete list)
- added support for socket connections
- fixed compiling issues on Solaris
- new maintainer: Adam Lackorzynski
- new homepage: http://minicom.alioth.debian.org/
- new mailinglists (-devel and -announce):
http://alioth.debian.org/mail/?group_id=31
NetBSD patches:
- Include <sys/types.h> to fix PR pkg/29026 (1st error)
- Fix i18n error for PR pkg/29939, which should also fix PR pkg29026 (2nd error)
- Remove the create-dev-link script, which fix PR pkg/29026 (3rd error)
The system administrator is expected to setup the correct configuration
of the modem device.
- Updated patches and removed patch-af and patch-ag
- Fix the path for the lrzsz and gkermit tools in the default configuration
- Remove the old share/doc/minicom dir, because the new Makefiles doesn't
install them and they are outdated
Diffstat (limited to 'comms')
-rw-r--r-- | comms/minicom/MESSAGE | 10 | ||||
-rw-r--r-- | comms/minicom/Makefile | 32 | ||||
-rw-r--r-- | comms/minicom/PLIST | 53 | ||||
-rw-r--r-- | comms/minicom/distinfo | 20 | ||||
-rw-r--r-- | comms/minicom/patches/patch-aa | 94 | ||||
-rw-r--r-- | comms/minicom/patches/patch-ab | 89 | ||||
-rw-r--r-- | comms/minicom/patches/patch-ac | 10 | ||||
-rw-r--r-- | comms/minicom/patches/patch-ad | 48 | ||||
-rw-r--r-- | comms/minicom/patches/patch-ae | 34 | ||||
-rw-r--r-- | comms/minicom/patches/patch-af | 13 | ||||
-rw-r--r-- | comms/minicom/patches/patch-ag | 13 | ||||
-rw-r--r-- | comms/minicom/scripts/create-dev-link | 59 |
12 files changed, 106 insertions, 369 deletions
diff --git a/comms/minicom/MESSAGE b/comms/minicom/MESSAGE new file mode 100644 index 00000000000..83a28ea6ae2 --- /dev/null +++ b/comms/minicom/MESSAGE @@ -0,0 +1,10 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2005/06/19 11:34:45 veego Exp $ + +You will need to setup the default configration file: + ${PREFIX}/etc/minicom/minirc.dfl +by runing 'minicom -s' as root. + +Do not forget to change the default 'Serial Device', which can be found in +the 'Serial port setup' section. +=========================================================================== diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index a1f9435e0c3..e98d3d85b77 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -1,15 +1,11 @@ -# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:44 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/19 11:34:45 veego Exp $ -DISTNAME= minicom-1.83.1.src -PKGNAME= ${DISTNAME:S/.src//} -PKGREVISION= 2 +DISTNAME= minicom-2.1 CATEGORIES= comms -MASTER_SITES= ${MASTER_SITE_BACKUP} -#MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/serialcomm/dialout/} \ -# http://www.pp.clinet.fi/~walker/ +MASTER_SITES= http://alioth.debian.org/download.php/123/ MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://alioth.debian.org/projects/minicom/ +HOMEPAGE= http://minicom.alioth.debian.org/ COMMENT= MS-DOS Telix serial communication program "workalike" BUILD_USES_MSGFMT= yes @@ -18,11 +14,12 @@ DEPENDS+= lrzsz-[0-9]*:../../comms/lrzsz PKG_INSTALLATION_TYPES= overwrite pkgviews -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/src USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -NO_CONFIGURE= yes +GNU_CONFIGURE= yes + +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} PKG_SYSCONFSUBDIR= minicom EGDIR= ${PREFIX}/share/examples/minicom @@ -34,14 +31,15 @@ OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} uucp dialer 0755 CONF_FILES_PERMS= ${EGDIR}/minicom.users ${PKG_SYSCONFDIR}/minicom.users \ uucp dialer 0644 -# for BATCH ! -.include "../../mk/bsd.prefs.mk" +SUBST_CLASSES+= minicom +SUBST_MESSAGE.minicom= "Fixing hardcoded paths." +SUBST_STAGE.minicom= post-patch +SUBST_FILES.minicom= src/rwconf.c +SUBST_SED.minicom= -e 's,@PREFIX@,${PREFIX},g' -.if !defined(BATCH) -pre-install: - # this script creates a link from your comm port to /dev/modem - ${SH} ${SCRIPTDIR}/create-dev-link -.endif +post-install: + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/minicom.users ${EGDIR} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/minicom/PLIST b/comms/minicom/PLIST index d9acfbb4821..b9cec620542 100644 --- a/comms/minicom/PLIST +++ b/comms/minicom/PLIST @@ -1,59 +1,18 @@ -@comment $NetBSD: PLIST,v 1.5 2003/04/27 14:57:58 cjep Exp $ +@comment $NetBSD: PLIST,v 1.6 2005/06/19 11:34:45 veego Exp $ bin/ascii-xfr bin/minicom bin/runscript -bin/xminicom man/man1/minicom.1 man/man1/runscript.1 man/man1/ascii-xfr.1 -share/doc/minicom/Announce-1.78 -share/doc/minicom/Announce-1.82 -share/doc/minicom/Announce-1.82.1 -share/doc/minicom/Announce-1.83 -share/doc/minicom/Announce-1.83.1 -share/doc/minicom/COMPATABILITY.lrzsz -share/doc/minicom/ChangeLog -share/doc/minicom/HistSearch -share/doc/minicom/Locales -share/doc/minicom/Macros -share/doc/minicom/Porting -share/doc/minicom/QuickStart.modemu -share/doc/minicom/README.lrzsz -share/doc/minicom/RedHat -share/doc/minicom/TODO.lrzsz -share/doc/minicom/Todo -share/doc/minicom/Todo.175 -share/doc/minicom/Todo.Irix.dif -share/doc/minicom/Todo.emacskey.dif -share/doc/minicom/Todo.fsel -share/doc/minicom/copyright.modemu -share/doc/minicom/demos/htsalogin -share/doc/minicom/demos/saralogin -share/doc/minicom/demos/scriptdemo -share/doc/minicom/demos/unixlogin -share/doc/minicom/developers -share/doc/minicom/fselector.txt -share/doc/minicom/japanese -share/doc/minicom/minicom.FAQ -share/doc/minicom/minicom.users -share/doc/minicom/minirc.dfl -share/doc/minicom/modemu.README -share/doc/minicom/pl-translation.txt -share/doc/minicom/portugues-brasil -share/doc/minicom/suomeksi -share/doc/minicom/tables/mc.iso -share/doc/minicom/tables/mc.noconv -share/doc/minicom/tables/mc.pc8 -share/doc/minicom/tables/mc.sf7 share/examples/minicom/minicom.users -${PKGLOCALEDIR}/locale/fi_FI/LC_MESSAGES/minicom.mo +${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/minicom.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/minicom.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/minicom.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/minicom.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/minicom.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/minicom.mo -${PKGLOCALEDIR}/locale/ja_JP.SJIS/LC_MESSAGES/minicom.mo -${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/minicom.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/minicom.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/minicom.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/minicom.mo @dirrm share/examples/minicom -@dirrm share/doc/minicom/tables -@dirrm share/doc/minicom/demos -@dirrm share/doc/minicom diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo index c73fd4a79e8..45c167d4fb7 100644 --- a/comms/minicom/distinfo +++ b/comms/minicom/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 16:05:30 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/06/19 11:34:45 veego Exp $ -SHA1 (minicom-1.83.1.src.tar.gz) = 0c1c7fd8c95304c47c0c106f54b997f2d320c883 -RMD160 (minicom-1.83.1.src.tar.gz) = 146fb703c12fd9bd09f17379f5dcd10e284d64f5 -Size (minicom-1.83.1.src.tar.gz) = 323223 bytes -SHA1 (patch-aa) = aca3573b4ba3b56e8f03667e8c59131b4926d0bb -SHA1 (patch-ab) = 16aba24da471e1f04e2a86a3d198c8b75ec13a9c -SHA1 (patch-ac) = 53dd29da9c9355ba0dd003f1da13daa4775f5426 -SHA1 (patch-ad) = 52ae46aa6633f6d3cfcf478e46712963b1c9286b -SHA1 (patch-ae) = 2424f9c4e78d4a77275632cf7d29911bb2d0a267 -SHA1 (patch-af) = 937a5170c5abb88ba0bd600877a55db9dfcac099 -SHA1 (patch-ag) = c4273b9fdba7c83c6485b89f8ce5d612925b964f +SHA1 (minicom-2.1.tar.gz) = 720273f6ee8db5fb2da4379ac610a520a31aba70 +RMD160 (minicom-2.1.tar.gz) = 58121cf29991a92914acee855d6e86486c6d370d +Size (minicom-2.1.tar.gz) = 607939 bytes +SHA1 (patch-aa) = a7c85609f9384ec7c0e5e950d6244f527b0876d1 +SHA1 (patch-ab) = 4cfb8bc389f4052c08551651aa86f98d0e751028 +SHA1 (patch-ac) = 91a2acce80d7d1815a29843b1de5e1acc172024a +SHA1 (patch-ad) = 5e866091f58585a16da93fdf9d8bec417c0adc19 +SHA1 (patch-ae) = 8df6f8d02b18ef242c3f8d53352831ba4244b52f diff --git a/comms/minicom/patches/patch-aa b/comms/minicom/patches/patch-aa index 32cb16c7b67..91ff0177f43 100644 --- a/comms/minicom/patches/patch-aa +++ b/comms/minicom/patches/patch-aa @@ -1,86 +1,20 @@ -$NetBSD: patch-aa,v 1.8 2002/10/04 23:47:28 jlam Exp $ +$NetBSD: patch-aa,v 1.9 2005/06/19 11:34:45 veego Exp $ ---- Makefile.orig Tue Apr 25 08:42:32 2000 -+++ Makefile -@@ -22,10 +22,10 @@ - # enochw@scn.org Oct 99: flags for UWIN 2.0 (Unix for Windows) +--- src/Makefile.am.orig 2003-04-30 00:03:22.000000000 +0200 ++++ src/Makefile.am 2005-05-17 21:55:32.000000000 +0200 +@@ -3,8 +3,6 @@ - # Where to install things for Linux sites (FSSTND) --BINDIR = /usr/bin --LIBDIR = /etc --DOCDIR = /usr/doc/minicom --MANDIR = /usr/man/man1 -+#BINDIR = /usr/bin -+#LIBDIR = /etc -+#DOCDIR = /usr/doc/minicom -+#MANDIR = /usr/man/man1 + bin_PROGRAMS = minicom runscript ascii-xfr @KEYSERV@ - # fmg 8/22/97: seems a more logical place for this :-) - # Select Compile Options you want: -@@ -53,6 +53,13 @@ PO = po - # DOCDIR = /usr/local/etc/minicom - # MANDIR = /usr/local/man/man1 +-bin_SCRIPTS = xminicom +- + minicom_SOURCES = minicom.c vt100.c config.c help.c updown.c \ + util.c dial.c window.c wkeys.c ipc.c \ + windiv.c sysdep1.c sysdep1_s.c sysdep2.c rwconf.c main.c \ +@@ -34,5 +32,5 @@ -+# Where to install things for NetBSD sites. -+BINDIR = ${PREFIX}/bin -+LIBDIR = ${PKG_SYSCONFDIR} -+EGDIR = ${PREFIX}/share/examples/minicom -+DOCDIR = ${PREFIX}/share/doc/minicom -+MANDIR = ${PREFIX}/man/man1 -+ - # Where to install things for "normal" sites. - # BINDIR = /usr/local/bin - # LIBDIR = /usr/local/lib -@@ -60,11 +67,11 @@ PO = po - # MANDIR = /usr/local/man/man1 + runscript_LDADD = @INTLLIBS@ - # Take these compilation flags for Linux with libncurses. --FLAGS = -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses --PROGS = minicom runscript ascii-xfr --LFLAGS = -s --LIBS = -lncurses #-lintl --CC = cc -+#FLAGS = -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses -+#PROGS = minicom runscript ascii-xfr -+#LFLAGS = -s -+#LIBS = -lncurses #-lintl -+#CC = cc +-EXTRA_DIST = functions.c xminicom ++EXTRA_DIST = functions.c - # Take these compilation flags for FreeBSD. - #FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -@@ -174,6 +181,13 @@ CC = cc - #PROGS = minicom runscript ascii-xfr keyserv - #LIBS = - -+# Take these compilation flags for NetBSD. -+FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -+PROGS = minicom runscript ascii-xfr -+LFLAGS = $(LDFLAGS) -+LIBS = -lintl -lcurses -ltermcap -+CC = cc -+ - # Nothing should have to change beneath this line - - SRCS = minicom.c vt100.c config.c help.c updown.c \ -@@ -199,7 +213,7 @@ KOBJS = keyserv.o wkeys.o sysdep2.o - SOBJS = script.o sysdep1.o common.o - - # fmg 8/22/97: merge in new OPFLAGS... --CFLAGS = $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\" -+CFLAGS = $(CPPFLAGS) $(FLAGS) $(OPFLAGS) -DBINDIR=\"$(BINDIR)\" -DLIBDIR=\"$(LIBDIR)\" - - R = $(ROOTDIR) - -@@ -263,10 +277,10 @@ dummy: - - install: $(PROGS) - $(MAKE) -C po install R=$(R) -- sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR) -+ sh install.sh $(R)$(EGDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR) - - install2: $(PROGS) -- sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR) -+ sh install.sh $(R)$(EGDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR) - - clobber: - rm -f *.o *~ minicom keyserv runscript ascii-xfr diff --git a/comms/minicom/patches/patch-ab b/comms/minicom/patches/patch-ab index 125bada12d7..69519d9ec75 100644 --- a/comms/minicom/patches/patch-ab +++ b/comms/minicom/patches/patch-ab @@ -1,84 +1,11 @@ -$NetBSD: patch-ab,v 1.3 1999/04/14 21:13:24 tron Exp $ +$NetBSD: patch-ab,v 1.4 2005/06/19 11:34:45 veego Exp $ ---- install.sh.orig Tue Apr 21 19:45:42 1998 -+++ install.sh Wed Apr 14 22:04:02 1999 -@@ -24,6 +24,7 @@ - exit 1 - fi - fi -+chown uucp $1 +--- man/Makefile.am.orig 2003-03-30 22:49:40.000000000 +0200 ++++ man/Makefile.am 2005-05-17 21:57:15.000000000 +0200 +@@ -1,5 +1,5 @@ + AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0 - if test ! -d $2 - then -@@ -41,8 +42,8 @@ - then - echo "Installing minicom in $2" - cp minicom $2/minicom -- chown root $2/minicom -- chgrp uucp $2/minicom -+ chown uucp $2/minicom -+ chgrp dialer $2/minicom - chmod 755 $2/minicom - fi - -@@ -54,7 +55,7 @@ - cp $i $2/$i - chmod 755 $2/$i - chown root $2/$i -- chgrp root $2/$i -+ chgrp wheel $2/$i - fi - done - -@@ -64,7 +65,7 @@ - cp keyserv $1/keyserv - chmod 755 $1/keyserv - chown root $1/keyserv -- chgrp root $1/keyserv -+ chgrp wheel $1/keyserv - fi - - echo "Installing manpages in $3" -@@ -73,7 +74,7 @@ - cp ../man/$i $3 - chmod 644 $3/$i - chown root $3/$i -- chgrp root $3/$i -+ chgrp wheel $3/$i - done - - if [ ! -f $1/minicom.users ] -@@ -81,7 +82,7 @@ - echo "Installing sample config file minicom.users in $1" - cp minicom.users $1 - chown root $1/minicom.users -- chgrp root $1/minicom.users -+ chgrp wheel $1/minicom.users - chmod 644 $1/minicom.users - fi - -@@ -96,7 +97,7 @@ - chmod -f 644 $4/* $4/demos/* $4/tables/* - chmod -f a+x $4/demos $4/tables - chown -f root $4/* $4/demos/* $4/tables/* -- chgrp -f root $4/* $4/demos/* $4/tables/* -+ chgrp -f wheel $4/* $4/demos/* $4/tables/* - else - echo "You don't have a $4 directory - script examples not installed." - fi -@@ -106,10 +107,11 @@ - rm minicom.o - fi - --echo "Minicom is NOT setuid yet - you must do this yourself by entering:" --echo --echo "chmod +s $2/minicom" --echo -+###echo "Minicom is NOT setuid yet - you must do this yourself by entering:" -+###echo -+###echo "chmod +s $2/minicom" -+###echo -+chmod u+s $2/minicom - echo "or make your modem device in the /dev directory world writable " - echo "with chmod a+rw" +-man_MANS = ascii-xfr.1 minicom.1 runscript.1 xminicom.1 ++man_MANS = ascii-xfr.1 minicom.1 runscript.1 + EXTRA_DIST = $(man_MANS) diff --git a/comms/minicom/patches/patch-ac b/comms/minicom/patches/patch-ac index 2ff9690f55f..fea95bf85f4 100644 --- a/comms/minicom/patches/patch-ac +++ b/comms/minicom/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.4 2000/06/12 18:40:55 rh Exp $ +$NetBSD: patch-ac,v 1.5 2005/06/19 11:34:45 veego Exp $ ---- updown.c.orig Thu Mar 16 10:44:26 2000 -+++ updown.c Mon Jun 12 20:24:37 2000 -@@ -238,7 +238,7 @@ - do_log(cmdline); /* jl 22.06.97 */ +--- src/updown.c.orig 2003-04-13 00:52:20.000000000 +0200 ++++ src/updown.c 2005-05-17 20:33:24.000000000 +0200 +@@ -245,7 +245,7 @@ + do_log("%s", cmdline); /* jl 22.06.97 */ if (P_PFULL(g) == 'N') { - win = wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); diff --git a/comms/minicom/patches/patch-ad b/comms/minicom/patches/patch-ad index dc88c66652f..f943840643d 100644 --- a/comms/minicom/patches/patch-ad +++ b/comms/minicom/patches/patch-ad @@ -1,11 +1,22 @@ -$NetBSD: patch-ad,v 1.5 2000/01/05 22:58:14 tron Exp $ +$NetBSD: patch-ad,v 1.6 2005/06/19 11:34:45 veego Exp $ ---- rwconf.c.orig Mon Nov 15 15:19:03 1999 -+++ rwconf.c Mon Nov 15 15:19:03 1999 -@@ -78,14 +78,14 @@ - { "/usr/bin/kermit -i -l %l -r", PUBLIC, "pprog8" }, - #else - /* Most sites have this in /usr/local, except Linux. */ +--- src/rwconf.c.orig 2003-04-13 00:52:20.000000000 +0200 ++++ src/rwconf.c 2005-06-19 10:57:52.000000000 +0200 +@@ -80,27 +80,15 @@ + { "", PUBLIC, "pname10" }, + { "", PUBLIC, "pname11" }, + { "", PUBLIC, "pname12" }, +-#if defined(__linux__) || defined(__GNU__) +- { "/usr/bin/sz -vv -b", PUBLIC, "pprog1" }, +- { "/usr/bin/sb -vv", PUBLIC, "pprog2" }, +- { "/usr/bin/sx -vv", PUBLIC, "pprog3" }, +- { "/usr/bin/rz -vv -b -E", PUBLIC, "pprog4" }, +- { "/usr/bin/rb -vv", PUBLIC, "pprog5" }, +- { "/usr/bin/rx -vv", PUBLIC, "pprog6" }, +- { "/usr/bin/kermit -i -l %l -s", PUBLIC, "pprog7" }, +- { "/usr/bin/kermit -i -l %l -r", PUBLIC, "pprog8" }, +-#else +- /* Most sites have this in /usr/local, except Linux. */ - { "/usr/local/bin/sz -vv", PUBLIC, "pprog1" }, - { "/usr/local/bin/sb -vv", PUBLIC, "pprog2" }, - { "/usr/local/bin/sx -vv", PUBLIC, "pprog3" }, @@ -14,14 +25,17 @@ $NetBSD: patch-ad,v 1.5 2000/01/05 22:58:14 tron Exp $ - { "/usr/local/bin/rx -vv", PUBLIC, "pprog6" }, - { "/usr/local/bin/kermit -i -l %l -s", PUBLIC, "pprog7" }, - { "/usr/local/bin/kermit -i -l %l -r", PUBLIC, "pprog8" }, -+ { BINDIR "/lsz -vv", PUBLIC, "pprog1" }, -+ { BINDIR "/lsb -vv", PUBLIC, "pprog2" }, -+ { BINDIR "/lsx -vv", PUBLIC, "pprog3" }, -+ { BINDIR "/lrz -vv", PUBLIC, "pprog4" }, -+ { BINDIR "/lrb -vv", PUBLIC, "pprog5" }, -+ { BINDIR "/lrx -vv", PUBLIC, "pprog6" }, -+ { BINDIR "/gkermit -i -s", PUBLIC, "pprog7" }, -+ { BINDIR "/gkermit -i -r", PUBLIC, "pprog8" }, - #endif - { "/usr/bin/ascii-xfr -dsv", PUBLIC, "pprog9" }, +-#endif +- { "/usr/bin/ascii-xfr -dsv", PUBLIC, "pprog9" }, ++ { "@PREFIX@/bin/lsz -vv -b", PUBLIC, "pprog1" }, ++ { "@PREFIX@/bin/lsb -vv", PUBLIC, "pprog2" }, ++ { "@PREFIX@/bin/lsx -vv", PUBLIC, "pprog3" }, ++ { "@PREFIX@/bin/lrz -vv -b", PUBLIC, "pprog4" }, ++ { "@PREFIX@/bin/lrb -vv", PUBLIC, "pprog5" }, ++ { "@PREFIX@/bin/lrx -vv", PUBLIC, "pprog6" }, ++ { "@PREFIX@/bin/gkermit -i -l %l -s", PUBLIC, "pprog7" }, ++ { "@PREFIX@/bin/gkermit -i -l %l -r", PUBLIC, "pprog8" }, ++ { "@PREFIX@/bin/ascii-xfr -dsv", PUBLIC, "pprog9" }, { "", PUBLIC, "pprog10" }, + { "", PUBLIC, "pprog11" }, + { "", PUBLIC, "pprog12" }, diff --git a/comms/minicom/patches/patch-ae b/comms/minicom/patches/patch-ae index cb437ff38f7..4158cde0091 100644 --- a/comms/minicom/patches/patch-ae +++ b/comms/minicom/patches/patch-ae @@ -1,28 +1,10 @@ -$NetBSD: patch-ae,v 1.3 1999/04/14 21:13:24 tron Exp $ +$NetBSD: patch-ae,v 1.4 2005/06/19 11:34:45 veego Exp $ ---- po/Makefile.orig Sun Jan 10 01:22:51 1999 -+++ po/Makefile Wed Apr 14 22:57:19 1999 -@@ -1,7 +1,6 @@ --INSTALL= /usr/bin/install -c --INSTALL_PROGRAM= ${INSTALL} --INSTALL_DATA= ${INSTALL} -m 644 --INSTALLNLSDIR=/usr/share/locale -+INSTALL_DATA= ${BSD_INSTALL_DATA} -+INSTALL_DATA_DIR= ${BSD_INSTALL_DATA_DIR} -+INSTALLNLSDIR= ${PREFIX}/share/locale +--- src/windiv.c.orig 2003-04-22 01:56:46.000000000 +0200 ++++ src/windiv.c 2005-06-19 11:21:11.000000000 +0200 +@@ -21,4 +21,5 @@ - MSGMERGE = msgmerge - -@@ -52,9 +51,9 @@ - install: $(CATALOGS) - for n in $(CATALOGS); do \ - l=`basename $$n .mo`; \ -- $(INSTALL) -m 755 -d $(R)$(INSTALLNLSDIR)/$$l; \ -- $(INSTALL) -m 755 -d $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \ -- $(INSTALL) -m 644 $$n $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES/minicom.mo; \ -+ $(INSTALL_DATA_DIR) $(R)$(INSTALLNLSDIR)/$$l; \ -+ $(INSTALL_DATA_DIR) $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \ -+ $(INSTALL_DATA) $$n $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES/minicom.mo; \ - done - - %.mo: %.po ++#include <sys/types.h> + #include <dirent.h> + #include <sys/stat.h> + #include "port.h" diff --git a/comms/minicom/patches/patch-af b/comms/minicom/patches/patch-af deleted file mode 100644 index 2b0497dca48..00000000000 --- a/comms/minicom/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 1998/08/07 10:36:43 agc Exp $ - ---- config.h.orig Fri Oct 31 20:48:00 1997 -+++ config.h Wed Feb 11 22:53:18 1998 -@@ -56,7 +56,7 @@ - # define CALLIN "" - #endif - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__NetBSD__) - # define DFL_PORT "/dev/modem" - # define DEF_BAUD "19200" - # define CALLOUT "" diff --git a/comms/minicom/patches/patch-ag b/comms/minicom/patches/patch-ag deleted file mode 100644 index 3a5aca85653..00000000000 --- a/comms/minicom/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2000/08/24 18:53:06 tron Exp $ - ---- ascii-xfr.c.orig Sun Mar 8 17:10:26 1998 -+++ ascii-xfr.c Thu Aug 24 20:49:16 2000 -@@ -8,6 +8,8 @@ - * 08.03.98 added a patch from Bo Branten <bosse@ing.umu.se> - */ - -+#include <sys/param.h> -+ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/comms/minicom/scripts/create-dev-link b/comms/minicom/scripts/create-dev-link deleted file mode 100644 index b79b7dae49b..00000000000 --- a/comms/minicom/scripts/create-dev-link +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -# -# $NetBSD: create-dev-link,v 1.5 2004/07/10 22:41:39 salo Exp $ -# -# pre-install script for Minicom port to FreeBSD 2.x - -echo "" -echo "Minicom will be installed mode 4511 (setuid) owner uucp, and group dialer." -echo "" -echo -n "Is this ok? [y] " - read fooz - if [ ! ${fooz} ] ; then - fooz=Y - fi - if [ ${fooz} = Y -o ${fooz} = y -o ${fooz} = yes ] ; then - # ok to continue - else - echo "" - exit 1 - fi - - -echo "" -echo "Minicom needs to know what device your modem is hanging off of." -echo "I (the porter) have adopted Satoshi Asami's lead of using /dev/modem." -echo "" -echo -n "Lets see if you have too..." - -if [ -h /dev/modem -o -c /dev/modem ]; then - echo " Good you do:" - /bin/ls -l /dev/modem -else - echo "Nope, you haven't (yet)." - echo "The patches to Minicom hardcode /dev/modem." - echo -n "Would you like me to make this link for you? [Y] " - read foo - if [ ! ${foo} ] ; then - foo=Y - fi - if [ ${foo} = Y -o ${foo} = y -o ${foo} = yes ] ; then - echo "From the list below, what port number is your modem attached to?" - cd /dev - /bin/ls -C tty[0-9][0-9] - echo "" - echo -n "Enter the number X from ttyX above : " - read bar - if [ ${bar} ] ; then - if [ -c /dev/tty${bar} ]; then - ln -s /dev/tty${bar} /dev/modem - else - echo "Error: /dev/tty${bar} doesn't exist." - exit 1 - fi - fi - fi -fi - -echo "" -exit 0 |