From owner-svn-ports-all@FreeBSD.ORG Tue Aug 26 20:52:23 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A02DDA3; Tue, 26 Aug 2014 20:52:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B26E3C64; Tue, 26 Aug 2014 20:52:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QKqMkW008942; Tue, 26 Aug 2014 20:52:22 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QKqLfG008935; Tue, 26 Aug 2014 20:52:21 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408262052.s7QKqLfG008935@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 26 Aug 2014 20:52:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366267 - in head/japanese/man: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 20:52:23 -0000 Author: marino Date: Tue Aug 26 20:52:21 2014 New Revision: 366267 URL: http://svnweb.freebsd.org/changeset/ports/366267 QAT: https://qat.redports.org/buildarchive/r366267/ Log: Stage japanese/man PR: 193007 Submitted by: turutani (scphys.kyoto-uc.ac.jp) Added: head/japanese/man/files/patch-apropos__Makefile (contents, props changed) head/japanese/man/files/patch-catman__Makefile (contents, props changed) head/japanese/man/files/patch-makewhatis__Makefile (contents, props changed) head/japanese/man/files/patch-man__Makefile (contents, props changed) head/japanese/man/files/patch-manpath__Makefile (contents, props changed) Deleted: head/japanese/man/files/patch-aa head/japanese/man/files/patch-ab head/japanese/man/files/patch-man-Makefile head/japanese/man/pkg-install Modified: head/japanese/man/Makefile head/japanese/man/pkg-plist Modified: head/japanese/man/Makefile ============================================================================== --- head/japanese/man/Makefile Tue Aug 26 20:39:05 2014 (r366266) +++ head/japanese/man/Makefile Tue Aug 26 20:52:21 2014 (r366267) @@ -16,18 +16,16 @@ PATCH_DIST_STRIP=-p1 MAINTAINER= ports@FreeBSD.org COMMENT= Manual display command for Japanese (EUC) +LICENSE= GPLv2 + RUN_DEPENDS= ${LOCALBASE}/bin/groff:${PORTSDIR}/japanese/groff \ jless:${PORTSDIR}/japanese/less MAKE_ENV= GZCAT=${GZCAT} GZIP_CMD="${GZIP_CMD}" +USES+= shebangfix +SHEBANG_FILES= catman/catman.perl makewhatis/makewhatis.perl +SHEBANG_LANG= perl -MANLANG= "" ja -MAN1= jman.1 jmanpath.1 japropos.1 \ - jwhatis.1 jmakewhatis.1 jcatman.1 -MAN8= jmakewhatis.local.8 jcatman.local.8 -MANCOMPRESSED= yes - -NO_STAGE= yes post-patch: .for file in apropos/apropos.sh catman/catman.perl \ makewhatis/jmakewhatis.local.man \ @@ -37,8 +35,4 @@ post-patch: ${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/${file} .endfor -pre-install: - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - .include Added: head/japanese/man/files/patch-apropos__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/man/files/patch-apropos__Makefile Tue Aug 26 20:52:21 2014 (r366267) @@ -0,0 +1,51 @@ +--- apropos/Makefile.orig 1997-12-07 19:59:21.000000000 +0900 ++++ apropos/Makefile 2014-08-26 12:06:55.000000000 +0900 +@@ -8,7 +8,7 @@ + TARG= ${.CURDIR}/japropos + .endif + +-MLINKS= japropos.1 jwhatis.1 ++#MLINKS= japropos.1 jwhatis.1 + + MANDEPEND= ${MAN1} + +@@ -37,28 +37,24 @@ + ${.CURDIR}/japropos.man.eng | \ + ${compress} > ${.TARGET} + +-install: ${TARG} maninstall after_maninstall +- ${INSTALL} -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}${BINDIR} +- ln -f ${DESTDIR}${BINDIR}/japropos ${DESTDIR}${BINDIR}/jwhatis ++install: ${TARG} man_install after_maninstall ++ ${INSTALL} -m 555 ${TARG} ${DESTDIR}${BINDIR} ++ ln -sf japropos ${DESTDIR}${BINDIR}/jwhatis ++ ++.if !defined(NO_MAN) ++man_install: ${MAN1} ++ ${INSTALL} -m 444 ${MAN1} ${DESTDIR}${MANDIR}1 ++ ln -sf japropos.1.gz ${DESTDIR}${MANDIR}1/jwhatis.1.gz + +-.if !defined(NOMAN) + after_maninstall: ${EMAN1} +- ${INSTALL} -c -o bin -g bin -m 444 ${EMAN1} \ ++ ${INSTALL} -m 444 ${EMAN1} \ + ${DESTDIR}${EMANDIR}1/japropos.1.gz +- ln -f ${DESTDIR}${EMANDIR}1/japropos.1.gz \ +- ${DESTDIR}${EMANDIR}1/jwhatis.1.gz ++ ln -sf japropos.1.gz ${DESTDIR}${EMANDIR}1/jwhatis.1.gz + .else ++man_install: + after_maninstall: + .endif + + .include "../Makefile.inc" + +-.if make(maninstall) || make(install) +-.if !defined(NOMAN) +-.include +-.elif !target(maninstall) +-maninstall: +-.endif +-.endif +- + .include Added: head/japanese/man/files/patch-catman__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/man/files/patch-catman__Makefile Tue Aug 26 20:52:21 2014 (r366267) @@ -0,0 +1,36 @@ +--- catman/Makefile.orig 1997-12-07 22:11:06.000000000 +0900 ++++ catman/Makefile 2014-08-26 12:08:09.000000000 +0900 +@@ -37,25 +37,21 @@ + ${.CURDIR}/jcatman.man.eng | \ + ${compress} > ${.TARGET} + +-install: ${TARG} maninstall after_maninstall +- ${INSTALL} -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}${BINDIR} ++install: ${TARG} man_install after_maninstall ++ ${INSTALL} -m 555 ${TARG} ${DESTDIR}${BINDIR} ++ ++.if !defined(NO_MAN) ++man_install: ${MAN1} ++ ${INSTALL} -m 444 ${MAN1} ${DESTDIR}${MANDIR}1 + +-.if !defined(NOMAN) + after_maninstall: ${EMAN1} +- ${INSTALL} -c -o bin -g bin -m 444 ${EMAN1} \ ++ ${INSTALL} -m 444 ${EMAN1} \ + ${DESTDIR}${EMANDIR}1/jcatman.1.gz + .else ++man_install: + after_maninstall: + .endif + + .include "../Makefile.inc" + +-.if make(maninstall) || make(install) +-.if !defined(NOMAN) +-.include +-.elif !target(maninstall) +-maninstall: +-.endif +-.endif +- + .include Added: head/japanese/man/files/patch-makewhatis__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/man/files/patch-makewhatis__Makefile Tue Aug 26 20:52:21 2014 (r366267) @@ -0,0 +1,58 @@ +--- makewhatis/Makefile.orig 1999-09-03 22:58:03.000000000 +0900 ++++ makewhatis/Makefile 2014-08-26 12:08:52.000000000 +0900 +@@ -24,7 +24,7 @@ + TARG2= ${.CURDIR}/jmakewhatis.local + .endif + +-MLINKS= jmakewhatis.local.8 jcatman.local.8 ++#MLINKS= jmakewhatis.local.8 jcatman.local.8 + + MANDEPEND= ${MAN1} ${MAN8} + +@@ -70,32 +70,28 @@ + ${.CURDIR}/jmakewhatis.local.man.eng | \ + ${compress} > ${.TARGET} + +-install: ${TARG} ${TARG2} maninstall after_maninstall +- ${INSTALL} -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}${BINDIR} +- ${INSTALL} -c -o bin -g bin -m 555 ${TARG2} ${DESTDIR}${libexecdir} +- ln -f ${DESTDIR}${libexecdir}/jmakewhatis.local \ +- ${DESTDIR}${libexecdir}/jcatman.local ++install: ${TARG} ${TARG2} man_install after_maninstall ++ ${INSTALL} -m 555 ${TARG} ${DESTDIR}${BINDIR} ++ ${INSTALL} -m 555 ${TARG2} ${DESTDIR}${libexecdir} ++ ln -sf jmakewhatis.local ${DESTDIR}${libexecdir}/jcatman.local ++ ++.if !defined(NO_MAN) ++man_install: ${MAN1} ${MAN8} ++ ${INSTALL} -m 444 ${MAN1} ${DESTDIR}${MANDIR}1 ++ ${INSTALL} -m 444 ${MAN8} ${DESTDIR}${MANDIR}8 ++ ln -sf jmakewhatis.local.8.gz ${DESTDIR}${MANDIR}8/jcatman.local.8.gz + +-.if !defined(NOMAN) + after_maninstall: ${EMAN1} ${EMAN8} +- ${INSTALL} -c -o bin -g bin -m 444 ${EMAN1} \ ++ ${INSTALL} -m 444 ${EMAN1} \ + ${DESTDIR}${EMANDIR}1/jmakewhatis.1.gz +- ${INSTALL} -c -o bin -g bin -m 444 ${EMAN8} \ ++ ${INSTALL} -m 444 ${EMAN8} \ + ${DESTDIR}${EMANDIR}8/jmakewhatis.local.8.gz +- ln -f ${DESTDIR}${EMANDIR}8/jmakewhatis.local.8.gz \ +- ${DESTDIR}${EMANDIR}8/jcatman.local.8.gz ++ ln -sf jmakewhatis.local.8.gz ${DESTDIR}${EMANDIR}8/jcatman.local.8.gz + .else ++man_install: + after_maninstall: + .endif + + .include "../Makefile.inc" + +-.if make(maninstall) || make(install) +-.if !defined(NOMAN) +-.include +-.elif !target(maninstall) +-maninstall: +-.endif +-.endif +- + .include Added: head/japanese/man/files/patch-man__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/man/files/patch-man__Makefile Tue Aug 26 20:52:21 2014 (r366267) @@ -0,0 +1,42 @@ +--- man/Makefile.orig 2014-08-26 12:12:08.000000000 +0900 ++++ man/Makefile 2014-08-26 12:12:36.000000000 +0900 +@@ -10,14 +10,14 @@ + SRCS= man.c manpath.c glob.c locale.c + MAN1= jman.1 + EMAN1= jman.1.eng.gz +-BINOWN= man +-BINMODE=4555 +-INSTALLFLAGS+= -fschg ++#BINOWN= man ++#BINMODE=4555 ++#INSTALLFLAGS+= -fschg + + CFLAGS+= -g -I${LIBDESTDIR} + DPADD= ${LIBMAN} + LDADD= ${LIBMAN} +-.if exists(/usr/lib/libxpg4.a) ++.if ${OSVERSION} < 400020 + LDADD+= -L/usr/lib -lxpg4 + .endif + +@@ -48,11 +48,18 @@ + ${.CURDIR}/jman.man.eng | \ + ${compress} > ${EMAN1} + +-.if !defined(NOMAN) ++install: ${PROG} man_install afterinstall ++ ${INSTALL} -s -m 555 ${PROG} ${DESTDIR}/${BINDIR} ++ ++.if !defined(NO_MAN) ++man_install: ${MAN1} ++ ${INSTALL} -m 444 ${MAN1} ${DESTDIR}${MANDIR}1 ++ + afterinstall: ${EMAN1} +- ${INSTALL} -c -o bin -g bin -m 444 ${EMAN1} \ ++ ${INSTALL} -m 444 ${EMAN1} \ + ${DESTDIR}${EMANDIR}1/jman.1.gz + .else ++man_install: + afterinstall: + .endif + Added: head/japanese/man/files/patch-manpath__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/man/files/patch-manpath__Makefile Tue Aug 26 20:52:21 2014 (r366267) @@ -0,0 +1,24 @@ +--- manpath/Makefile.orig 2001-06-11 21:25:34.000000000 +0900 ++++ manpath/Makefile 2014-08-26 12:10:04.000000000 +0900 +@@ -24,10 +24,19 @@ + ${.CURDIR}/jmanpath.man.eng | \ + ${compress} > ${EMAN1} + +-.if !defined(NOMAN) ++install: ${PROG} man_install afterinstall ++ ${INSTALL} -s -m 555 ${PROG} ${DESTDIR}/${BINDIR} ++ ++.if !defined(NO_MAN) ++man_install: ${MAN1} ++ ${INSTALL} -m 444 ${MAN1} ${DESTDIR}${MANDIR}1 ++ + afterinstall: ${EMAN1} +- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${EMAN1} \ ++ ${INSTALL} -m 444 ${EMAN1} \ + ${DESTDIR}${EMANDIR}1/jmanpath.1.gz ++.else ++man_install: ++afterinstall: + .endif + + .include "../Makefile.inc" Modified: head/japanese/man/pkg-plist ============================================================================== --- head/japanese/man/pkg-plist Tue Aug 26 20:39:05 2014 (r366266) +++ head/japanese/man/pkg-plist Tue Aug 26 20:52:21 2014 (r366267) @@ -1,9 +1,31 @@ bin/jmanpath -@unexec chflags noschg %B/jman +@owner man +@mode 4555 bin/jman +@owner bin +@group bin +@mode bin/japropos bin/jwhatis bin/jmakewhatis bin/jcatman libexec/jmakewhatis.local libexec/jcatman.local +@owner +@group +man/man1/jman.1.gz +man/man1/jmanpath.1.gz +man/man1/japropos.1.gz +man/man1/jwhatis.1.gz +man/man1/jmakewhatis.1.gz +man/man1/jcatman.1.gz +man/man8/jmakewhatis.local.8.gz +man/man8/jcatman.local.8.gz +man/ja/man1/jman.1.gz +man/ja/man1/jmanpath.1.gz +man/ja/man1/japropos.1.gz +man/ja/man1/jwhatis.1.gz +man/ja/man1/jmakewhatis.1.gz +man/ja/man1/jcatman.1.gz +man/ja/man8/jmakewhatis.local.8.gz +man/ja/man8/jcatman.local.8.gz