Bug 168321 - fix japanese/kon2-16dot
Summary: fix japanese/kon2-16dot
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Michael Scheidell
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-05-25 00:40 UTC by TsurutaniNaoki
Modified: 2012-08-07 13:40 UTC (History)
1 user (show)

See Also:


Attachments
kon2.diff (1.14 KB, patch)
2012-08-06 00:04 UTC, TsurutaniNaoki
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description TsurutaniNaoki 2012-05-25 00:40:01 UTC
	pointyhat says japanese/kon2-16dot installs an unwanted file,
	and the port was marked as BROKEN.

Fix: here is a patch to files/patch-src_Makefile.FreeBSD:



I think this problem is caused by some obsolete description in
	/usr/share/mk/bsd.README, about "NO_MAN"; this variable is not used
	any more in any macros.--aKGY2N9YabWMIPkwLdJGCvRsdFT4a4BacyiEOAMAhb4k4W8I
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- patch-src_Makefile.FreeBSD.orig	2012-05-25 07:42:51.000000000 +0900
+++ patch-src_Makefile.FreeBSD.new	2012-05-25 07:58:00.000000000 +0900
@@ -1,6 +1,6 @@
---- src/Makefile.FreeBSD.orig	1997-01-30 10:29:25.000000000 +0900
-+++ src/Makefile.FreeBSD	2012-05-10 02:50:12.820551080 +0900
-@@ -1,10 +1,17 @@
+--- Makefile.FreeBSD.orig	1997-01-30 10:29:25.000000000 +0900
++++ Makefile.FreeBSD	2012-05-25 07:55:58.000000000 +0900
+@@ -1,12 +1,19 @@
  # FreeBSD makefile for kon
  # Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
  
@@ -17,5 +17,8 @@
 +SRCS+=	utmp.c
 +.endif
  LIBS+=	-L${.CURDIR}/display -L${.CURDIR}/../lib -ldisplay -lgon
- NOMAN=	YES
+-NOMAN=	YES
++MK_MAN=	no
  CFLAGS+=	-I${.CURDIR}/../include
+ CLEANFILES=	Makefile
+
Comment 1 Carlo Strub freebsd_committer freebsd_triage 2012-06-11 22:45:54 UTC
Responsible Changed
From-To: freebsd-ports-bugs->cs

I'll take it.
Comment 2 Carlo Strub freebsd_committer freebsd_triage 2012-06-11 23:05:06 UTC
State Changed
From-To: open->feedback

There are several problems with this port and your patch: 
1) there seems to be a fetch problem on the mirror ports.jp.freebsd.org (no route) 
2) there is a failed patch now: 

===>  Patching for ja-kon2-16dot-0.3_6 
===>  Applying FreeBSD patches for ja-kon2-16dot-0.3_6 
1 out of 1 hunks failed--saving rejects to Makefile.FreeBSD.rej 
=> Patch patch-src_Makefile.FreeBSD failed to apply cleanly. 
=> Patch(es) patch-Makefile.FreeBSD patch-doc_CHANGES patch-doc_kon.1 patch-font__defs.h patch-include_fnld.h patch-include_mem.h patch-include_term.h patch-including.c patch-lib_font.c patch-lib_getcap.c patch-lib_mem.c applied cleanly. 
*** Error code 1 

3) Would you like to become maintainer of this port? 

I am looking forward to your new patch.
Comment 3 Carlo Strub freebsd_committer freebsd_triage 2012-07-11 21:18:56 UTC
Responsible Changed
From-To: cs->freebsd-ports-bugs

Back to pool.
Comment 4 TsurutaniNaoki 2012-07-31 10:25:14 UTC
Hello,

I am very sorry taking a long time to reply.

1) ports.jp.freebsd.org will be soon available.

2) The original problem is already fixed at rev.298424 by hrs@.
However, it still remains some warnings and installs man page twice.
Here is a new patch:

--- files/patch-src_Makefile.FreeBSD.orig	2012-05-25 07:42:51.000000000 +0900
+++ files/patch-src_Makefile.FreeBSD	2012-05-25 07:58:00.000000000 +0900
@@ -1,6 +1,6 @@
---- src/Makefile.FreeBSD.orig	1997-01-30 10:29:25.000000000 +0900
-+++ src/Makefile.FreeBSD	2012-05-10 02:50:12.820551080 +0900
-@@ -1,10 +1,17 @@
+--- src/Makefile.FreeBSD.orig	1997-01-30 10:29:25.000000000 +0900
++++ src/Makefile.FreeBSD	2012-05-25 07:55:58.000000000 +0900
+@@ -1,12 +1,19 @@
  # FreeBSD makefile for kon
  # Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
  
@@ -17,5 +17,8 @@
 +SRCS+=	utmp.c
 +.endif
  LIBS+=	-L${.CURDIR}/display -L${.CURDIR}/../lib -ldisplay -lgon
- NOMAN=	YES
+-NOMAN=	YES
++MK_MAN=	no
  CFLAGS+=	-I${.CURDIR}/../include
+ CLEANFILES=	Makefile
+ 

3) I am just a user of this port...  But if no one cannot be a maintainer, 
I will take it rather than watiching this port removed.
Comment 5 Michael Scheidell freebsd_committer freebsd_triage 2012-08-05 22:17:45 UTC
Responsible Changed
From-To: freebsd-ports-bugs->scheidell

I'll take it.
Comment 6 Michael Scheidell freebsd_committer freebsd_triage 2012-08-05 22:26:12 UTC
not sure what went wrong.
for one, your patch seems to have been included 'inline' and not as an 
attachment.
sometimes that breaks things. (and it did not apply cleanly)
you should reply back to his email (group reply), and attach a patch 
that you know applies cleanly.
You should also edit Makefile and change 'maintainer' to your email 
address, and bump portrevision.

Include a diff


please sync up ports tree (as a maintainer, you would find anon 
subversion a good choice:
<http://wiki.freebsd.org/PortsSubversionPrimer>

do a 'svn diff ' (if you use anon subversion), or 'diff -ruN' and attach 
a diff with both the Makefile and patch-src_Makefile.FreeBSD patches.
you might also want to inquire upstream, and see if they won't include 
this in their distro later.

patch -EuN files/patch-src_Makefile.FreeBSD
--- files/patch-src_Makefile.FreeBSD.orig      2012-05-25 
07:42:51.000000000 +0900
  +++ files/patch-src_Makefile.FreeBSD   2012-05-25 07:58:00.000000000 +0900
  @@ -1,6 +1,6 @@
  ---- src/Makefile.FreeBSD.orig 1997-01-30 10:29:25.000000000 +0900
  -+++ src/Makefile.FreeBSD      2012-05-10 02:50:12.820551080 +0900
  -@@ -1,10 +1,17 @@
  +--- src/Makefile.FreeBSD.orig 1997-01-30 10:29:25.000000000 +0900
  ++++ src/Makefile.FreeBSD      2012-05-25 07:55:58.000000000 +0900
  +@@ -1,12 +1,19 @@
    # FreeBSD makefile for kon
    # Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>

  @@ -17,5 +17,8 @@
   +SRCS+=       utmp.c
   +.endif
    LIBS+=       -L${.CURDIR}/display -L${.CURDIR}/../lib -ldisplay -lgon
  - NOMAN=       YES
  +-NOMAN=       YES
  ++MK_MAN=      no
    CFLAGS+=     -I${.CURDIR}/../include
  + CLEANFILES=  Makefile
  +
Hmm...  Looks like a unified diff to me...
(Patch is indented 1 space.)
The text leading up to this was:
--------------------------
|--- files/patch-src_Makefile.FreeBSD.orig      2012-05-25 
07:42:51.000000000 +0900
| +++ files/patch-src_Makefile.FreeBSD   2012-05-25 07:58:00.000000000 +0900
--------------------------
Patching file files/patch-src_Makefile.FreeBSD using Plan A...
Hunk #1 succeeded at 1 with fuzz 2.
Hunk #2 failed at 17.
1 out of 2 hunks failed--saving rejects to 
files/patch-src_Makefile.FreeBSD.rej
done

-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 7 TsurutaniNaoki 2012-08-06 00:04:29 UTC
I am very sorry...
This would be the final one.
Comment 8 Michael Scheidell freebsd_committer freebsd_triage 2012-08-07 13:31:12 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 9 dfilter service freebsd_committer freebsd_triage 2012-08-07 13:31:18 UTC
Author: scheidell
Date: Tue Aug  7 12:31:04 2012
New Revision: 302237
URL: http://svn.freebsd.org/changeset/ports/302237

Log:
  - Fix pointyhat (plist), ubreak
  - Submitter is now maintainer
  
  PR:		ports/168321
  Submitted by:	turutani@scphys.kyoto-u.ac.jp (maintainer)

Modified:
  head/japanese/kon2-16dot/Makefile
  head/japanese/kon2-16dot/files/patch-src_Makefile.FreeBSD

Modified: head/japanese/kon2-16dot/Makefile
==============================================================================
--- head/japanese/kon2-16dot/Makefile	Tue Aug  7 12:26:39 2012	(r302236)
+++ head/japanese/kon2-16dot/Makefile	Tue Aug  7 12:31:04 2012	(r302237)
@@ -7,7 +7,7 @@
 
 PORTNAME=	kon2
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 # '+=' is for slave ports
 CATEGORIES+=	japanese
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
@@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 # '+=' is for slave ports
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	turutani@scphys.kyoto-u.ac.jp
 COMMENT=	Kanji On Console -- Display kanji characters on your own console
 
 ONLY_FOR_ARCHS=	i386 amd64

Modified: head/japanese/kon2-16dot/files/patch-src_Makefile.FreeBSD
==============================================================================
--- head/japanese/kon2-16dot/files/patch-src_Makefile.FreeBSD	Tue Aug  7 12:26:39 2012	(r302236)
+++ head/japanese/kon2-16dot/files/patch-src_Makefile.FreeBSD	Tue Aug  7 12:31:04 2012	(r302237)
@@ -1,6 +1,6 @@
 --- src/Makefile.FreeBSD.orig	1997-01-30 10:29:25.000000000 +0900
 +++ src/Makefile.FreeBSD	2012-05-10 02:50:12.820551080 +0900
-@@ -1,10 +1,17 @@
+@@ -1,12 +1,19 @@
  # FreeBSD makefile for kon
  # Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
  
@@ -17,5 +17,8 @@
 +SRCS+=	utmp.c
 +.endif
  LIBS+=	-L${.CURDIR}/display -L${.CURDIR}/../lib -ldisplay -lgon
- NOMAN=	YES
+-NOMAN=	YES
++MK_MAN=	no
  CFLAGS+=	-I${.CURDIR}/../include
+ CLEANFILES=	Makefile
+
_______________________________________________
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"