Date: Sat, 1 Feb 2014 13:23:26 +0900 (JST) From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> To: FreeBSD-gnats-submit@freebsd.org Cc: turutani@scphys.kyoto-u.ac.jp Subject: ports/186321: stagify japanese/kon2-16dot Message-ID: <201402010423.s114NQCU025509@h120.65.226.10.32118.vlan.kuins.net> Resent-Message-ID: <201402010430.s114U00w005900@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186321
>Category: ports
>Synopsis: stagify japanese/kon2-16dot
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 01 04:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Tsurutani Naoki
>Release: FreeBSD 8.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 8.4-PRERELEASE FreeBSD 8.4-PRERELEASE #26 r249149: Fri Apr 5 22:13:25 JST 2013 turutani@h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386
>Description:
stagify.
>How-To-Repeat:
>Fix:
fix japanese/kon2-14dot/Makefile should be stagified after this patch.
diff -urN kon2-16dot.orig/Makefile kon2-16dot/Makefile
--- kon2-16dot.orig/Makefile 2014-01-23 02:00:46.000000000 +0900
+++ kon2-16dot/Makefile 2014-01-30 13:11:14.000000000 +0900
@@ -14,19 +14,14 @@
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
# '+=' is for slave ports
-MAINTAINER?= turutani@scphys.kyoto-u.ac.jp
+MAINTAINER= turutani@scphys.kyoto-u.ac.jp
COMMENT= Kanji On Console -- Display kanji characters on your own console
ONLY_FOR_ARCHS= i386 amd64
-MAN1= kon.1
-MANLANG= ja
-
PORTDOCS= README README.FreeBSD
SUB_LIST= KON16FONT=${KON16FONT} \
KON14FONT=${KON14FONT}
-
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if !defined(KONFONT)
@@ -48,6 +43,7 @@
${WRKSRC}/.config::
(${ECHO_CMD} "DISTDIR = ${DISTDIR}"; \
${ECHO_CMD} "TOPDIR = ${PREFIX}"; \
+ ${ECHO_CMD} "S_TOPDIR = ${STAGEDIR}${PREFIX}"; \
${CAT} ${FILESDIR}/dotconfig; \
) > ${WRKSRC}/.config
@@ -64,10 +60,10 @@
done
post-install:
- ${INSTALL_MAN} ${WRKSRC}/src/kon.1 ${MANPREFIX}/man/ja/man1
+ ${INSTALL_MAN} ${WRKSRC}/src/kon.1 ${STAGEDIR}${MANPREFIX}/man/ja/man1
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.post.mk>
diff -urN kon2-16dot.orig/files/dotconfig kon2-16dot/files/dotconfig
--- kon2-16dot.orig/files/dotconfig 2012-07-14 22:54:48.000000000 +0900
+++ kon2-16dot/files/dotconfig 2014-01-31 10:59:36.000000000 +0900
@@ -1,10 +1,10 @@
# $FreeBSD: japanese/kon2-16dot/files/dotconfig 300896 2012-07-14 13:54:48Z beat $
-BINDIR = $(TOPDIR)/bin
-LIBDIR = $(TOPDIR)/etc
-MANDIR = $(TOPDIR)/man/ja/man
-FONTDIR = $(TOPDIR)/share/fonts/bdf
+BINDIR = $(S_TOPDIR)/bin
+LIBDIR = $(S_TOPDIR)/etc
+MANDIR = $(S_TOPDIR)/man/ja/man
+FONTDIR = $(S_TOPDIR)/share/fonts/bdf
CONFIG_NAME = kon.cfg
-CFLAGS += -DCONFIG_NAME=\"$(LIBDIR)/$(CONFIG_NAME)\"
+CFLAGS += -DCONFIG_NAME=\"$(TOPDIR)/etc/$(CONFIG_NAME)\"
HAS_VGA = HAS_VGA
FLD_MINIX = FLD_MINIX
diff -urN kon2-16dot.orig/files/patch-Makefile.FreeBSD kon2-16dot/files/patch-Makefile.FreeBSD
--- kon2-16dot.orig/files/patch-Makefile.FreeBSD 2014-01-23 02:40:44.000000000 +0900
+++ kon2-16dot/files/patch-Makefile.FreeBSD 2014-01-31 10:28:44.000000000 +0900
@@ -13,10 +13,10 @@
(cd ${.CURDIR}/src ; make install)
(cd ${.CURDIR}/font ; make install)
- install -g wheel -o root -m 0644 -c kon.cfg.FreeBSD /usr/local/etc/kon.cfg
-+ install -g wheel -o root -m 0644 -c kon.cfg.FreeBSD ${LIBDIR}/kon.cfg
++ install -m 0644 -c kon.cfg.FreeBSD ${LIBDIR}/kon.cfg
+ @sh tools/makedir ${FONTDIR}
+ @for i in k14.bdf 7x14rk.bdf jiskan16.bdf 8x16rk.bdf; do\
-+ install -c -m 644 -o bin -g bin $(DISTDIR)/$$i ${FONTDIR};\
++ install -c -m 644 $(DISTDIR)/$$i ${FONTDIR};\
+ gzip -f -9 ${FONTDIR}/$$i;\
+ done
diff -urN kon2-16dot.orig/files/patch-font_Makefile.FreeBSD kon2-16dot/files/patch-font_Makefile.FreeBSD
--- kon2-16dot.orig/files/patch-font_Makefile.FreeBSD 2014-01-23 02:40:44.000000000 +0900
+++ kon2-16dot/files/patch-font_Makefile.FreeBSD 2014-01-31 11:09:52.000000000 +0900
@@ -1,5 +1,5 @@
--- font/Makefile.FreeBSD.orig 1997-01-25 19:08:44.000000000 +0900
-+++ font/Makefile.FreeBSD 2012-05-10 00:14:28.693551770 +0900
++++ font/Makefile.FreeBSD 2014-01-31 11:01:37.000000000 +0900
@@ -11,6 +11,7 @@
.endif
@@ -8,3 +8,11 @@
.if exists(${.OBJDIR}/../lib)
LIBOBJ= -L${.OBJDIR}/../lib
+@@ -20,4 +21,7 @@
+
+ LDADD= ${LIBOBJ} -lgon
+
++install: ${PROG}
++ /usr/bin/install -s ${PROG} ${BINDIR}
++
+ .include <bsd.prog.mk>
diff -urN kon2-16dot.orig/files/patch-src_Makefile.FreeBSD kon2-16dot/files/patch-src_Makefile.FreeBSD
--- kon2-16dot.orig/files/patch-src_Makefile.FreeBSD 2014-01-23 02:40:44.000000000 +0900
+++ kon2-16dot/files/patch-src_Makefile.FreeBSD 2014-01-31 11:09:40.000000000 +0900
@@ -1,14 +1,14 @@
--- src/Makefile.FreeBSD.orig 1997-01-30 10:29:25.000000000 +0900
-+++ src/Makefile.FreeBSD 2012-05-10 02:50:12.820551080 +0900
-@@ -1,12 +1,19 @@
++++ src/Makefile.FreeBSD 2014-01-31 10:53:18.000000000 +0900
+@@ -1,12 +1,17 @@
# FreeBSD makefile for kon
# Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
+.include <bsd.own.mk>
+
PROG= kon
- BINOWN= root
- BINMODE= 4555
+-BINOWN= root
+-BINMODE= 4555
-SRCS= vt.c sock.c fnld.c vc.c mouse.c term.c main.c utmp.c errors.c child.c
+SRCS= vt.c sock.c fnld.c vc.c mouse.c term.c main.c errors.c child.c
+.if exists(${INCLUDEDIR}/utmpx.h)
@@ -21,4 +21,12 @@
+MK_MAN= no
CFLAGS+= -I${.CURDIR}/../include
CLEANFILES= Makefile
-
+
+@@ -28,4 +33,7 @@
+ .include "${.CURDIR}/../.config"
+ .endif
+
++install: ${PROG}
++ /usr/bin/install -s ${PROG} ${BINDIR}
++
+ .include <bsd.prog.mk>
diff -urN kon2-16dot.orig/pkg-plist kon2-16dot/pkg-plist
--- kon2-16dot.orig/pkg-plist 2014-01-23 00:16:56.000000000 +0900
+++ kon2-16dot/pkg-plist 2014-01-31 10:36:04.000000000 +0900
@@ -1,9 +1,16 @@
bin/fld
+@mode 4555
bin/kon
+@mode
etc/kon.cfg
+@owner bin
+@group bin
share/fonts/bdf/7x14rk.bdf.gz
share/fonts/bdf/k14.bdf.gz
share/fonts/bdf/8x16rk.bdf.gz
share/fonts/bdf/jiskan16.bdf.gz
+@owner
+@group
+man/ja/man1/kon.1.gz
@dirrm share/fonts/bdf
@dirrmtry share/fonts
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402010423.s114NQCU025509>