Updated to 3.3.10ga4

Fix HOMEPAGE and MASTER_SITES
Changelog too long to list here. Please see
http://x3270.bgp.nu/documentation-relnotes.html

4 files changed, 32 insertions, 39 deletions

diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 558636c5527..d8499d97876 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,23 +1,26 @@
-# $NetBSD: Makefile,v 1.23 2009/06/15 13:12:02 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/03/04 20:42:01 gls Exp $
 
-DISTNAME=	x3270-3213
-PKGNAME=	x3270-3.2.13
-PKGREVISION=	5
+DISTNAME=	suite3270-3.3.10ga4-src
+PKGNAME=	x3270-3.3.10ga4
 CATEGORIES=	x11
-MASTER_SITES=	http://www.geocities.com/SiliconValley/Peaks/7814/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=x3270/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.geocities.com/SiliconValley/Peaks/7814/
+HOMEPAGE=	http://x3270.bgp.nu/
 COMMENT=	3270 Terminal emulator
 
+GNU_CONFIGURE=	yes
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/x3270-3.2
+WRKSRC=		${WRKDIR}/x3270-3.3
 USE_IMAKE=	yes
 
 FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/misc
 
+EGDIR=			${PREFIX}/share/examples/x3270
+CONF_FILES=		${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts
+
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
diff --git a/x11/x3270/PLIST b/x11/x3270/PLIST
index 522ace32988..0c3809b2368 100644
--- a/x11/x3270/PLIST
+++ b/x11/x3270/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/15 13:12:02 joerg Exp $
-bin/pr3287
+@comment $NetBSD: PLIST,v 1.7 2010/03/04 20:42:01 gls Exp $
 bin/x3270
 bin/x3270if
 lib/X11/fonts/misc/3270-12.pcf.gz
@@ -8,7 +7,6 @@ lib/X11/fonts/misc/3270-20.pcf.gz
 lib/X11/fonts/misc/3270-20b.pcf.gz
 lib/X11/fonts/misc/3270.pcf.gz
 lib/X11/fonts/misc/3270b.pcf.gz
-lib/X11/fonts/misc/3270d.pcf.gz
 lib/X11/fonts/misc/3270gr.pcf.gz
 lib/X11/fonts/misc/3270gt12.pcf.gz
 lib/X11/fonts/misc/3270gt12b.pcf.gz
@@ -20,9 +18,8 @@ lib/X11/fonts/misc/3270gt32.pcf.gz
 lib/X11/fonts/misc/3270gt32b.pcf.gz
 lib/X11/fonts/misc/3270gt8.pcf.gz
 lib/X11/fonts/misc/3270h.pcf.gz
-lib/X11/x3270/ibm_hosts
-${IMAKE_MAN_DIR}/ibm_hosts.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/pr3287.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/x3270-script.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/x3270.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/x3270if.${IMAKE_MANNEWSUFFIX}
+man/cat1/x3270.0
+man/man1/x3270-script.1
+man/man1/x3270if.1
+man/man5/ibm_hosts.5
+share/examples/x3270/ibm_hosts
diff --git a/x11/x3270/distinfo b/x11/x3270/distinfo
index a725d3313e6..4ebae30592c 100644
--- a/x11/x3270/distinfo
+++ b/x11/x3270/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:21 wiz Exp $
+$NetBSD: distinfo,v 1.5 2010/03/04 20:42:01 gls Exp $
 
-SHA1 (x3270-3213.tgz) = ce92607384f72761bd85bc7f5cd37d59f52a4452
-RMD160 (x3270-3213.tgz) = 9a4e1323c95dafa96e13789bddc9eb43834cb2f1
-Size (x3270-3213.tgz) = 500073 bytes
-SHA1 (patch-aa) = fa17fb709185bb319462c32048addbecdd39b8dd
+SHA1 (suite3270-3.3.10ga4-src.tgz) = 3c551882b6dd05d2943038475732c7f8cd515f86
+RMD160 (suite3270-3.3.10ga4-src.tgz) = 079f0d02d61b103e2c0b168ae1b5385e6fd49958
+Size (suite3270-3.3.10ga4-src.tgz) = 6413725 bytes
+SHA1 (patch-aa) = cc53e255ec7f3ce0d311bda1b6f9d9bb431ad502
diff --git a/x11/x3270/patches/patch-aa b/x11/x3270/patches/patch-aa
index 4b52bf7166b..5c01b97e1bb 100644
--- a/x11/x3270/patches/patch-aa
+++ b/x11/x3270/patches/patch-aa
@@ -1,20 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2001/05/12 21:54:13 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2010/03/04 20:42:01 gls Exp $
 
-fix types (needed on LP64)
-
---- pr3287/pr3287.c.orig	Thu Sep 14 10:41:12 2000
-+++ pr3287/pr3287.c	Sat May 12 17:49:49 2001
-@@ -97,5 +97,5 @@
- /* Memory allocation. */
- void *
--Malloc(unsigned len)
-+Malloc(size_t len)
- {
- 	void *p = malloc(len);
-@@ -115,5 +115,5 @@
+--- configure.orig      2009-09-22 01:59:47.000000000 +0000
++++ configure
+@@ -4025,7 +4025,7 @@ no|*)     no_xmkmf=1
+ esac
+ 
+ # Set up the configuration directory.
+-LIBX3270DIR='${sysconfdir}/x3270'
++LIBX3270DIR='${PREFIX}/share/examples/x3270'
+ 
  
- void *
--Realloc(void *p, unsigned len)
-+Realloc(void *p, size_t len)
- {
- 	void *pn;
+ { $as_echo "$as_me:$LINENO: checking for library containing forkpty" >&5