aboutsummaryrefslogtreecommitdiffstats
path: root/shells
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2000-06-30 16:12:40 +0800
committerknu <knu@FreeBSD.org>2000-06-30 16:12:40 +0800
commitcfbac233910b96f9ab60b05dcfb419b7133c939a (patch)
tree1c5f57ff042cbdfa32cf160f1271cd1b12b865d8 /shells
parent342bce8411946438389f844e69093d5594bb6b7f (diff)
downloadfreebsd-ports-gnome-cfbac233910b96f9ab60b05dcfb419b7133c939a.tar.gz
freebsd-ports-gnome-cfbac233910b96f9ab60b05dcfb419b7133c939a.tar.zst
freebsd-ports-gnome-cfbac233910b96f9ab60b05dcfb419b7133c939a.zip
Get rid of the workaround regarding the libzsh-3.1.x.so generation, as
zsh 3.1.9 was found to generate it also on 3-STABLE. This should fix the breakage of the package for 3-STABLE. Pointed out by: Masayuki FUKUI <fukui@sonic.nm.fujitsu.co.jp> Reviewed by: shige (Maintainer)
Diffstat (limited to 'shells')
-rw-r--r--shells/zsh-devel/Makefile13
-rw-r--r--shells/zsh-devel/pkg-plist2
2 files changed, 3 insertions, 12 deletions
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 49770c42e945..6288639a5df5 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -37,16 +37,7 @@ INSTALL_TARGET= install install.info
MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
zshoptions.1 zshall.1 zshparam.1 zshzle.1 zshmodules.1 \
zshzftpsys.1 zshcompsys.1 zshcompwid.1
-PLIST_SUB= ZSH_VER="${ZSH_VER}" ZSHFUNC_SUBDIR="${ZSHFUNC_SUBDIR}" \
- LIBZSH="${LIBZSH}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400013
-LIBZSH= @comment lib/zsh/libzsh-${ZSH_VER}.so
-.else
-LIBZSH= lib/zsh/libzsh-${ZSH_VER}.so
-.endif
+PLIST_SUB= ZSH_VER="${ZSH_VER}" ZSHFUNC_SUBDIR="${ZSHFUNC_SUBDIR}"
# If you want to build a static binary, uncomment the following line
#LDFLAGS+=-static
@@ -79,4 +70,4 @@ post-install:
${ECHO} ${PREFIX}/bin/zsh) > /etc/shells
@${RM} /etc/shells.bak
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index ebcc5d295426..895ffe42ec00 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -5,7 +5,7 @@ bin/zsh-%%ZSH_VER%%
@unexec install-info --delete %D/info/zsh.info %D/info/dir
info/zsh.info
@exec install-info %D/info/zsh.info %D/info/dir
-%%LIBZSH%%
+lib/zsh/libzsh-%%ZSH_VER%%.so
lib/zsh/%%ZSH_VER%%/cap.so
lib/zsh/%%ZSH_VER%%/clone.so
lib/zsh/%%ZSH_VER%%/compctl.so