From owner-freebsd-bugs Wed Jan 16 3:10:29 2002 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D7E3B37B416 for ; Wed, 16 Jan 2002 03:10:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g0GBA1M60101; Wed, 16 Jan 2002 03:10:01 -0800 (PST) (envelope-from gnats) Date: Wed, 16 Jan 2002 03:10:01 -0800 (PST) Message-Id: <200201161110.g0GBA1M60101@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org Cc: From: Ruslan Ermilov Subject: Re: misc/33906: tic program is missing from the base FreeBSD installation Reply-To: Ruslan Ermilov Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR misc/33906; it has been noted by GNATS. From: Ruslan Ermilov To: "Alexey V. Neyman" Cc: tedm@toybox.placo.com, Sheldon Hearn , bug-followup@FreeBSD.org Subject: Re: misc/33906: tic program is missing from the base FreeBSD installation Date: Wed, 16 Jan 2002 13:00:30 +0200 --3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Jan 16, 2002 at 09:06:24AM +0300, Alexey V. Neyman wrote: > On 15 January 2002 20:21, you wrote: > > I'd be happy with this, like it's done for textproc/gxditview > > using the base system's contrib/groff sources. I just don't > > think that tic(1) should be in the base system. > > Well, I did this as a port using base system sources. Please check the > attached shar archive; I'm open to criticisms :)) > Alexey, attached is the patch for your port. The following problems were fixed: "make all" in progs executed several times caused false rebuilds (DEPS_CURSES thing). Fixed --datadir to match the actual location of terminfo database. (See configure output before and after.) Pass --with-manpage-format=normal to configure(1) so that it doesn't have to guess what the correct format is. As a bonus, it makes us respect NOMANCOMPRESS set in /etc/make.conf. Also, post-build was failing if executed by a non-root user. pkg-install is now superflows, we handle the creation of the share/terminfo directory in pkg-plist. > # This is a shell archive. Save it in a file, remove anything before > # this line, and then unpack it by entering "sh file". Note, it may > # create directories; files and directories will be owned by you and > # have default permissions. > # > # This archive contains: > # > # ncurses-utils > # ncurses-utils/Makefile > # ncurses-utils/pkg-comment > # ncurses-utils/pkg-descr > # ncurses-utils/pkg-plist > # ncurses-utils/pkg-install > # > echo c - ncurses-utils > mkdir -p ncurses-utils > /dev/null 2>&1 > echo x - ncurses-utils/Makefile > sed 's/^X//' >ncurses-utils/Makefile << 'END-of-ncurses-utils/Makefile' > X# New ports collection makefile for: tic > X# Date created: 15 Jan 2002 > X# Whom: Alexey Neyman > X# > X# $FreeBSD$ > X# > X > XPORTNAME= ncurses-utils > XPORTVERSION= 5.1 > XCATEGORIES= sysutils devel > XDISTFILES= # none > X > XMAINTAINER= ports@freebsd.org > X > XWRKSRC= ${WRKDIR}/${DISTNAME} > XBUILD_WRKSRC= $(WRKSRC)/progs > XINSTALL_WRKSRC= $(WRKSRC)/progs > X > XNCSRC= /usr/src/contrib/ncurses > X > XHAS_CONFIGURE= YES > XCONFIGURE_ARGS= --srcdir=${NCSRC} --prefix=${PREFIX} --with-shared \ > X --datadir=/usr/share/misc > X > Xdo-extract: > X @if [ ! -r ${NCSRC}/configure ]; then \ > X ${ECHO} "You need the ncurses sources in"; \ > X ${ECHO} "${NCSRC}"; \ > X ${ECHO} "to build this port."; \ > X exit 1; \ > X fi > X @${RM} -rf ${WRKDIR} > X @${MKDIR} ${WRKSRC} > X ${CP} -p ${NCSRC}/configure ${WRKSRC} > X > Xpre-build: > X @cd ${WRKSRC}/progs; \ > X ${MV} Makefile Makefile.orig; \ > X ${GREP} -v "cd ../ncurses" Makefile.orig > Makefile > X > Xpost-build: > X @cd ${WRKSRC}/man; \ > X ${SH} edit_man.sh installing ${WRKSRC}/man ${NCSRC}/man \ > X ${NCSRC}/man/*.1* > X > Xdo-install: > X ${INSTALL_PROGRAM} ${WRKSRC}/progs/clear ${PREFIX}/bin > X ${INSTALL_PROGRAM} ${WRKSRC}/progs/tput ${PREFIX}/bin > X ${INSTALL_PROGRAM} ${WRKSRC}/progs/tset ${PREFIX}/bin > X ${LN} -s ${PREFIX}/bin/tset ${PREFIX}/bin/reset > X ${INSTALL_PROGRAM} ${WRKSRC}/progs/infocmp ${PREFIX}/sbin > X ${INSTALL_PROGRAM} ${WRKSRC}/progs/tic ${PREFIX}/sbin > X ${INSTALL_PROGRAM} ${WRKSRC}/progs/toe ${PREFIX}/sbin > X ${LN} -s ${PREFIX}/sbin/tic ${PREFIX}/sbin/captoinfo > X ${LN} -s ${PREFIX}/sbin/tic ${PREFIX}/sbin/infotocap > X ${MKDIR} ${PREFIX}/share/terminfo > X cd ${WRKSRC}/man/man1; \ > X for i in *.1.gz; do \ > X ${INSTALL_MAN} $$i ${PREFIX}/man/man1; \ > X done; \ > X for i in *.1m.gz; do \ > X ${INSTALL_MAN} $$i ${PREFIX}/man/man8/$${i%.1m.gz}.8.gz; \ > X done > X > XMAN1= clear.1.gz reset.1.gz tput.1.gz tset.1.gz > XMAN8= captoinfo.8.gz infocmp.8.gz infotocap.8.gz tic.8.gz toe.8.gz > XNOMANCOMPRESS= YES > X > X.include > END-of-ncurses-utils/Makefile > echo x - ncurses-utils/pkg-comment > sed 's/^X//' >ncurses-utils/pkg-comment << 'END-of-ncurses-utils/pkg-comment' > XUtilities set from ncurses(3): tic, toe, infocmp > END-of-ncurses-utils/pkg-comment > echo x - ncurses-utils/pkg-descr > sed 's/^X//' >ncurses-utils/pkg-descr << 'END-of-ncurses-utils/pkg-descr' > XThis port installs SysV-compatible ncurses(3) utilities set, including > Xtic(8), toe(8) and infocmp(8). > X > XNOTE: port uses source from src/contrib base distribution. > X > X-Alexey > Xalex.neyman@auriga.ru > END-of-ncurses-utils/pkg-descr > echo x - ncurses-utils/pkg-plist > sed 's/^X//' >ncurses-utils/pkg-plist << 'END-of-ncurses-utils/pkg-plist' > Xbin/clear > Xbin/reset > Xbin/tput > Xbin/tset > Xsbin/tic > Xsbin/toe > Xsbin/infocmp > Xsbin/captoinfo > Xsbin/infotocap > X@dirrm share/terminfo > END-of-ncurses-utils/pkg-plist > echo x - ncurses-utils/pkg-install > sed 's/^X//' >ncurses-utils/pkg-install << 'END-of-ncurses-utils/pkg-install' > X#! /bin/sh > X > Xif [ "x$2" = "xPRE-INSTALL" ]; then > X /bin/mkdir $PKG_PREFIX/share/terminfo > Xfi > END-of-ncurses-utils/pkg-install > exit > Cheers, -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p diff --exclude=CVS -ruN ncurses-utils~/Makefile ncurses-utils/Makefile --- ncurses-utils~/Makefile Wed Jan 16 12:41:50 2002 +++ ncurses-utils/Makefile Wed Jan 16 12:34:56 2002 @@ -10,17 +10,17 @@ CATEGORIES= sysutils devel DISTFILES= # none -MAINTAINER= ports@freebsd.org +MAINTAINER= ports@FreeBSD.org -WRKSRC= ${WRKDIR}/${DISTNAME} -BUILD_WRKSRC= $(WRKSRC)/progs -INSTALL_WRKSRC= $(WRKSRC)/progs +BUILD_WRKSRC= ${WRKSRC}/progs +INSTALL_WRKSRC= ${BUILD_WRKSRC} NCSRC= /usr/src/contrib/ncurses HAS_CONFIGURE= YES CONFIGURE_ARGS= --srcdir=${NCSRC} --prefix=${PREFIX} --with-shared \ - --datadir=/usr/share/misc + --datadir=${PREFIX}/share \ + --with-manpage-format=normal do-extract: @if [ ! -r ${NCSRC}/configure ]; then \ @@ -31,39 +31,35 @@ fi @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKSRC} - ${CP} -p ${NCSRC}/configure ${WRKSRC} + ${LN} -s ${NCSRC}/configure ${WRKSRC} pre-build: @cd ${WRKSRC}/progs; \ ${MV} Makefile Makefile.orig; \ - ${GREP} -v "cd ../ncurses" Makefile.orig > Makefile + ${GREP} -v "^DEPS_CURSES" Makefile.orig > Makefile post-build: @cd ${WRKSRC}/man; \ - ${SH} edit_man.sh installing ${WRKSRC}/man ${NCSRC}/man \ - ${NCSRC}/man/*.1* + ${CP} ${NCSRC}/man/*.1* .; \ + for i in *.1m; do \ + ${MV} $$i $${i%.1m}.8; \ + done do-install: ${INSTALL_PROGRAM} ${WRKSRC}/progs/clear ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/progs/tput ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/progs/tset ${PREFIX}/bin - ${LN} -s ${PREFIX}/bin/tset ${PREFIX}/bin/reset + ${LN} ${PREFIX}/bin/tset ${PREFIX}/bin/reset ${INSTALL_PROGRAM} ${WRKSRC}/progs/infocmp ${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/progs/tic ${PREFIX}/sbin + ${LN} ${PREFIX}/sbin/tic ${PREFIX}/sbin/captoinfo + ${LN} ${PREFIX}/sbin/tic ${PREFIX}/sbin/infotocap ${INSTALL_PROGRAM} ${WRKSRC}/progs/toe ${PREFIX}/sbin - ${LN} -s ${PREFIX}/sbin/tic ${PREFIX}/sbin/captoinfo - ${LN} -s ${PREFIX}/sbin/tic ${PREFIX}/sbin/infotocap + @cd ${WRKSRC}/man; \ + ${SH} edit_man.sh installing ${PREFIX}/man ${NCSRC}/man *.[18] ${MKDIR} ${PREFIX}/share/terminfo - cd ${WRKSRC}/man/man1; \ - for i in *.1.gz; do \ - ${INSTALL_MAN} $$i ${PREFIX}/man/man1; \ - done; \ - for i in *.1m.gz; do \ - ${INSTALL_MAN} $$i ${PREFIX}/man/man8/$${i%.1m.gz}.8.gz; \ - done -MAN1= clear.1.gz reset.1.gz tput.1.gz tset.1.gz -MAN8= captoinfo.8.gz infocmp.8.gz infotocap.8.gz tic.8.gz toe.8.gz -NOMANCOMPRESS= YES +MAN1= clear.1 reset.1 tput.1 tset.1 +MAN8= captoinfo.8 infocmp.8 infotocap.8 tic.8 toe.8 .include diff --exclude=CVS -ruN ncurses-utils~/pkg-install ncurses-utils/pkg-install --- ncurses-utils~/pkg-install Wed Jan 16 12:41:50 2002 +++ ncurses-utils/pkg-install Thu Jan 1 03:00:00 1970 @@ -1,5 +0,0 @@ -#! /bin/sh - -if [ "x$2" = "xPRE-INSTALL" ]; then - /bin/mkdir $PKG_PREFIX/share/terminfo -fi diff --exclude=CVS -ruN ncurses-utils~/pkg-plist ncurses-utils/pkg-plist --- ncurses-utils~/pkg-plist Wed Jan 16 12:41:50 2002 +++ ncurses-utils/pkg-plist Wed Jan 16 12:39:57 2002 @@ -1,10 +1,11 @@ +@exec mkdir -p %D/share/terminfo bin/clear -bin/reset bin/tput bin/tset -sbin/tic -sbin/toe +bin/reset sbin/infocmp +sbin/tic sbin/captoinfo sbin/infotocap +sbin/toe @dirrm share/terminfo --3V7upXqbjpZ4EhLz-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message