Date: Fri, 4 Nov 2016 22:50:21 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425363 - in head/japanese/kterm: . files Message-ID: <201611042250.uA4MoLKa065859@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Fri Nov 4 22:50:21 2016 New Revision: 425363 URL: https://svnweb.freebsd.org/changeset/ports/425363 Log: - Fix X11 dependency. - Fix bdftopcf dependency. - Eliminate unfetchable patch files. Modified: head/japanese/kterm/Makefile head/japanese/kterm/distinfo head/japanese/kterm/files/patch-Imakefile head/japanese/kterm/pkg-descr head/japanese/kterm/pkg-plist Modified: head/japanese/kterm/Makefile ============================================================================== --- head/japanese/kterm/Makefile Fri Nov 4 22:35:47 2016 (r425362) +++ head/japanese/kterm/Makefile Fri Nov 4 22:50:21 2016 (r425363) @@ -2,41 +2,25 @@ PORTNAME= kterm PORTVERSION= 6.2.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= japanese x11 -MASTER_SITES= PORTS_JP/kterm/:wp_jp \ - XCONTRIB/applications \ - LOCAL/shige/kterm/:wp_local \ - LOCAL/hrs/:pcemu -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - README.wallpaper.ja:wp_local,wp_jp \ - pcemu1.01alpha.tar.gz:pcemu +MASTER_SITES= LOCAL/hrs:pcemu +DISTFILES= pcemu1.01alpha.tar.gz:pcemu DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= ftp://ftp.sra.co.jp/pub/x11/kterm/:nfs \ - http://www.asahi-net.or.jp/~hc3j-tkg/kterm/:wpi \ - http://dists.lovepeers.org/distfiles/:termios \ - LOCAL/shige/kterm/:color16 \ - LOCAL/nork/:termios \ - LOCAL/hrs/:utf -PATCHFILES= ${DISTNAME}.NFS-xauth.patch:nfs \ - ${DISTNAME}-wpi.patch.gz:wpi \ - ${DISTNAME}-color16.patch.gz:color16 \ - ${DISTNAME}-termios-0.2.patch.gz:termios \ - ${DISTNAME}.ext06.patch.gz:utf -PATCH_DIST_STRIP= -p1 MAINTAINER= hrs@FreeBSD.org COMMENT= Xterm variant with Japanese support -BROKEN= wpi patch site no longer resolves (unfetchable) +LICENSE= MIT BUILD_DEPENDS= nkf:japanese/nkf USES= imake +USE_XORG= ice sm x11 xaw xext xmu xpm xt +USE_GITHUB= yes +GH_ACCOUNT= hrs-allbsd +GH_TAGNAME= v6.2.0.fb6 VGAFONT_USES= fonts -USE_XORG= xaw CFLAGS+= -Wno-return-type PORTDOCS= README.kt README.wallpaper.ja dot.termcap @@ -48,43 +32,57 @@ OPTIONS_SUB= yes XAW3DLIB_DESC= with Xaw3d scrollbar XAW3DLIB_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d -XAW3DLIB_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Xaw3d NEXTAWLIB_DESC= with neXtaw scrollbar NEXTAWLIB_LIB_DEPENDS= libneXtaw.so:x11-toolkits/neXtaw -NEXTAWLIB_EXTRA_PATCHES=${PATCHDIR}/extra-patch-neXtaw TEKTRONIXEMU_DESC= Tektronix emulation -TEKTRONIXEMU_EXTRA_PATCHES=${PATCHDIR}/extra-patch-Tektronix VGAFONT_DESC= install VGA font +VGAFONT_EXTRACT_DEPENDS= \ + ${LOCALBASE}/bin/bdftopcf:x11-fonts/bdftopcf VGAFONT_BUILD_DEPENDS= \ ${LOCALBASE}/bin/mkfontdir:x11-fonts/mkfontdir \ - ${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale \ - ${LOCALBASE}/bin/bdftopcf:x11-fonts/bdftopcf + ${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale NKFCMD= ${LOCALBASE}/bin/nkf -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MVGAFONT} -post-extract: +post-extract-VGAFONT-on: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \ ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} pcemu1.01alpha/vga.bdf cd ${WRKDIR}/pcemu1.01alpha && \ ${LOCALBASE}/bin/bdftopcf vga.bdf | ${GZIP_CMD} > vga.pcf.gz -post-install-vgafont: - ${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \ - ${STAGEDIR}${FONTSDIR} -post-install: post-install-vgafont -.endif + +post-extract-TEKTRONIXEMU-on: + echo "#undef KTERM_NOTEK" >> ${WRKSRC}/kterm.h +post-extract-TEKTRONIXEMU-off: + echo "#undef KTERM_NOTEK" >> ${WRKSRC}/kterm.h + echo "#define KTERM_NOTEK" >> ${WRKSRC}/kterm.h + +post-extract-XAW3DLIB-on: + echo "#undef KTERM_XAW3D" >> ${WRKSRC}/kterm.h + echo "#undef USE_XAW3DLIB" >> ${WRKSRC}/kterm.h + echo "#define KTERM_XAW3D" >> ${WRKSRC}/kterm.h + echo "#define USE_XAW3DLIB" >> ${WRKSRC}/kterm.h +post-extract-XAW3DLIB-off: + echo "#undef KTERM_XAW3D" >> ${WRKSRC}/kterm.h + +post-extract-NEXTAWLIB-on: + echo "#undef KTERM_XAW3D" >> ${WRKSRC}/kterm.h + echo "#undef USE_NEXTAWLIB" >> ${WRKSRC}/kterm.h + echo "#define KTERM_XAW3D" >> ${WRKSRC}/kterm.h + echo "#define USE_NEXTAWLIB" >> ${WRKSRC}/kterm.h +post-extract-NEXTAWLIB-off: + echo "#undef KTERM_XAW3D" >> ${WRKSRC}/kterm.h + +post-extract: + ${ECHO_CMD} "#undef InstallXtermSetUID" >> ${WRKSRC}/kterm.h + ${ECHO_CMD} "#define InstallXtermSetUID 0" >> ${WRKSRC}/kterm.h post-build: ${NKFCMD} -e -u ${WRKSRC}/kterm.jman \ | ${GZIP_CMD} > ${WRKSRC}/kterm.1.gz - post-install: ${INSTALL_MAN} ${WRKSRC}/kterm.1.gz ${STAGEDIR}${MANPREFIX}/man/ja/man1 ${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -93,5 +91,9 @@ post-install: ${DISTDIR}/${DIST_SUBDIR}/README.wallpaper.ja \ ${FILESDIR}/dot.termcap \ ${STAGEDIR}${DOCSDIR} +post-install-VGAFONT-on: + ${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \ + ${STAGEDIR}${FONTSDIR} .include <bsd.port.mk> Modified: head/japanese/kterm/distinfo ============================================================================== --- head/japanese/kterm/distinfo Fri Nov 4 22:35:47 2016 (r425362) +++ head/japanese/kterm/distinfo Fri Nov 4 22:50:21 2016 (r425363) @@ -1,16 +1,5 @@ -SHA256 (kterm/kterm-6.2.0.tar.gz) = ecc965b926483cb97b74d1da5808359fac95d937dfa5e7338395988b1a3afaa5 -SIZE (kterm/kterm-6.2.0.tar.gz) = 200448 -SHA256 (kterm/README.wallpaper.ja) = 6e127e933cc10e0d4966169c813f1bfd09882f887dd3212df828722f622b534c -SIZE (kterm/README.wallpaper.ja) = 1459 +TIMESTAMP = 1478296221 SHA256 (kterm/pcemu1.01alpha.tar.gz) = 0936d3e3b8b6ef36078b40983d10b66971206142ab489c096cc29e94b17852ea SIZE (kterm/pcemu1.01alpha.tar.gz) = 316257 -SHA256 (kterm/kterm-6.2.0.NFS-xauth.patch) = 84adfe3bdd2be7942c250f51158395184956f0e548d62fef375bab1fb86b4268 -SIZE (kterm/kterm-6.2.0.NFS-xauth.patch) = 4137 -SHA256 (kterm/kterm-6.2.0-wpi.patch.gz) = f91f37ef8b9bf84ebfb24b26b43089af25f9756680cbf875320fda774de2b591 -SIZE (kterm/kterm-6.2.0-wpi.patch.gz) = 6629 -SHA256 (kterm/kterm-6.2.0-color16.patch.gz) = 67feedc60950896b448a07663ca1bcecf9daa87dec536b1b09edcc8d6813ec69 -SIZE (kterm/kterm-6.2.0-color16.patch.gz) = 1398 -SHA256 (kterm/kterm-6.2.0-termios-0.2.patch.gz) = 1b460d3a48d4eff80fd224d052d79a7430decc5175138735de6380d372c7e23d -SIZE (kterm/kterm-6.2.0-termios-0.2.patch.gz) = 3084 -SHA256 (kterm/kterm-6.2.0.ext06.patch.gz) = bfbba1cd876f907bde94af775d7cf9fd54857d67faa7eb9bd9b0bf1fe01cf161 -SIZE (kterm/kterm-6.2.0.ext06.patch.gz) = 78729 +SHA256 (kterm/hrs-allbsd-kterm-6.2.0-v6.2.0.fb6_GH0.tar.gz) = 8ebde513d5d765b43c4a8ac44f8e4b8dc452871f661fd7311c20955cf124d487 +SIZE (kterm/hrs-allbsd-kterm-6.2.0-v6.2.0.fb6_GH0.tar.gz) = 276713 Modified: head/japanese/kterm/files/patch-Imakefile ============================================================================== --- head/japanese/kterm/files/patch-Imakefile Fri Nov 4 22:35:47 2016 (r425362) +++ head/japanese/kterm/files/patch-Imakefile Fri Nov 4 22:50:21 2016 (r425363) @@ -1,6 +1,6 @@ ---- Imakefile.orig 2010-01-25 00:56:38.287976000 +0900 -+++ Imakefile 2010-01-25 00:59:31.955886193 +0900 -@@ -13,6 +13,17 @@ +--- Imakefile.orig 2016-11-05 06:41:21.000000000 +0900 ++++ Imakefile 2016-11-05 07:43:25.595182000 +0900 +@@ -13,6 +13,16 @@ XPOLL_DEF = -DNO_XPOLL_H #endif @@ -14,11 +14,10 @@ +#define XawClientLibs -lneXtaw $(XMULIB) $(XTOOLLIB) $(XLIB) +#endif + -+ /* * add -DWTMP and -DLASTLOG if you want them. */ -@@ -27,9 +38,12 @@ +@@ -27,9 +37,12 @@ OSMAJORVERSION = OSMajorVersion OSMINORVERSION = OSMinorVersion @@ -32,7 +31,7 @@ MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ XKB_DEFINES = XkbClientDefines DEFINES = $(XKB_DEFINES) $(XPOLL_DEF) -DKTERM -DSTATUSLINE -DKEEPALIVE -DWALLPAPER -@@ -72,7 +86,7 @@ +@@ -72,7 +85,7 @@ #endif #endif Modified: head/japanese/kterm/pkg-descr ============================================================================== --- head/japanese/kterm/pkg-descr Fri Nov 4 22:35:47 2016 (r425362) +++ head/japanese/kterm/pkg-descr Fri Nov 4 22:50:21 2016 (r425363) @@ -1,16 +1,11 @@ -Kterm is a xterm replacement with Japanese (Kanji) support. It also +Kterm is an xterm replacement with Japanese (Kanji) support. It also understands ANSI color sequences. This version is 6.2.0, available from the X11R6 contrib tape. -Also included is support for Xaw3d arrow-style scrollbars and neXtaw -NeXT-style scrollbars. You can now hold down the arrow buttons to -scroll continuously. +This package includes the following additional patches: -And also included kterm background-wallpaper patch. -This patch is made by Junji Takagi <takagi@an.ip.titech.ac.jp>, -and revised by Takuji Iimura <uirou@mma.club.uec.ac.jp>. - -Finally, this port is made by Satoshi Asami <asami@cs.berkeley.edu>, -and revised by Shigeyuki Fukushima <shige@FreeBSD.ORG>. + - Xaw3d arrow-style scrollbars + - neXtaw NeXT-style scrollbars + - kterm background-wallpaper support WWW: http://bogytech.blogspot.jp/search/label/kterm Modified: head/japanese/kterm/pkg-plist ============================================================================== --- head/japanese/kterm/pkg-plist Fri Nov 4 22:35:47 2016 (r425362) +++ head/japanese/kterm/pkg-plist Fri Nov 4 22:50:21 2016 (r425363) @@ -1,4 +1,6 @@ +@mode 4511 bin/kterm +@mode 0444 man/ja/man1/kterm.1.gz man/man1/kterm.1.gz lib/X11/app-defaults/KTerm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611042250.uA4MoLKa065859>