CVS commit: pkgsrc/shells/standalone-tcsh

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Sun Nov 14 22:36:12 UTC 2021

Modified Files:
        pkgsrc/shells/standalone-tcsh: Makefile PLIST

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/shells/standalone-tcsh/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/shells/standalone-tcsh/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/standalone-tcsh/Makefile
diff -u pkgsrc/shells/standalone-tcsh/Makefile:1.33 pkgsrc/shells/standalone-tcsh/Makefile:1.34
--- pkgsrc/shells/standalone-tcsh/Makefile:1.33 Sun Nov 14 22:15:13 2021
+++ pkgsrc/shells/standalone-tcsh/Makefile      Sun Nov 14 22:36:12 2021
@@ -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 @@ CHECK_FILES_SUPPORTED=  no
 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 @@ ONLY_FOR_PLATFORM+=   NetBSD-*-* OpenBSD-*
 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 @@ MAINTAINER=         agc%NetBSD.org@localhost
 
 # 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
 

Index: pkgsrc/shells/standalone-tcsh/PLIST
diff -u pkgsrc/shells/standalone-tcsh/PLIST:1.4 pkgsrc/shells/standalone-tcsh/PLIST:1.5
--- pkgsrc/shells/standalone-tcsh/PLIST:1.4     Sun Jan 11 23:06:54 2004
+++ pkgsrc/shells/standalone-tcsh/PLIST Sun Nov 14 22:36:12 2021
@@ -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