pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/shells/standalone-tcsh standalone-tcsh: Use ../../shel...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ebf9126bb6e1
branches:  trunk
changeset: 769424:ebf9126bb6e1
user:      kim <kim%pkgsrc.org@localhost>
date:      Sun Nov 14 22:36:12 2021 +0000

description:
standalone-tcsh: Use ../../shells/tcsh/Makefile.common

Additionally, since the binary package will not include the locale
catalogues, disable building them (and unnecessarily stuffing them
in DESTDIR/share/locale).

Finally, fix installation of example files, so that the completion
rules (and csh-mode.el) are included with the package.

diffstat:

 shells/standalone-tcsh/Makefile |  10 ++++++----
 shells/standalone-tcsh/PLIST    |   4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r eb3d9b3582ad -r ebf9126bb6e1 shells/standalone-tcsh/Makefile
--- a/shells/standalone-tcsh/Makefile   Sun Nov 14 22:15:13 2021 +0000
+++ b/shells/standalone-tcsh/Makefile   Sun Nov 14 22:36:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2021/11/14 22:15:13 kim Exp $
+# $NetBSD: Makefile,v 1.34 2021/11/14 22:36:12 kim Exp $
 #
 
 # FIXME: This is because of PREFIX=/ below.
@@ -6,7 +6,7 @@
 NOT_FOR_UNPRIVILEGED=  yes
 
 PKGNAME=               standalone-${DISTNAME}
-PKGREVISION=           1       # ALWAYS needs to be set; 0 if none.
+PKGREVISION=           1
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
 PATCHDIR=              ${.CURDIR}/../../shells/tcsh/patches
@@ -22,8 +22,8 @@
 NOT_FOR_PLATFORM+=     SunOS-*-*
 .endif
 
-# XXX This should use Makefile.common, not Makefile
-.include "../../shells/tcsh/Makefile"
+.include "../../shells/tcsh/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
 
 INSTALLATION_DIRS+=    usr/share/man/man1
 
@@ -32,12 +32,14 @@
 
 # FIXME: Packages shall only install into ${LOCALBASE} or a subdirectory.
 PREFIX=                        /
+EGDIR=                 /usr/share/examples/tcsh
 NOT_FOR_BULK_PLATFORM= *-*-*
 
 NLSDIR=                        usr/share/nls
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=       --bindir=/bin
 CONFIGURE_ARGS+=       --mandir=/usr/share/man
+CONFIGURE_ARGS+=       --disable-nls-catalogs
 
 DISTINFO_FILE=         ${.CURDIR}/../../shells/tcsh/distinfo
 
diff -r eb3d9b3582ad -r ebf9126bb6e1 shells/standalone-tcsh/PLIST
--- a/shells/standalone-tcsh/PLIST      Sun Nov 14 22:15:13 2021 +0000
+++ b/shells/standalone-tcsh/PLIST      Sun Nov 14 22:36:12 2021 +0000
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2004/01/11 23:06:54 grant Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/11/14 22:36:12 kim Exp $
 bin/tcsh
+usr/share/examples/tcsh/complete.tcsh
+usr/share/examples/tcsh/csh-mode.el
 usr/share/man/man1/tcsh.1



Home | Main Index | Thread Index | Old Index