From 7219ed6c9ca78f7d1a8f206870dd992157a7dfb1 Mon Sep 17 00:00:00 2001
From: asami <asami@FreeBSD.org>
Date: Fri, 1 Nov 1996 13:43:31 +0000
Subject: Upgrade, 6.1.0 -> 6.2.0.

---
 japanese/kterm/Makefile          | 16 ++++++++----
 japanese/kterm/distinfo          |  2 +-
 japanese/kterm/files/patch-aa    | 54 ++++++----------------------------------
 japanese/kterm16c/Makefile       | 16 ++++++++----
 japanese/kterm16c/distinfo       |  2 +-
 japanese/kterm16c/files/patch-aa | 54 ++++++----------------------------------
 6 files changed, 40 insertions(+), 104 deletions(-)

diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 038f1ad42be6..43606c756870 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -1,18 +1,24 @@
 # New ports collection makefile for:	kterm
-# Version required:	6.1
+# Version required:	6.2
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.9 1996/06/03 02:17:23 asami Exp $
+# $Id: Makefile,v 1.10 1996/09/19 04:38:22 asami Exp $
 #
 
-DISTNAME=	kterm-6.1.0
-PKGNAME=	jp-kterm-6.1.0
+DISTNAME=	kterm-6.2.0
+PKGNAME=	jp-kterm-6.2.0
 CATEGORIES+=	japanese x11
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
 USE_IMAKE=	yes
 
+.if exists(/usr/X11R6/lib/libXaw3d.a) && !defined(PACKAGE_BUILDING)
+post-patch:
+	@${ECHO_MSG}  "===>  Applying Xaw3d scrollbar patch"
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-0
+.endif
+
 .include <bsd.port.mk>
diff --git a/japanese/kterm/distinfo b/japanese/kterm/distinfo
index a5f97ba1f7d3..d723215c8bf2 100644
--- a/japanese/kterm/distinfo
+++ b/japanese/kterm/distinfo
@@ -1 +1 @@
-MD5 (kterm-6.1.0.tar.gz) = b70155465a62217b2a170cdeea441a23
+MD5 (kterm-6.2.0.tar.gz) = 9cc72841b50dfba92bce01dbbebf3039
diff --git a/japanese/kterm/files/patch-aa b/japanese/kterm/files/patch-aa
index 19840aa09413..9b3b38e1aac0 100644
--- a/japanese/kterm/files/patch-aa
+++ b/japanese/kterm/files/patch-aa
@@ -1,49 +1,11 @@
---- ./main.c.org	Sat Jun  4 08:44:11 1994
-+++ ./main.c	Tue Nov 15 20:59:40 1994
-@@ -284,22 +284,34 @@
- #ifdef UTMP_FILE
- #define UTMP_FILENAME UTMP_FILE
- #else
-+#ifdef _PATH_UTMP
-+#define UTMP_FILENAME _PATH_UTMP
-+#else
- #define UTMP_FILENAME "/etc/utmp"
- #endif
- #endif
-+#endif
- 
- #ifndef LASTLOG_FILENAME
-+#ifdef _PATH_LASTLOG
-+#define LASTLOG_FILENAME _PATH_LASTLOG
-+#else
- #define LASTLOG_FILENAME "/usr/adm/lastlog"  /* only on BSD systems */
- #endif
-+#endif
+--- ./Imakefile.org	Thu Jul 11 22:01:04 1996
++++ ./Imakefile	Fri Nov  1 05:32:20 1996
+@@ -80,7 +80,7 @@
+ SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
  
- #ifndef WTMP_FILENAME
- #ifdef WTMP_FILE
- #define WTMP_FILENAME WTMP_FILE
+ #if InstallXtermSetUID
+-SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
++SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB) -lxpg4)
  #else
-+#ifdef _PATH_WTMP
-+#define WTMP_FILENAME _PATH_WTMP
-+#else
- #ifdef SYSV
- #define WTMP_FILENAME "/etc/wtmp"
- #else
- #define WTMP_FILENAME "/usr/adm/wtmp"
-+#endif
- #endif
+ NormalProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
  #endif
- #endif
---- ./misc.c.org	Mon Mar 28 15:27:03 1994
-+++ ./misc.c	Tue Nov 15 21:06:54 1994
-@@ -765,7 +765,9 @@
- char *SysErrorMsg (n)
-     int n;
- {
-+#ifndef __FreeBSD__
-     extern char *sys_errlist[];
-+#endif
-     extern int sys_nerr;
- 
-     return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 038f1ad42be6..43606c756870 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -1,18 +1,24 @@
 # New ports collection makefile for:	kterm
-# Version required:	6.1
+# Version required:	6.2
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.9 1996/06/03 02:17:23 asami Exp $
+# $Id: Makefile,v 1.10 1996/09/19 04:38:22 asami Exp $
 #
 
-DISTNAME=	kterm-6.1.0
-PKGNAME=	jp-kterm-6.1.0
+DISTNAME=	kterm-6.2.0
+PKGNAME=	jp-kterm-6.2.0
 CATEGORIES+=	japanese x11
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
 USE_IMAKE=	yes
 
+.if exists(/usr/X11R6/lib/libXaw3d.a) && !defined(PACKAGE_BUILDING)
+post-patch:
+	@${ECHO_MSG}  "===>  Applying Xaw3d scrollbar patch"
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-0
+.endif
+
 .include <bsd.port.mk>
diff --git a/japanese/kterm16c/distinfo b/japanese/kterm16c/distinfo
index a5f97ba1f7d3..d723215c8bf2 100644
--- a/japanese/kterm16c/distinfo
+++ b/japanese/kterm16c/distinfo
@@ -1 +1 @@
-MD5 (kterm-6.1.0.tar.gz) = b70155465a62217b2a170cdeea441a23
+MD5 (kterm-6.2.0.tar.gz) = 9cc72841b50dfba92bce01dbbebf3039
diff --git a/japanese/kterm16c/files/patch-aa b/japanese/kterm16c/files/patch-aa
index 19840aa09413..9b3b38e1aac0 100644
--- a/japanese/kterm16c/files/patch-aa
+++ b/japanese/kterm16c/files/patch-aa
@@ -1,49 +1,11 @@
---- ./main.c.org	Sat Jun  4 08:44:11 1994
-+++ ./main.c	Tue Nov 15 20:59:40 1994
-@@ -284,22 +284,34 @@
- #ifdef UTMP_FILE
- #define UTMP_FILENAME UTMP_FILE
- #else
-+#ifdef _PATH_UTMP
-+#define UTMP_FILENAME _PATH_UTMP
-+#else
- #define UTMP_FILENAME "/etc/utmp"
- #endif
- #endif
-+#endif
- 
- #ifndef LASTLOG_FILENAME
-+#ifdef _PATH_LASTLOG
-+#define LASTLOG_FILENAME _PATH_LASTLOG
-+#else
- #define LASTLOG_FILENAME "/usr/adm/lastlog"  /* only on BSD systems */
- #endif
-+#endif
+--- ./Imakefile.org	Thu Jul 11 22:01:04 1996
++++ ./Imakefile	Fri Nov  1 05:32:20 1996
+@@ -80,7 +80,7 @@
+ SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
  
- #ifndef WTMP_FILENAME
- #ifdef WTMP_FILE
- #define WTMP_FILENAME WTMP_FILE
+ #if InstallXtermSetUID
+-SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
++SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB) -lxpg4)
  #else
-+#ifdef _PATH_WTMP
-+#define WTMP_FILENAME _PATH_WTMP
-+#else
- #ifdef SYSV
- #define WTMP_FILENAME "/etc/wtmp"
- #else
- #define WTMP_FILENAME "/usr/adm/wtmp"
-+#endif
- #endif
+ NormalProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
  #endif
- #endif
---- ./misc.c.org	Mon Mar 28 15:27:03 1994
-+++ ./misc.c	Tue Nov 15 21:06:54 1994
-@@ -765,7 +765,9 @@
- char *SysErrorMsg (n)
-     int n;
- {
-+#ifndef __FreeBSD__
-     extern char *sys_errlist[];
-+#endif
-     extern int sys_nerr;
- 
-     return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
-- 
cgit