pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/comms/minicom Update to 2.1.

details:   https://anonhg.NetBSD.org/pkgsrc/rev/254999505d08
branches:  trunk
changeset: 495740:254999505d08
user:      veego <veego%pkgsrc.org@localhost>
date:      Sun Jun 19 11:34:45 2005 +0000

description:
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:

 comms/minicom/MESSAGE                 |  10 +++
 comms/minicom/Makefile                |  32 +++++------
 comms/minicom/PLIST                   |  53 ++-----------------
 comms/minicom/distinfo                |  20 +++----
 comms/minicom/patches/patch-aa        |  94 +++++-----------------------------
 comms/minicom/patches/patch-ab        |  89 ++------------------------------
 comms/minicom/patches/patch-ac        |  10 +-
 comms/minicom/patches/patch-ad        |  48 +++++++++++------
 comms/minicom/patches/patch-ae        |  34 ++---------
 comms/minicom/patches/patch-af        |  13 ----
 comms/minicom/patches/patch-ag        |  13 ----
 comms/minicom/scripts/create-dev-link |  59 ---------------------
 12 files changed, 106 insertions(+), 369 deletions(-)

diffs (truncated from 585 to 300 lines):

diff -r a496cc956846 -r 254999505d08 comms/minicom/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/minicom/MESSAGE     Sun Jun 19 11:34:45 2005 +0000
@@ -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 -r a496cc956846 -r 254999505d08 comms/minicom/Makefile
--- a/comms/minicom/Makefile    Sun Jun 19 11:02:41 2005 +0000
+++ b/comms/minicom/Makefile    Sun Jun 19 11:34:45 2005 +0000
@@ -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@localhost
-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 @@
 
 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 @@
 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 -r a496cc956846 -r 254999505d08 comms/minicom/PLIST
--- a/comms/minicom/PLIST       Sun Jun 19 11:02:41 2005 +0000
+++ b/comms/minicom/PLIST       Sun Jun 19 11:34:45 2005 +0000
@@ -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 -r a496cc956846 -r 254999505d08 comms/minicom/distinfo
--- a/comms/minicom/distinfo    Sun Jun 19 11:02:41 2005 +0000
+++ b/comms/minicom/distinfo    Sun Jun 19 11:34:45 2005 +0000
@@ -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 -r a496cc956846 -r 254999505d08 comms/minicom/patches/patch-aa
--- a/comms/minicom/patches/patch-aa    Sun Jun 19 11:02:41 2005 +0000
+++ b/comms/minicom/patches/patch-aa    Sun Jun 19 11:34:45 2005 +0000
@@ -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@localhost Oct 99: flags for UWIN 2.0 (Unix for Windows)
- 
- # 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
+--- 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 @@
  
- # 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
- 
-+# 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
+ bin_PROGRAMS = minicom runscript ascii-xfr @KEYSERV@
  
- # 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
- 
- # 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 =
+-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 @@
  
-+# 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
+ runscript_LDADD = @INTLLIBS@
  
- # 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:
+-EXTRA_DIST = functions.c xminicom
++EXTRA_DIST = functions.c
  
- 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 -r a496cc956846 -r 254999505d08 comms/minicom/patches/patch-ab
--- a/comms/minicom/patches/patch-ab    Sun Jun 19 11:02:41 2005 +0000
+++ b/comms/minicom/patches/patch-ab    Sun Jun 19 11:34:45 2005 +0000
@@ -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
- 
- 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
Home | Main Index | Thread Index | Old Index