Sun Nov 14 21:53:15 2021 UTC ()
revert back to rev 1.29.  the 'make package' step fails with 1.31.

add a note that this should use tcsh/Makefile.common, not just
the main Makefile directly.

ok: kim@


(mrg)
diff -r1.31 -r1.32 pkgsrc/shells/standalone-tcsh/Makefile
cvs diff -r1.31 -r1.32 pkgsrc/shells/standalone-tcsh/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/standalone-tcsh/Makefile 2021/11/13 06:53:10 1.31
+++ pkgsrc/shells/standalone-tcsh/Makefile 2021/11/14 21:53:15 1.32
@@ -1,47 +1,46 @@ @@ -1,47 +1,46 @@
1# $NetBSD: Makefile,v 1.31 2021/11/13 06:53:10 kim Exp $ 1# $NetBSD: Makefile,v 1.32 2021/11/14 21:53:15 mrg Exp $
2# 2#
3 3
4.include "../../shells/tcsh/Makefile.common" 
5 
6# FIXME: This is because of PREFIX=/ below. 4# FIXME: This is because of PREFIX=/ below.
7CHECK_FILES_SUPPORTED= no 5CHECK_FILES_SUPPORTED= no
8NOT_FOR_UNPRIVILEGED= yes 6NOT_FOR_UNPRIVILEGED= yes
9 7
10PKGNAME= standalone-${DISTNAME} 8PKGNAME= standalone-${DISTNAME}
 9PKGREVISION= 0 # ALWAYS needs to be set; 0 if none.
11 10
12WRKSRC= ${WRKDIR}/${DISTNAME} 11WRKSRC= ${WRKDIR}/${DISTNAME}
13PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches 12PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches
14 13
15# This package only makes sense on platforms that don't themselves ship tcsh 14# This package only makes sense on platforms that don't themselves ship tcsh
16# in /bin. Otherwise it clobbers the native copy, which really isn't what 15# in /bin. Otherwise it clobbers the native copy, which really isn't what
17# anyone wants. 16# anyone wants.
18ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-* 17ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-*
19 18
20.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
21 20
22.if ${OS_VARIANT} == "OmniOS" 21.if ${OS_VARIANT} == "OmniOS"
23NOT_FOR_PLATFORM+= SunOS-*-* 22NOT_FOR_PLATFORM+= SunOS-*-*
24.endif 23.endif
25 24
26INSTALLATION_DIRS+= bin 25+# XXX This should use Makefile.common, not Makefile
 26.include "../../shells/tcsh/Makefile"
 27
27INSTALLATION_DIRS+= usr/share/man/man1 28INSTALLATION_DIRS+= usr/share/man/man1
28 29
29COMMENT:= Standalone version of the Extended C-shell 30COMMENT:= Standalone version of the Extended C-shell
30MAINTAINER= agc@NetBSD.org 31MAINTAINER= agc@NetBSD.org
31 32
32# FIXME: Packages shall only install into ${LOCALBASE} or a subdirectory. 33# FIXME: Packages shall only install into ${LOCALBASE} or a subdirectory.
33PREFIX= / 34PREFIX= /
34NOT_FOR_BULK_PLATFORM= *-*-* 35NOT_FOR_BULK_PLATFORM= *-*-*
35 36
36NLSDIR= usr/share/nls 37NLSDIR= usr/share/nls
37CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 38CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
38CONFIGURE_ARGS+= --bindir=/bin 39CONFIGURE_ARGS+= --bindir=/bin
39CONFIGURE_ARGS+= --mandir=/usr/share/man 40CONFIGURE_ARGS+= --mandir=/usr/share/man
40 41
41DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo 42DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo
42 43
43.if ${OPSYS} != "SunOS" 44.if ${OPSYS} != "SunOS"
44LDFLAGS+= -static 45LDFLAGS+= -static
45.endif 46.endif
46 
47.include "../../mk/bsd.pkg.mk"