japanese/kon2-16dot installs some unexpected (unpatched) files; kon.cfg and kon.1 are ill mentioned. This bug is introduced by SVN rev. 298424. Fix: here is a patch:
Class Changed From-To: sw-bug->maintainer-update Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool)
Hi, I improved your patch. - Fix patching - Replace NOPORTDOCS with PORT_OPTIONS:MDOCS (pet portlint) Each patch you wish to apply should be saved into a file named patch-* where * indicates the pathname of the file that is patched, such as patch-Imakefile or patch-src-config.h. http://www.freebsd.org/doc/en/books/porters-handbook/slow-patch.html So, the correspondence is as follows. patch-src-config.h -> ${WRKSRC}/src/config.h Your patch breaks this rule. (snip) diff -urN kon2-16dot.orig/files/patch-doc_kon.1.in kon2-16dot/files/patch-doc_kon.1.in --- kon2-16dot.orig/files/patch-doc_kon.1.in 1970-01-01 09:00:00.000000000 +0900 +++ kon2-16dot/files/patch-doc_kon.1.in 2013-01-18 11:22:22.000000000 +0900 @@ -0,0 +1,49 @@ +--- src/kon.1.in.orig 1996-09-05 09:13:47.000000000 +0900 ++++ src/kon.1.in 2012-05-10 00:17:11.688553415 +0900 +@@ -11,6 +11,18 @@ + .B -capability + value ... + ] (snip) It should be modified patch-doc_kon.1.in against ${WRKSRC}/doc/kon.1.in to keep the correspondence or renamed to patch-src_kon.1.in based on your patch. I make use of existing patch-doc_kon.1 in this time. Please confirm and test it. Thanks, -- TAKATSU Tomonari
Hi, TAKATSU Tomonari <tota@FreeBSD.org> san, You are quite right. Thank you for your fix.
2013/2/17 Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>: > Hi, TAKATSU Tomonari <tota@FreeBSD.org> san, > > You are quite right. > Thank you for your fix. Thank you for confirming it. I'll take this PR. -- TAKATSU Tomonari
Responsible Changed From-To: freebsd-ports-bugs->tota I'll take it.
Author: tota Date: Sun Feb 17 11:49:50 2013 New Revision: 312413 URL: http://svnweb.freebsd.org/changeset/ports/312413 Log: - Fix patching - Trim Makefile header - Replace NOPORTDOCS with PORT_OPTIONS:MDOCS - Bump PORTREVISION PR: ports/175398 Submitted by: Tsurutani Naoki (maintainer) Modified: head/japanese/kon2-16dot/Makefile head/japanese/kon2-16dot/files/patch-kon.cfg.FreeBSD Modified: head/japanese/kon2-16dot/Makefile ============================================================================== --- head/japanese/kon2-16dot/Makefile Sun Feb 17 11:36:41 2013 (r312412) +++ head/japanese/kon2-16dot/Makefile Sun Feb 17 11:49:50 2013 (r312413) @@ -1,13 +1,9 @@ -# New ports collection makefile for: kon2 with 16dot font -# Date created: 11 Apr 1997 -# Whom: Makoto Matsushita <matusita@jp.freebsd.org> -# +# Created by: Makoto Matsushita <matusita@jp.freebsd.org> # $FreeBSD$ -# PORTNAME= kon2 PORTVERSION= 0.3 -PORTREVISION= 6 +PORTREVISION= 7 # '+=' is for slave ports CATEGORIES+= japanese MASTER_SITES= ${MASTER_SITE_PORTS_JP} @@ -43,7 +39,7 @@ KON14FONT=Startup @${FALSE} .endif -post-extract: +post-patch: cd ${WRKSRC} && \ ${INSTALL_MAN} doc/kon.1 src/kon.1.in && \ ${INSTALL_DATA} kon.cfg.FreeBSD kon.cfg.FreeBSD.in @@ -68,7 +64,7 @@ post-configure: post-install: ${INSTALL_MAN} ${WRKSRC}/src/kon.1 ${MANPREFIX}/man/ja/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif Modified: head/japanese/kon2-16dot/files/patch-kon.cfg.FreeBSD ============================================================================== --- head/japanese/kon2-16dot/files/patch-kon.cfg.FreeBSD Sun Feb 17 11:36:41 2013 (r312412) +++ head/japanese/kon2-16dot/files/patch-kon.cfg.FreeBSD Sun Feb 17 11:49:50 2013 (r312413) @@ -1,5 +1,5 @@ --- kon.cfg.FreeBSD.orig 1997-01-24 02:17:34.000000000 +0900 -+++ kon.cfg.FreeBSD 2012-05-10 00:14:28.042552343 +0900 ++++ kon.cfg.FreeBSD 2013-02-17 09:42:05.000000000 +0900 @@ -114,9 +114,12 @@ 63 63 63 @@ -7,12 +7,12 @@ -bdf-zcat:Startup - gzip -cd /usr/local/lib/fonts/k14.bdf.gz | /usr/local/bin/fld -t bdf -n - gzip -cd /usr/local/lib/fonts/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n -+bdf-zcat16:@@KON16FONT@@ -+ gzip -cd @@PREFIX@@/share/fonts/bdf/jiskan16.bdf.gz | /usr/local/bin/fld -t bdf -n -+ gzip -cd @@PREFIX@@/share/fonts/bdf/8x16rk.bdf.gz | /usr/local/bin/fld -t bdf -n -+bdf-zcat14:@@KON14FONT@@ -+ gzip -cd @@PREFIX@@/share/fonts/bdf/k14.bdf.gz | /usr/local/bin/fld -t bdf -n -+ gzip -cd @@PREFIX@@/share/fonts/bdf/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n ++bdf-zcat16:%%KON16FONT%% ++ gzip -cd %%PREFIX%%/share/fonts/bdf/jiskan16.bdf.gz | /usr/local/bin/fld -t bdf -n ++ gzip -cd %%PREFIX%%/share/fonts/bdf/8x16rk.bdf.gz | /usr/local/bin/fld -t bdf -n ++bdf-zcat14:%%KON14FONT%% ++ gzip -cd %%PREFIX%%/share/fonts/bdf/k14.bdf.gz | /usr/local/bin/fld -t bdf -n ++ gzip -cd %%PREFIX%%/share/fonts/bdf/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n minix: /usr/bin/fld.minix -n /usr/share/fonts/publicfont.ank /usr/bin/fld.minix -n /usr/share/fonts/publicfont.k14 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!