View | Details | Raw Unified | Return to bug 259109 | Differences between
and this patch

Collapse All | Expand All

(-)b/shells/zsh/Makefile (-37 / +43 lines)
Lines 17-85 LICENSE_NAME= ZSH license Link Here
17
LICENSE_FILE=	${WRKSRC}/LICENCE
17
LICENSE_FILE=	${WRKSRC}/LICENCE
18
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
18
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
19
19
20
MAKE_JOBS_UNSAFE=	yes
20
USES=		autoreconf cpe iconv localbase:ldflags ncurses shebangfix \
21
21
		tar:xz
22
USES=		autoreconf cpe iconv localbase:ldflags ncurses shebangfix tar:xz
23
22
23
SHEBANG_FILES=	Functions/Calendar/* Functions/Misc/*
24
SHEBANG_LANG=	zsh
24
SHEBANG_LANG=	zsh
25
zsh_OLD_CMD=	zsh	# shebang appears as /bin/zsh and just zsh
25
zsh_OLD_CMD=	zsh # shebang appears as /bin/zsh and just zsh
26
SHEBANG_FILES=	Functions/Calendar/* \
26
27
		Functions/Misc/*
27
GNU_CONFIGURE=		yes
28
28
CONFIGURE_ARGS=		--enable-function-subdirs \
29
CONFIGURE_ARGS=	--with-tcsetpgrp \
29
			--enable-maildir-support \
30
		--enable-function-subdirs \
30
			--enable-multibyte \
31
		--enable-maildir-support \
31
			--enable-zsh-secure-free \
32
		--enable-multibyte \
32
			--sysconfdir=${PREFIX}/etc \
33
		--enable-zsh-secure-free \
33
			--with-tcsetpgrp
34
		--sysconfdir=${PREFIX}/etc
35
36
# fix PREFIX != LOCALBASE
34
# fix PREFIX != LOCALBASE
37
CONFIGURE_ARGS+=--disable-site-fndir \
35
CONFIGURE_ARGS+=	--disable-site-fndir \
38
		--enable-additional-fpath=${DATADIR}/site-functions
36
			--enable-additional-fpath=${DATADIR}/site-functions
37
CONFIGURE_ENV+=		ac_cv_header_sys_capability_h=no \
38
			zsh_cv_sys_path_dev_fd=no
39
39
40
CONFIGURE_ENV+=	zsh_cv_sys_path_dev_fd=no \
40
MAKE_JOBS_UNSAFE=	yes
41
		ac_cv_header_sys_capability_h=no
41
TEST_TARGET=	test
42
42
43
GNU_CONFIGURE=	yes
44
CPPFLAGS+=	-DBOOL_DEFINED
43
CPPFLAGS+=	-DBOOL_DEFINED
45
LDFLAGS+=	-Wl,--as-needed
44
LDFLAGS+=	-Wl,--as-needed
46
TEST_TARGET=	test
47
45
48
OPTIONS_DEFINE=	DEBUG ETCDIR GDBM MEM PCRE STATIC \
46
SUB_FILES=	pkg-message
49
		DOCS EXAMPLES
47
48
PLIST_SUB+=	ZSH_VER="${ZSH_VER}"
49
PORTDOCS=	*
50
51
OPTIONS_DEFINE=	BASE_ZSH DEBUG DOCS ETCDIR EXAMPLES GDBM MEM PCRE STATIC
50
OPTIONS_SUB=	yes
52
OPTIONS_SUB=	yes
51
53
54
BASE_ZSH_DESC=	Make zsh and rzsh also available as /bin/zsh and /bin/rzsh
52
ETCDIR_DESC=	System-wide defaults in /etc (instead of $${PREFIX}/etc)
55
ETCDIR_DESC=	System-wide defaults in /etc (instead of $${PREFIX}/etc)
53
GDBM_DESC=	Enable GDBM support (GPL)
56
GDBM_DESC=	Enable GDBM support (GPL)
54
MEM_DESC=	Enable zsh-mem options
57
MEM_DESC=	Enable zsh-mem options
55
58
56
GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
57
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
58
59
DEBUG_CONFIGURE_ENABLE=	zsh-debug
59
DEBUG_CONFIGURE_ENABLE=	zsh-debug
60
DOCS_DISTFILES=		${DISTNAME}-doc${EXTRACT_SUFX}:doc
60
ETCDIR_CONFIGURE_OFF=	--enable-etcdir=${PREFIX}/etc
61
ETCDIR_CONFIGURE_OFF=	--enable-etcdir=${PREFIX}/etc
62
GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
61
GDBM_CONFIGURE_ENABLE=	gdbm
63
GDBM_CONFIGURE_ENABLE=	gdbm
62
MEM_CONFIGURE_ENABLE=	zsh-mem
64
MEM_CONFIGURE_ENABLE=	zsh-mem
65
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
63
PCRE_CONFIGURE_ENABLE=	pcre
66
PCRE_CONFIGURE_ENABLE=	pcre
64
67
65
## Some modules can only be built as a shared library.
68
## Some modules can only be built as a shared library.
66
## If you enable STATIC, you may get strange errors if you, a script,
69
## If you enable STATIC, you may get strange errors if you, a script,
67
## or a plugin tries to use the regex module.
70
## or a plugin tries to use the regex module.
71
STATIC_CONFIGURE_ON=	--disable-dynamic \
72
			--with-term-lib="tinfow tinfo"
73
STATIC_CONFIGURE_OFF=	--enable-dynamic \
74
			--with-term-lib="ncursesw ncurses"
68
STATIC_LDFLAGS=		-static
75
STATIC_LDFLAGS=		-static
69
STATIC_CONFIGURE_ON=	--disable-dynamic --with-term-lib="tinfow tinfo"
70
STATIC_CONFIGURE_OFF=	--enable-dynamic  --with-term-lib="ncursesw ncurses"
71
76
72
DOCS=		LICENCE META-FAQ README \
77
DOCS=		LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \
73
		Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ Etc/completion-style-guide \
78
		Etc/completion-style-guide Doc/zsh*.html Doc/zsh.dvi
74
		Doc/zsh*.html Doc/zsh.dvi
75
DOCS_DISTFILES=	${DISTNAME}-doc${EXTRACT_SUFX}:doc
76
79
77
PORTDOCS=	*
78
PORTEXAMPLES=	zlogin zshenv zshrc
80
PORTEXAMPLES=	zlogin zshenv zshrc
79
81
80
ZSH_VER=	${PORTVERSION}
82
ZSH_VER=	${PORTVERSION}
81
PLIST_SUB+=	ZSH_VER="${ZSH_VER}"
82
SUB_FILES=	pkg-message
83
83
84
.include <bsd.port.pre.mk>
84
.include <bsd.port.pre.mk>
85
85
Lines 123-134 post-install: Link Here
123
			${CHMOD} 644 $$i.zwc ; \
123
			${CHMOD} 644 $$i.zwc ; \
124
		done')
124
		done')
125
125
126
post-install-EXAMPLES-on:
126
post-install-BASE_ZSH-on:
127
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
127
	@${MKDIR} ${STAGEDIR}/bin
128
	(cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
128
.for f in zsh rzsh
129
	${RLN} ${STAGEDIR}${PREFIX}/bin/${f} ${STAGEDIR}/bin/${f}
130
.endfor
129
131
130
post-install-DOCS-on:
132
post-install-DOCS-on:
131
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
133
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
132
	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
134
	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
133
135
136
post-install-EXAMPLES-on:
137
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
138
	(cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
139
134
.include <bsd.port.post.mk>
140
.include <bsd.port.post.mk>
(-)b/shells/zsh/pkg-plist (-1 / +2 lines)
Lines 1-5 Link Here
1
@shell bin/zsh
1
@shell bin/zsh
2
@shell bin/rzsh
2
@shell bin/rzsh
3
%%BASE_ZSH%%@shell /bin/zsh
4
%%BASE_ZSH%%@shell /bin/rzsh
3
bin/zsh-%%ZSH_VER%%
5
bin/zsh-%%ZSH_VER%%
4
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so
6
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so
5
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so
7
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so
6
- 

Return to bug 259109