Received: by mail.netbsd.org (Postfix, from userid 605) id 9A43A85231; Tue, 6 Dec 2022 11:38:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CBB1B84E64 for ; Tue, 6 Dec 2022 11:38:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id xUeVV5_LJzFO for ; Tue, 6 Dec 2022 11:38:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DDC3084D09 for ; Tue, 6 Dec 2022 11:38:00 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AF1C9FA90; Tue, 6 Dec 2022 11:38:00 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1670326680102920" MIME-Version: 1.0 Date: Tue, 6 Dec 2022 11:38:00 +0000 From: "Paolo Vincenzo Olivo" Subject: CVS commit: pkgsrc/editors To: pkgsrc-changes@NetBSD.org Reply-To: vins@netbsd.org X-Mailer: log_accum Message-Id: <20221206113800.AF1C9FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1670326680102920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: vins Date: Tue Dec 6 11:38:00 UTC 2022 Modified Files: pkgsrc/editors: Makefile Added Files: pkgsrc/editors/ee: DESCR Makefile PLIST distinfo pkgsrc/editors/ee/patches: patch-create.make patch-ee.c Log Message: editors/ee: import package from wip. EasyEdit is an easy to use text editor. Intended to be usable with little or no instruction. Provides a terminal (curses based) interface. Features pop-up menus. Born in HP-UX, included in FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 pkgsrc/editors/Makefile cvs rdiff -u -r0 -r1.3 pkgsrc/editors/ee/DESCR pkgsrc/editors/ee/Makefile \ pkgsrc/editors/ee/PLIST pkgsrc/editors/ee/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/editors/ee/patches/patch-create.make \ pkgsrc/editors/ee/patches/patch-ee.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1670326680102920 Content-Disposition: inline Content-Length: 5499 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/Makefile diff -u pkgsrc/editors/Makefile:1.231 pkgsrc/editors/Makefile:1.232 --- pkgsrc/editors/Makefile:1.231 Tue Dec 6 11:14:00 2022 +++ pkgsrc/editors/Makefile Tue Dec 6 11:38:00 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.231 2022/12/06 11:14:00 vins Exp $ +# $NetBSD: Makefile,v 1.232 2022/12/06 11:38:00 vins Exp $ # COMMENT= Text and binary editors @@ -30,6 +30,7 @@ SUBDIR+= ed SUBDIR+= edt SUBDIR+= elvis SUBDIR+= elvis-x11 +SUBDIR+= ee SUBDIR+= em SUBDIR+= emacs SUBDIR+= emacs-nox11 Added files: Index: pkgsrc/editors/ee/DESCR diff -u /dev/null pkgsrc/editors/ee/DESCR:1.3 --- /dev/null Tue Dec 6 11:38:00 2022 +++ pkgsrc/editors/ee/DESCR Tue Dec 6 11:38:00 2022 @@ -0,0 +1,3 @@ +An easy to use text editor. Intended to be usable with little or no +instruction. Provides a terminal (curses based) interface. Features +pop-up menus. Born in HP-UX, included in FreeBSD. Index: pkgsrc/editors/ee/Makefile diff -u /dev/null pkgsrc/editors/ee/Makefile:1.3 --- /dev/null Tue Dec 6 11:38:00 2022 +++ pkgsrc/editors/ee/Makefile Tue Dec 6 11:38:00 2022 @@ -0,0 +1,33 @@ +# $NetBSD: Makefile,v 1.3 2022/12/06 11:38:00 vins Exp $ + +DISTNAME= ee-1.5.2.src +PKGNAME= ${DISTNAME:S,.src,,} +CATEGORIES= editors +MASTER_SITES= https://mirrors.ustc.edu.cn/gentoo/distfiles/ +DIST_SUBDIR= ${PKGNAME_NOREV} +EXTRACT_SUFX= .tgz + +MAINTAINER= vms@retrobsd.ddns.net +HOMEPAGE= https://www.ucl.ac.uk/~ccaabaa/is/unix/ee.htm +COMMENT= EasyEdit, a classic curses text editor +LICENSE= 2-clause-bsd + +USE_NCURSES= yes # fixterm() + +MAKE_ENV+= CFLAGS=${CFLAGS:Q} +MAKE_ENV+= LDFLAGS=${LDFLAGS:Q} + +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 + +WRKSRC= ${WRKDIR}/easyedit-${PKGVERSION_NOREV} + +do-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM:Q} ${MAKE_FLAGS} all + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/ee ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/ee.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + +.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/ee/PLIST diff -u /dev/null pkgsrc/editors/ee/PLIST:1.3 --- /dev/null Tue Dec 6 11:38:00 2022 +++ pkgsrc/editors/ee/PLIST Tue Dec 6 11:38:00 2022 @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.3 2022/12/06 11:38:00 vins Exp $ +bin/ee +man/man1/ee.1 Index: pkgsrc/editors/ee/distinfo diff -u /dev/null pkgsrc/editors/ee/distinfo:1.3 --- /dev/null Tue Dec 6 11:38:00 2022 +++ pkgsrc/editors/ee/distinfo Tue Dec 6 11:38:00 2022 @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.3 2022/12/06 11:38:00 vins Exp $ + +BLAKE2s (ee-1.5.2/ee-1.5.2.src.tgz) = a8be0743e80ab053ff72e238da2ce66ed80bc494f1aa066cb50eb57ab5a9faf9 +SHA512 (ee-1.5.2/ee-1.5.2.src.tgz) = 9ca0e82d65971b0bce38e09c365b6eb8b81ca6ff5b244107ae254322e47e841e7f5345bf242a0a9dd66b731d46cead6f442016b9e070a1298e1a5319b1d7b97a +Size (ee-1.5.2/ee-1.5.2.src.tgz) = 69651 bytes +SHA1 (patch-create.make) = 89315d0e23bcd8f42a2020aa2197bba14400fe45 +SHA1 (patch-ee.c) = 9da740c0bf6720c8b44839a6037d9cdbd7b3ba52 Index: pkgsrc/editors/ee/patches/patch-create.make diff -u /dev/null pkgsrc/editors/ee/patches/patch-create.make:1.1 --- /dev/null Tue Dec 6 11:38:00 2022 +++ pkgsrc/editors/ee/patches/patch-create.make Tue Dec 6 11:38:00 2022 @@ -0,0 +1,61 @@ +$NetBSD: patch-create.make,v 1.1 2022/12/06 11:38:00 vins Exp $ + +Prefer local ncurses over ee's own implementation. + +--- create.make.orig 2002-09-23 04:18:30.000000000 +0000 ++++ create.make +@@ -154,35 +154,8 @@ else + catgets="-DNO_CATGETS" + fi + +-# make decisions about use of new_curse.c (use of new_curse is recommended +-# rather than local curses) +- +-if [ -n "$terminfo_exists" -a -z "$termcap_exists" ] +-then +- echo "Neither terminfo or termcap are on this system! " +- if [ -f /usr/include/curses.h ] +- then +- echo "Relying on local curses implementation." +- else +- cat <<-EOF +- Don't know where to find curses, you'll need to modify +- source code to be able to build! +- +- Modify the file make.default and build ee by typing: +- +- make -f make.default +- +- EOF +- +- exit 1 +- fi +- +- TARGET="curses" +- curses="" +-else +- curses="-DNCURSE" +- TARGET="ee" +-fi ++curses="" ++TARGET="curses" + + if [ -z "$termio" -a -z "$sgtty" ] + then +@@ -261,13 +234,15 @@ echo "DEFINES = $termio $terminfo_exists + echo "" >> make.local + echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $five_lib $five_include $select_hdr $other_cflags $termcap_exists" >> make.local + echo "" >> make.local ++echo "LDFLAGS = $LDFLAGS" >> make.local ++echo "" >> make.local + echo "" >> make.local + echo "all : $TARGET" >> make.local + + cat >> make.local << EOF + + curses : ee.c +- cc ee.c -o ee \$(CFLAGS) -lcurses ++ cc ee.c -o ee \$(CFLAGS) \$(LDFLAGS) -lncurses + + ee : ee.o new_curse.o + cc -o ee ee.o new_curse.o \$(CFLAGS) Index: pkgsrc/editors/ee/patches/patch-ee.c diff -u /dev/null pkgsrc/editors/ee/patches/patch-ee.c:1.1 --- /dev/null Tue Dec 6 11:38:00 2022 +++ pkgsrc/editors/ee/patches/patch-ee.c Tue Dec 6 11:38:00 2022 @@ -0,0 +1,17 @@ +$NetBSD: patch-ee.c,v 1.1 2022/12/06 11:38:00 vins Exp $ + +Portability fix for POSIX + +--- ee.c.orig 2010-06-04 01:56:36.000000000 +0000 ++++ ee.c +@@ -111,6 +111,10 @@ nl_catd catalog; + #define SIGCHLD SIGCLD + #endif + ++#ifndef SIGUNUSED ++#define SIGUNUSED SIGSYS ++#endif ++ + #define TAB 9 + #define max(a, b) (a > b ? a : b) + #define min(a, b) (a < b ? a : b) --_----------=_1670326680102920--