Update x11/x3270 to 3.3.10ga5.

Upstream changes:

# [x3270] Fixed a problem with temporary keymaps being cleared when connecting
to or disconnecting from a host.
# x3270, c3270] Corrected some APL characters that were not displayed correctly
with Unicode fonts.
# [all] Corrected operation on EBCDIC-based hosts.
# [all] Corrected the behavior of hostname prefixes such as L:, which were
"sticky", i.e., once set they would be set for all future connections.
# [all] Corrected the reported CGCSGID for code page 1147 (french-euro).
# [all except x3270] Disabled the Query Reply report for background color
support, which confused some older versions of GDDM. This report can be
explicitly enabled by setting the qrBgColor resource to true.
# [all] In oversize mode, changed the terminal type to IBM-DYNAMIC.

Pkgsrc changes:
- Set LICENSE
- Fix configuration directory
- Claim maintainership.

3 files changed, 53 insertions, 20 deletions

diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index d8499d97876..18581779155 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.24 2010/03/04 20:42:01 gls Exp $
+# $NetBSD: Makefile,v 1.25 2010/07/25 21:23:03 gls Exp $
 
-DISTNAME=	suite3270-3.3.10ga4-src
-PKGNAME=	x3270-3.3.10ga4
+DISTNAME=	suite3270-3.3.10ga5-src
+PKGNAME=	x3270-3.3.10ga5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=x3270/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	gls@NetBSD.org
 HOMEPAGE=	http://x3270.bgp.nu/
 COMMENT=	3270 Terminal emulator
+LICENSE=	modified-bsd
 
 GNU_CONFIGURE=	yes
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -18,8 +19,13 @@ USE_IMAKE=	yes
 
 FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/misc
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
+
+PKG_SYSCONFSUBDIR=	x3270
+
 EGDIR=			${PREFIX}/share/examples/x3270
 CONF_FILES=		${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts
+INSTALLATION_DIRS+=	${EGDIR}
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/x11/x3270/distinfo b/x11/x3270/distinfo
index 4ebae30592c..a1eb245e9a7 100644
--- a/x11/x3270/distinfo
+++ b/x11/x3270/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/03/04 20:42:01 gls Exp $
+$NetBSD: distinfo,v 1.6 2010/07/25 21:23:03 gls Exp $
 
-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
+SHA1 (suite3270-3.3.10ga5-src.tgz) = d919b6e252b5df5e462d8f54f2d1b533402d710b
+RMD160 (suite3270-3.3.10ga5-src.tgz) = 3263fac6baf9f636f51aa67326f99b8d17fc6550
+Size (suite3270-3.3.10ga5-src.tgz) = 6416266 bytes
+SHA1 (patch-aa) = 6425e9dd7d248034de437ed2f62e223507de6261
diff --git a/x11/x3270/patches/patch-aa b/x11/x3270/patches/patch-aa
index 5c01b97e1bb..55a5c4ecfb4 100644
--- a/x11/x3270/patches/patch-aa
+++ b/x11/x3270/patches/patch-aa
@@ -1,13 +1,40 @@
-$NetBSD: patch-aa,v 1.6 2010/03/04 20:42:01 gls Exp $
+$NetBSD: patch-aa,v 1.7 2010/07/25 21:23:03 gls Exp $
 
---- configure.orig      2009-09-22 01:59:47.000000000 +0000
-+++ configure
-@@ -4025,7 +4025,7 @@ no|*)     no_xmkmf=1
- esac
+--- Imakefile.in.orig	2009-09-18 02:08:55.000000000 +0000
++++ Imakefile.in
+@@ -1,7 +1,7 @@
+ /*
+  * Copyright (c) 1995-2009, Paul Mattes.
+  * All rights reserved.
+- * 
++ *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+  * are met:
+@@ -13,7 +13,7 @@
+  *     * Neither the name of Paul Mattes nor his contributors may be used
+  *       to endorse or promote products derived from this software without
+  *       specific prior written permission.
+- * 
++ *
+  * THIS SOFTWARE IS PROVIDED BY PAUL MATTES "AS IS" AND ANY EXPRESS
+  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+@@ -190,8 +190,8 @@ $(DESTDIR)$(FONTINSTDIR)/fonts.dir::
+ /* Extra install rule for the sample ibm_hosts file (runs only if there is
+    no ibm_hosts file installed yet). */
+ install:: $(HOSTSFILE)
+-	@[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \
+-		$(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE)
++	@[ -r $(DESTDIR)$(PREFIX)/share/examples/x3270/$(HOSTSFILE) ] || \
++		$(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(PREFIX)/share/examples/x3270/$(HOSTSFILE)
  
- # Set up the configuration directory.
--LIBX3270DIR='${sysconfdir}/x3270'
-+LIBX3270DIR='${PREFIX}/share/examples/x3270'
- 
- 
- { $as_echo "$as_me:$LINENO: checking for library containing forkpty" >&5
+ /*
+  * Install rules for x3270if, x3270-script and ibm_hosts man pages.
+@@ -226,5 +226,5 @@ install.byprefix::
+ /******************************************************************************
+  * Clean rules.                                                               *
+  ******************************************************************************/
+-clean:: 
++clean::
+ 	$(RM) $(FONTS) qcpp mkfb fallbacks.c