Date: Tue, 22 Dec 1998 17:35:55 +0900 (JST) From: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: shige@kuis.kyoto-u.ac.jp Subject: ports/9168: Update port: japanese/kterm Message-ID: <19981222173555I.shige@kuis.kyoto-u.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 9168
>Category: ports
>Synopsis: Update port: japanese/kterm
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 22 00:40:01 PST 1998
>Last-Modified:
>Originator: Shigeyuki FUKUSHIMA
>Organization:
Dept. of Information Science, Kyoto Univ., JAPAN
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
FreeBSD 2.2.7-RELEASE i386
FreeBSD 3.0-RELEASE i386
FreeBSD 3.0-CURRENT i386
>Description:
Update port: japanese/kterm
update as follows:
1. Applied kterm wallpaper patch (This patch requires Xpm lib).
2. Add port extra option: USE_XAW3DLIB
3. Add port extra option: USE_NEXTAWLIB
Thank you.
--- shige
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/japanese/kterm/Makefile kterm/Makefile
--- /usr/ports/japanese/kterm/Makefile Fri Dec 26 07:29:38 1997
+++ kterm/Makefile Sun Dec 13 19:15:36 1998
@@ -12,17 +12,59 @@
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
+BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
+LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-MAINTAINER= ports@FreeBSD.ORG
+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
+
+MAINTAINER= shige@kuis.kyoto-u.ac.jp
USE_IMAKE= yes
+MAN1= kterm.1
+MANCOMPRESSED= yes
+
+DOCDIR= ${PREFIX}/share/doc/kterm
+
-.if exists(/usr/X11R6/lib/libXaw3d.a) && !defined(PACKAGE_BUILDING)
+.if !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 -urN /usr/ports/japanese/kterm/files/md5 kterm/files/md5
--- /usr/ports/japanese/kterm/files/md5 Fri Oct 17 21:56:51 1997
+++ kterm/files/md5 Sun Dec 13 16:53:43 1998
@@ -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 -urN /usr/ports/japanese/kterm/files/patch-0 kterm/files/patch-0
--- /usr/ports/japanese/kterm/files/patch-0 Fri Nov 1 22:43:26 1996
+++ kterm/files/patch-0 Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
---- ./kterm.h.org Thu Jul 11 22:01:37 1996
-+++ ./kterm.h Fri Nov 1 05:22:15 1996
-@@ -36,6 +36,6 @@
- #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 */
-
- #endif /* !_KTERM_H_ */
diff -urN /usr/ports/japanese/kterm/files/patch-Xaw3d kterm/files/patch-Xaw3d
--- /usr/ports/japanese/kterm/files/patch-Xaw3d Thu Jan 1 09:00:00 1970
+++ kterm/files/patch-Xaw3d Sun Dec 13 18:37:53 1998
@@ -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 -urN /usr/ports/japanese/kterm/files/patch-neXtaw kterm/files/patch-neXtaw
--- /usr/ports/japanese/kterm/files/patch-neXtaw Thu Jan 1 09:00:00 1970
+++ kterm/files/patch-neXtaw Sun Dec 13 18:37:58 1998
@@ -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 -urN /usr/ports/japanese/kterm/patches/patch-aa kterm/patches/patch-aa
--- /usr/ports/japanese/kterm/patches/patch-aa Fri Nov 1 22:43:31 1996
+++ kterm/patches/patch-aa Sun Dec 13 19:02:44 1998
@@ -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 -urN /usr/ports/japanese/kterm/pkg/PLIST kterm/pkg/PLIST
--- /usr/ports/japanese/kterm/pkg/PLIST Sun Nov 17 23:14:51 1996
+++ kterm/pkg/PLIST Sun Dec 13 18:59:44 1998
@@ -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
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19981222173555I.shige>