Add wallpaper patch and two new options, USE_XAW3DLIB and USE_NEXTAWLIB.

PR:		9168
Submitted by:	maintainer

12 files changed, 196 insertions, 26 deletions

diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 880758366994..5e39ca3e8e05 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.15 1997/10/17 12:56:49 itojun Exp $
+# $Id: Makefile,v 1.16 1997/12/25 22:29:38 asami Exp $
 #
 
 DISTNAME=	kterm-6.2.0
@@ -12,17 +12,58 @@ CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
-PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/
-PATCHFILES=	kterm-6.2.0.NFS-xauth.patch
+MAINTAINER=	shige@kuis.kyoto-u.ac.jp
 
-MAINTAINER=	ports@FreeBSD.ORG
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+
+PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/ \
+		http://karin.ip.titech.ac.jp/~takagi/kterm/
+PATCHFILES=	kterm-6.2.0.NFS-xauth.patch \
+		kterm-6.2.0-wpr1.patch.gz
+PATCH_DIST_STRIP= -p1
 
 USE_IMAKE=	yes
+MAN1=		kterm.1
+MANCOMPRESSED=	yes
+
+DOCDIR=		${PREFIX}/share/doc/kterm
+
+.if !defined(PACKAGE_BUILDING)
 
-.if exists(/usr/X11R6/lib/libXaw3d.a) && !defined(PACKAGE_BUILDING)
+.if defined(USE_XAW3DLIB) && defined(USE_NEXTAWLIB)
+.if (${USE_XAW3DLIB} == "YES") && (${USE_NEXTAWLIB} == "YES")
+.BEGIN:
+	@${ECHO} "Error: \$${USE_XAW3DLIB} and \$${USE_NEXTAWLIB} cannot be specified simultaneously!"
+	@${FALSE}
+.endif
+.elif defined(USE_XAW3DLIB)
+.if (${USE_XAW3DLIB} == "YES")
+LIB_DEPENDS+=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 post-patch:
 	@${ECHO_MSG}  "===>  Applying Xaw3d scrollbar patch"
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-0
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-Xaw3d
+.endif
+.elif defined(USE_NEXTAWLIB)
+.if (${USE_NEXTAWLIB} == "YES")
+LIB_DEPENDS+=	neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw
+post-patch:
+	@${ECHO_MSG}  "===>  Applying neXtaw scrollbar patch"
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-neXtaw
+.endif
+.endif
+.endif
+
+post-install:
+# install japanese manual
+	@${MV} ${WRKSRC}/kterm.jman ${WRKSRC}/kterm.jman.jis
+	@nkf -e -u ${WRKSRC}/kterm.jman.jis >${WRKSRC}/kterm.jman
+	@${INSTALL_MAN} ${WRKSRC}/kterm.jman ${PREFIX}/man/ja/man1/kterm.1
+	@${GZIP_CMD} ${PREFIX}/man/ja/man1/kterm.1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README.kt ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README.wallpaper ${DOCDIR}/README.wallpaper.ja
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/kterm/distinfo b/japanese/kterm/distinfo
index f1555e6d4b64..097038984615 100644
--- a/japanese/kterm/distinfo
+++ b/japanese/kterm/distinfo
@@ -1,2 +1,3 @@
 MD5 (kterm-6.2.0.tar.gz) = 9cc72841b50dfba92bce01dbbebf3039
 MD5 (kterm-6.2.0.NFS-xauth.patch) = a2f11334e14929997e987e463f004dd0
+MD5 (kterm-6.2.0-wpr1.patch.gz) = 139c824069743f8aa2ed85d55a2b0dfc
diff --git a/japanese/kterm/files/extra-patch-Xaw3d b/japanese/kterm/files/extra-patch-Xaw3d
new file mode 100644
index 000000000000..ab1e0db5c5f9
--- /dev/null
+++ b/japanese/kterm/files/extra-patch-Xaw3d
@@ -0,0 +1,11 @@
+--- ./kterm.h.org	Thu Jul 11 22:01:37 1996
++++ ./kterm.h	Fri Nov  1 05:22:15 1996
+@@ -36,6 +36,7 @@
+ #define KTERM_KINPUT2	/* Kinput2 protocol */
+ #define KTERM_COLOR	/* color sequence */
+ #define KTERM_NOTEK	/* disables Tektronix emulation */
+-#undef  KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define USE_XAW3DLIB
+ 
+ #endif /* !_KTERM_H_ */
diff --git a/japanese/kterm/files/extra-patch-neXtaw b/japanese/kterm/files/extra-patch-neXtaw
new file mode 100644
index 000000000000..fae1ae770f29
--- /dev/null
+++ b/japanese/kterm/files/extra-patch-neXtaw
@@ -0,0 +1,11 @@
+--- ./kterm.h.org	Thu Jul 11 22:01:37 1996
++++ ./kterm.h	Fri Nov  1 05:22:15 1996
+@@ -36,6 +36,7 @@
+ #define KTERM_KINPUT2	/* Kinput2 protocol */
+ #define KTERM_COLOR	/* color sequence */
+ #define KTERM_NOTEK	/* disables Tektronix emulation */
+-#undef  KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define USE_NEXTAWLIB
+ 
+ #endif /* !_KTERM_H_ */
diff --git a/japanese/kterm/files/patch-aa b/japanese/kterm/files/patch-aa
index 9b3b38e1aac0..4ac4ebc311ec 100644
--- a/japanese/kterm/files/patch-aa
+++ b/japanese/kterm/files/patch-aa
@@ -1,11 +1,29 @@
---- ./Imakefile.org	Thu Jul 11 22:01:04 1996
-+++ ./Imakefile	Fri Nov  1 05:32:20 1996
-@@ -80,7 +80,7 @@
+--- Imakefile.orig	Sun Dec 13 16:59:08 1998
++++ Imakefile	Sun Dec 13 17:37:16 1998
+@@ -13,6 +13,17 @@
+       XPOLL_DEF = -DNO_XPOLL_H
+ #endif
+ 
++#ifdef USE_XAW3DLIB
++#undef XawClientLibs
++#define XawClientLibs	-lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB)
++#endif
++
++#ifdef USE_NEXTAWLIB
++#undef XawClientLibs
++#define XawClientLibs	-lneXtaw $(XMULIB) $(XTOOLLIB) $(XLIB)
++#endif
++
++
+ /*
+  * add -DWTMP and -DLASTLOG if you want them.
+  */
+@@ -81,7 +90,7 @@
  SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
  
  #if InstallXtermSetUID
--SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
-+SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB) -lxpg4)
+-SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB))
++SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB) -lxpg4)
  #else
- NormalProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
+ NormalProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB))
  #endif
diff --git a/japanese/kterm/pkg-plist b/japanese/kterm/pkg-plist
index ba9cb3c32cb0..bfc5f2db0f6d 100644
--- a/japanese/kterm/pkg-plist
+++ b/japanese/kterm/pkg-plist
@@ -1,3 +1,6 @@
 bin/kterm
 lib/X11/app-defaults/KTerm
-man/man1/kterm.1.gz
+man/ja/man1/kterm.1.gz
+share/doc/kterm/README.kt
+share/doc/kterm/README.wallpaper.ja
+@dirrm share/doc/kterm
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 880758366994..5e39ca3e8e05 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.15 1997/10/17 12:56:49 itojun Exp $
+# $Id: Makefile,v 1.16 1997/12/25 22:29:38 asami Exp $
 #
 
 DISTNAME=	kterm-6.2.0
@@ -12,17 +12,58 @@ CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
-PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/
-PATCHFILES=	kterm-6.2.0.NFS-xauth.patch
+MAINTAINER=	shige@kuis.kyoto-u.ac.jp
 
-MAINTAINER=	ports@FreeBSD.ORG
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+
+PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/ \
+		http://karin.ip.titech.ac.jp/~takagi/kterm/
+PATCHFILES=	kterm-6.2.0.NFS-xauth.patch \
+		kterm-6.2.0-wpr1.patch.gz
+PATCH_DIST_STRIP= -p1
 
 USE_IMAKE=	yes
+MAN1=		kterm.1
+MANCOMPRESSED=	yes
+
+DOCDIR=		${PREFIX}/share/doc/kterm
+
+.if !defined(PACKAGE_BUILDING)
 
-.if exists(/usr/X11R6/lib/libXaw3d.a) && !defined(PACKAGE_BUILDING)
+.if defined(USE_XAW3DLIB) && defined(USE_NEXTAWLIB)
+.if (${USE_XAW3DLIB} == "YES") && (${USE_NEXTAWLIB} == "YES")
+.BEGIN:
+	@${ECHO} "Error: \$${USE_XAW3DLIB} and \$${USE_NEXTAWLIB} cannot be specified simultaneously!"
+	@${FALSE}
+.endif
+.elif defined(USE_XAW3DLIB)
+.if (${USE_XAW3DLIB} == "YES")
+LIB_DEPENDS+=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 post-patch:
 	@${ECHO_MSG}  "===>  Applying Xaw3d scrollbar patch"
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-0
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-Xaw3d
+.endif
+.elif defined(USE_NEXTAWLIB)
+.if (${USE_NEXTAWLIB} == "YES")
+LIB_DEPENDS+=	neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw
+post-patch:
+	@${ECHO_MSG}  "===>  Applying neXtaw scrollbar patch"
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-neXtaw
+.endif
+.endif
+.endif
+
+post-install:
+# install japanese manual
+	@${MV} ${WRKSRC}/kterm.jman ${WRKSRC}/kterm.jman.jis
+	@nkf -e -u ${WRKSRC}/kterm.jman.jis >${WRKSRC}/kterm.jman
+	@${INSTALL_MAN} ${WRKSRC}/kterm.jman ${PREFIX}/man/ja/man1/kterm.1
+	@${GZIP_CMD} ${PREFIX}/man/ja/man1/kterm.1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README.kt ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README.wallpaper ${DOCDIR}/README.wallpaper.ja
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/kterm16c/distinfo b/japanese/kterm16c/distinfo
index f1555e6d4b64..097038984615 100644
--- a/japanese/kterm16c/distinfo
+++ b/japanese/kterm16c/distinfo
@@ -1,2 +1,3 @@
 MD5 (kterm-6.2.0.tar.gz) = 9cc72841b50dfba92bce01dbbebf3039
 MD5 (kterm-6.2.0.NFS-xauth.patch) = a2f11334e14929997e987e463f004dd0
+MD5 (kterm-6.2.0-wpr1.patch.gz) = 139c824069743f8aa2ed85d55a2b0dfc
diff --git a/japanese/kterm16c/files/extra-patch-Xaw3d b/japanese/kterm16c/files/extra-patch-Xaw3d
new file mode 100644
index 000000000000..ab1e0db5c5f9
--- /dev/null
+++ b/japanese/kterm16c/files/extra-patch-Xaw3d
@@ -0,0 +1,11 @@
+--- ./kterm.h.org	Thu Jul 11 22:01:37 1996
++++ ./kterm.h	Fri Nov  1 05:22:15 1996
+@@ -36,6 +36,7 @@
+ #define KTERM_KINPUT2	/* Kinput2 protocol */
+ #define KTERM_COLOR	/* color sequence */
+ #define KTERM_NOTEK	/* disables Tektronix emulation */
+-#undef  KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define USE_XAW3DLIB
+ 
+ #endif /* !_KTERM_H_ */
diff --git a/japanese/kterm16c/files/extra-patch-neXtaw b/japanese/kterm16c/files/extra-patch-neXtaw
new file mode 100644
index 000000000000..fae1ae770f29
--- /dev/null
+++ b/japanese/kterm16c/files/extra-patch-neXtaw
@@ -0,0 +1,11 @@
+--- ./kterm.h.org	Thu Jul 11 22:01:37 1996
++++ ./kterm.h	Fri Nov  1 05:22:15 1996
+@@ -36,6 +36,7 @@
+ #define KTERM_KINPUT2	/* Kinput2 protocol */
+ #define KTERM_COLOR	/* color sequence */
+ #define KTERM_NOTEK	/* disables Tektronix emulation */
+-#undef  KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define USE_NEXTAWLIB
+ 
+ #endif /* !_KTERM_H_ */
diff --git a/japanese/kterm16c/files/patch-aa b/japanese/kterm16c/files/patch-aa
index 9b3b38e1aac0..4ac4ebc311ec 100644
--- a/japanese/kterm16c/files/patch-aa
+++ b/japanese/kterm16c/files/patch-aa
@@ -1,11 +1,29 @@
---- ./Imakefile.org	Thu Jul 11 22:01:04 1996
-+++ ./Imakefile	Fri Nov  1 05:32:20 1996
-@@ -80,7 +80,7 @@
+--- Imakefile.orig	Sun Dec 13 16:59:08 1998
++++ Imakefile	Sun Dec 13 17:37:16 1998
+@@ -13,6 +13,17 @@
+       XPOLL_DEF = -DNO_XPOLL_H
+ #endif
+ 
++#ifdef USE_XAW3DLIB
++#undef XawClientLibs
++#define XawClientLibs	-lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB)
++#endif
++
++#ifdef USE_NEXTAWLIB
++#undef XawClientLibs
++#define XawClientLibs	-lneXtaw $(XMULIB) $(XTOOLLIB) $(XLIB)
++#endif
++
++
+ /*
+  * add -DWTMP and -DLASTLOG if you want them.
+  */
+@@ -81,7 +90,7 @@
  SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
  
  #if InstallXtermSetUID
--SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
-+SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB) -lxpg4)
+-SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB))
++SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB) -lxpg4)
  #else
- NormalProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
+ NormalProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB))
  #endif
diff --git a/japanese/kterm16c/pkg-plist b/japanese/kterm16c/pkg-plist
index ba9cb3c32cb0..bfc5f2db0f6d 100644
--- a/japanese/kterm16c/pkg-plist
+++ b/japanese/kterm16c/pkg-plist
@@ -1,3 +1,6 @@
 bin/kterm
 lib/X11/app-defaults/KTerm
-man/man1/kterm.1.gz
+man/ja/man1/kterm.1.gz
+share/doc/kterm/README.kt
+share/doc/kterm/README.wallpaper.ja
+@dirrm share/doc/kterm