- Update to 2.4

- Grab maintainership

Feature safe:	yes

4 files changed, 15 insertions, 28 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 76436596e3c5..4f6b3838c923 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -7,35 +7,31 @@
 #
 
 PORTNAME=	minicom
-PORTVERSION=	2.3
-PORTREVISION=	3
+PORTVERSION=	2.4
 CATEGORIES=	comms
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/2332/ \
-		ftp://ftp.nuug.no/pub/anders/distfiles/ \
-		http://atreides.freenix.no/~anders/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3195/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	An MS-DOS Telix serial communication program "workalike"
 
-RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz \
-		lsz:${PORTSDIR}/comms/lrzsz
+RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
 .if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GETTEXT=	yes
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE} \
-			--without-included-gettext
 PLIST_SUB+=	NLS=""
 .endif
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-dfl-baud=57600 \
 			--sysconfdir=${PREFIX}/etc/minicom \
-			--enable-lock-dir=/var/spool/lock
-
-CONFIGURE_ARGS+=	--enable-dfl-port=${MINICOM_DEFAULT_PORT}
+			--enable-lock-dir=/var/spool/lock \
+			--enable-dfl-port=${MINICOM_DEFAULT_PORT} \
+			CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		minicom.1 runscript.1 ascii-xfr.1 xminicom.1
 
@@ -58,9 +54,6 @@ post-install:
 	${CHOWN} uucp:dialer ${PREFIX}/bin/minicom
 	${CHMOD} 4511 ${PREFIX}/bin/minicom
 	${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/etc/minicom
-.if !exists(${PREFIX}/etc/minicom/minicom.users)
-	${INSTALL_DATA} ${WRKSRC}/doc/minicom.users ${PREFIX}/etc/minicom/
-.endif
 	${CHOWN} uucp ${PREFIX}/etc/minicom
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index 639bc3c1be70..ec14462fc912 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1,3 +1,3 @@
-MD5 (minicom-2.3.tar.gz) = 0ebe7a91898384ca906787cc4e2c3f25
-SHA256 (minicom-2.3.tar.gz) = 2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb
-SIZE (minicom-2.3.tar.gz) = 789162
+MD5 (minicom-2.4.tar.gz) = 700976a3c2dcc8bbd50ab9bb1c08837b
+SHA256 (minicom-2.4.tar.gz) = 6b7af240b073ba847b091fd75aed4bf720eb94d30e188d23bb098d016bf40a48
+SIZE (minicom-2.4.tar.gz) = 811414
diff --git a/comms/minicom/pkg-descr b/comms/minicom/pkg-descr
index ccfb2366b460..383eb9509590 100644
--- a/comms/minicom/pkg-descr
+++ b/comms/minicom/pkg-descr
@@ -3,9 +3,4 @@ well-known MS-DOS Telix program.  It has ANSI color, dialing directory,
 dial-a-list, script language, file up/download support, screen capture,
 scroll-back, etc.
 
-The author is Miquel van Smoorenburg (miquels@cistron.nl -or-
-miquels@drinkel.ow.org).  Note, minicom is covered by the GNU GPL.
-
--- David	(obrien@cs.ucdavis.edu)
-
 WWW: http://alioth.debian.org/projects/minicom/
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index 4ff27fb2e7cb..19d66640d7e3 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -2,7 +2,6 @@ bin/minicom
 bin/xminicom
 bin/runscript
 bin/ascii-xfr
-etc/minicom/minicom.users
 %%NLS%%share/locale/cs/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/da/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/de/LC_MESSAGES/minicom.mo
@@ -10,6 +9,7 @@ etc/minicom/minicom.users
 %%NLS%%share/locale/fi/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/minicom.mo
+%%NLS%%share/locale/id/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/minicom.mo
@@ -46,7 +46,6 @@ etc/minicom/minicom.users
 %%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