From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 12 18:40:06 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F278F7A7 for ; Sun, 12 Jan 2014 18:40:06 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D04FB169F for ; Sun, 12 Jan 2014 18:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CIe6IA049419 for ; Sun, 12 Jan 2014 18:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s0CIe6Xa049418; Sun, 12 Jan 2014 18:40:06 GMT (envelope-from gnats) Resent-Date: Sun, 12 Jan 2014 18:40:06 GMT Resent-Message-Id: <201401121840.s0CIe6Xa049418@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9C69533 for ; Sun, 12 Jan 2014 18:30:50 +0000 (UTC) Received: from omta02.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67]) by mx1.freebsd.org (Postfix) with ESMTP id A8E8015AF for ; Sun, 12 Jan 2014 18:30:50 +0000 (UTC) Received: from coppermine.my.domain (ZT029149.ppp.dion.ne.jp [59.128.29.149]) by omta02.auone-net.jp (au one net mail) with ESMTP id 751C3156000F for ; Mon, 13 Jan 2014 03:30:46 +0900 (JST) Message-Id: <20140113031922.f8b5fd7194811acf22361253@yahoo.com> Date: Mon, 13 Jan 2014 03:19:22 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185704: emulators/klh10: Fix build on -current X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 18:40:07 -0000 >Number: 185704 >Category: ports >Synopsis: emulators/klh10: Fix build on -current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jan 12 18:40:06 UTC 2014 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Fix build on -current New file: files/pkg-message.in >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/klh10/Makefile emulators/klh10/Makefile --- /usr/ports/emulators/klh10/Makefile 2013-11-06 22:06:26.000000000 +0900 +++ emulators/klh10/Makefile 2014-01-13 00:00:00.000000000 +0900 @@ -3,6 +3,7 @@ PORTNAME= klh10 PORTVERSION= 2.0a +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://klh10.trailing-edge.com/ DISTFILES= ${DISTNAME}.tgz klh10-2.0a-aux.tgz @@ -15,19 +16,17 @@ BUILD_WRKSRC= ${WRKSRC}/bld/fbx86 INSTALL_WRKSRC= ${BUILD_WRKSRC} -# KSITS_ prefix for Komputer Small Incompatible Timesharing System -# a KLH10 configuration. +# someday add support for base-kl and base-ks targets +MAKE_ENV= KLH10_HOME="${DATADIR}" +ALL_TARGET= base-ks-its + +SUB_FILES= pkg-message -# KSITS_KLH10_HOME and KSITS_DRIVER_DIR must be set to the same -# locations that the its port uses. +DATADIR= ${PREFIX}/share/${KSITS_KLH10_DIR} +DOCSDIR= ${PREFIX}/share/doc/${KSITS_KLH10_DIR} KSITS_KLH10_DIR= klh10-ks-its -KSITS_KLH10_HOME= ${PREFIX}/share/${KSITS_KLH10_DIR} KSITS_DRIVER_DIR= ${PREFIX}/libexec/${KSITS_KLH10_DIR} -KSITS_DOCDIR= ${PREFIX}/share/doc/${KSITS_KLH10_DIR} -# someday add support for base-kl and base-ks targets -MAKE_ENV+= KLH10_HOME=${KSITS_KLH10_HOME} -ALL_TARGET= base-ks-its KSITS_NATIVE_PROGS= kn10-ks \ tapedd \ @@ -76,47 +75,47 @@ utils.txt \ vtape.txt -NO_STAGE= yes -pre-install: - @ ${MKDIR} ${KSITS_KLH10_HOME} - @ ${MKDIR} ${KSITS_DRIVER_DIR} - @ ${MKDIR} ${KSITS_DOCDIR} - -post-install: -.for file in ${KSITS_NATIVE_PROGS} ${KSITS_EM_DRIVERS} ${KSITS_EM_SDRIVERS} - @ ${STRIP_CMD} ${KSITS_KLH10_HOME}/${file} -.endfor -.for file in ${KSITS_NATIVE_PROGS} - @ ${MV} ${KSITS_KLH10_HOME}/${file} ${PREFIX}/bin -.endfor -.for file in ${KSITS_EM_DRIVERS} ${KSITS_EM_SDRIVERS} - @ ${MV} ${KSITS_KLH10_HOME}/${file} ${KSITS_DRIVER_DIR} -.endfor -.for file in ${KSITS_EM_SDRIVERS} - @ ${CHGRP} network ${KSITS_DRIVER_DIR}/${file} - @ ${CHMOD} 4754 ${KSITS_DRIVER_DIR}/${file} -.endfor -.for file in ${KSITS_EM_DAT} - @ ${INSTALL_DATA} ${WRKSRC}/run/ksits/${file} ${KSITS_KLH10_HOME} -.endfor - @ ${INSTALL_MAN} ${WRKSRC}/run/ksits/README ${KSITS_DOCDIR} - @ ${MKDIR} ${KSITS_DOCDIR}/pubits/adm - @ ${MKDIR} ${KSITS_DOCDIR}/pubits/doc -.for file in ${KSITS_DOCS} - @ ${INSTALL_MAN} ${WRKSRC}/doc/${file} ${KSITS_DOCDIR} -.endfor -.for file in ${KSITS_PUBADM} - @ ${INSTALL_MAN} ${WRKSRC}/run/ksits/pubits/adm/${file} \ - ${KSITS_DOCDIR}/pubits/adm -.endfor -.for file in ${KSITS_PUBDOC} - @ ${INSTALL_MAN} ${WRKSRC}/run/ksits/pubits/doc/${file} \ - ${KSITS_DOCDIR}/pubits/doc -.endfor - @ ${INSTALL_MAN} ${FILESDIR}/PDPs ${KSITS_DOCDIR} - @ ${ECHO} !!! KLH10 contains a setuid that accepts network connections. - @ ${ECHO} !!! Consider using a firewall to limit access to KLH10. - @ ${ECHO} !!! See the ${KSITS_DOCDIR}/pubits/adm - @ ${ECHO} !!! for firewall documentation. +post-patch: + @${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|logf |log_f |g ; \ + s|logf,|log_f,|g ; \ + s|logf;|log_f;|g ; \ + s|logf)|log_f)|g' + +do-install: +.for i in ${KSITS_NATIVE_PROGS} + cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} ${i} \ + ${STAGEDIR}${PREFIX}/bin +.endfor + @ ${MKDIR} ${STAGEDIR}${KSITS_DRIVER_DIR} +.for i in ${KSITS_EM_DRIVERS} ${KSITS_EM_SDRIVERS} + cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} ${i} \ + ${STAGEDIR}${KSITS_DRIVER_DIR} +.endfor + @ ${MKDIR} ${STAGEDIR}${DATADIR} +.for i in ${KSITS_EM_DAT} + cd ${WRKSRC}/run/ksits && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DATADIR} +.endfor + @ ${MKDIR} ${STAGEDIR}${DATADIR}/flushed + @ ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${FILESDIR} && ${INSTALL_DATA} PDPs \ + ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/run/ksits && ${INSTALL_DATA} README \ + ${STAGEDIR}${DOCSDIR} +.for i in ${KSITS_DOCS} + cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DOCSDIR} +.endfor + @ ${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/adm +.for i in ${KSITS_PUBADM} + cd ${WRKSRC}/run/ksits/pubits/adm && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DOCSDIR}/pubits/adm +.endfor + @ ${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/doc +.for i in ${KSITS_PUBDOC} + cd ${WRKSRC}/run/ksits/pubits/doc && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DOCSDIR}/pubits/doc +.endfor .include diff -urN /usr/ports/emulators/klh10/files/patch-aa emulators/klh10/files/patch-aa --- /usr/ports/emulators/klh10/files/patch-aa 2013-11-06 22:06:26.000000000 +0900 +++ emulators/klh10/files/patch-aa 2014-01-13 00:00:00.000000000 +0900 @@ -5,7 +5,7 @@ # Build definitions SRC = ../../src -CFLAGS = -c -g3 -O -I. -I$(SRC) -+CFLAGS += -c -g3 -O -I. -I$(SRC) ++CFLAGS += -c -I. -I$(SRC) CFLAGS_LINT = -ansi -pedantic -Wall -Wshadow \ -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wredundant-decls diff -urN /usr/ports/emulators/klh10/files/pkg-message.in emulators/klh10/files/pkg-message.in --- /usr/ports/emulators/klh10/files/pkg-message.in 1970-01-01 09:00:00.000000000 +0900 +++ emulators/klh10/files/pkg-message.in 2014-01-13 00:00:00.000000000 +0900 @@ -0,0 +1,4 @@ +!!! KLH10 contains a setuid that accepts network connections. +!!! Consider using a firewall to limit access to KLH10. +!!! See the %%DOCSDIR%%/pubits/adm +!!! for firewall documentation. diff -urN /usr/ports/emulators/klh10/pkg-plist emulators/klh10/pkg-plist --- /usr/ports/emulators/klh10/pkg-plist 2013-11-06 22:06:26.000000000 +0900 +++ emulators/klh10/pkg-plist 2014-01-13 00:00:00.000000000 +0900 @@ -4,46 +4,51 @@ bin/vdkfmt bin/wfconv bin/wxtest +@group network +@mode 4554 libexec/klh10-ks-its/dpimp +@mode +@group libexec/klh10-ks-its/dprpxx libexec/klh10-ks-its/dptm03 -share/klh10-ks-its/@.ddt-u -share/klh10-ks-its/@.its-647kn-u -share/klh10-ks-its/@.nsalv-260-u -share/klh10-ks-its/itsbin.647kn-u -share/klh10-ks-its/klh10-kn.ini -%%PORTDOCS%%share/doc/klh10-ks-its/pubits/adm/hosts.its -%%PORTDOCS%%share/doc/klh10-ks-its/pubits/adm/its.ipfw -%%PORTDOCS%%share/doc/klh10-ks-its/pubits/adm/rc.firewall-its -%%PORTDOCS%%share/doc/klh10-ks-its/pubits/adm/router.notes -%%PORTDOCS%%share/doc/klh10-ks-its/pubits/doc/bootload.files -%%PORTDOCS%%share/doc/klh10-ks-its/pubits/doc/distrib.its -%%PORTDOCS%%share/doc/klh10-ks-its/pubits/doc/dumpsys.help -%%PORTDOCS%%share/doc/klh10-ks-its/Intro.txt -%%PORTDOCS%%share/doc/klh10-ks-its/backgrnd.txt -%%PORTDOCS%%share/doc/klh10-ks-its/cmdref.txt -%%PORTDOCS%%share/doc/klh10-ks-its/cmdsum.txt -%%PORTDOCS%%share/doc/klh10-ks-its/coding.txt -%%PORTDOCS%%share/doc/klh10-ks-its/dfkfb.txt -%%PORTDOCS%%share/doc/klh10-ks-its/dvhost.txt -%%PORTDOCS%%share/doc/klh10-ks-its/history.txt -%%PORTDOCS%%share/doc/klh10-ks-its/install.txt -%%PORTDOCS%%share/doc/klh10-ks-its/kldiff.txt -%%PORTDOCS%%share/doc/klh10-ks-its/klt10.txt -%%PORTDOCS%%share/doc/klh10-ks-its/klt20.txt -%%PORTDOCS%%share/doc/klh10-ks-its/ksits.txt -%%PORTDOCS%%share/doc/klh10-ks-its/kst10.txt -%%PORTDOCS%%share/doc/klh10-ks-its/kst20.txt -%%PORTDOCS%%share/doc/klh10-ks-its/news.txt -%%PORTDOCS%%share/doc/klh10-ks-its/PDPs -%%PORTDOCS%%share/doc/klh10-ks-its/README -%%PORTDOCS%%share/doc/klh10-ks-its/usage.txt -%%PORTDOCS%%share/doc/klh10-ks-its/utils.txt -%%PORTDOCS%%share/doc/klh10-ks-its/vtape.txt -@dirrm share/klh10-ks-its/flushed -@dirrm share/klh10-ks-its +%%PORTDOCS%%%%DOCSDIR%%/Intro.txt +%%PORTDOCS%%%%DOCSDIR%%/PDPs +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/backgrnd.txt +%%PORTDOCS%%%%DOCSDIR%%/cmdref.txt +%%PORTDOCS%%%%DOCSDIR%%/cmdsum.txt +%%PORTDOCS%%%%DOCSDIR%%/coding.txt +%%PORTDOCS%%%%DOCSDIR%%/dfkfb.txt +%%PORTDOCS%%%%DOCSDIR%%/dvhost.txt +%%PORTDOCS%%%%DOCSDIR%%/history.txt +%%PORTDOCS%%%%DOCSDIR%%/install.txt +%%PORTDOCS%%%%DOCSDIR%%/kldiff.txt +%%PORTDOCS%%%%DOCSDIR%%/klt10.txt +%%PORTDOCS%%%%DOCSDIR%%/klt20.txt +%%PORTDOCS%%%%DOCSDIR%%/ksits.txt +%%PORTDOCS%%%%DOCSDIR%%/kst10.txt +%%PORTDOCS%%%%DOCSDIR%%/kst20.txt +%%PORTDOCS%%%%DOCSDIR%%/news.txt +%%PORTDOCS%%%%DOCSDIR%%/pubits/adm/hosts.its +%%PORTDOCS%%%%DOCSDIR%%/pubits/adm/its.ipfw +%%PORTDOCS%%%%DOCSDIR%%/pubits/adm/rc.firewall-its +%%PORTDOCS%%%%DOCSDIR%%/pubits/adm/router.notes +%%PORTDOCS%%%%DOCSDIR%%/pubits/doc/bootload.files +%%PORTDOCS%%%%DOCSDIR%%/pubits/doc/distrib.its +%%PORTDOCS%%%%DOCSDIR%%/pubits/doc/dumpsys.help +%%PORTDOCS%%%%DOCSDIR%%/usage.txt +%%PORTDOCS%%%%DOCSDIR%%/utils.txt +%%PORTDOCS%%%%DOCSDIR%%/vtape.txt +%%DATADIR%%/@.ddt-u +%%DATADIR%%/@.its-647kn-u +%%DATADIR%%/@.nsalv-260-u +%%DATADIR%%/itsbin.647kn-u +%%DATADIR%%/klh10-kn.ini +@exec mkdir -p %D/%%DATADIR%%/flushed +@dirrmtry %%DATADIR%%/flushed +@dirrmtry %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/pubits/doc +%%PORTDOCS%%@dirrm %%DOCSDIR%%/pubits/adm +%%PORTDOCS%%@dirrm %%DOCSDIR%%/pubits +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/klh10-ks-its -%%PORTDOCS%%@dirrm share/doc/klh10-ks-its/pubits/adm -%%PORTDOCS%%@dirrm share/doc/klh10-ks-its/pubits/doc -%%PORTDOCS%%@dirrm share/doc/klh10-ks-its/pubits -%%PORTDOCS%%@dirrm share/doc/klh10-ks-its >Release-Note: >Audit-Trail: >Unformatted: