2 files changed, 33 insertions, 23 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 12f4715a8bf8..b97cedac2075 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -46,7 +46,15 @@ CONFIGURE_WRKSRC=	${NOWIDEC_WRKSRC}
 BUILD_WRKSRC=	${NOWIDEC_WRKSRC}
 INSTALL_WRKSRC=	${NOWIDEC_WRKSRC}
 
-PLIST_SUB+=	PORTVERSION=${RELEASE} \
+NCURSES_ABI_VER=	5
+NCURSES_REL_VER=	${RELEASE}
+NCURSESW_ABI_VER=	${NCURSES_ABI_VER}
+NCURSESW_REL_VER=	${NCURSES_REL_VER}
+
+PLIST_SUB+=	ABI_VER=${NCURSES_ABI_VER} \
+		REL_VER=${NCURSES_REL_VER} \
+		ABI_VER_WIDEC=${NCURSESW_ABI_VER} \
+		REL_VER_WIDEC=${NCURSESW_REL_VER} \
 		WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${PREFIX}/,,} \
 		NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${PREFIX}/,,}
 
@@ -80,6 +88,8 @@ WITHOUT_WIDEC=	yes
 CONFIGURE_ARGS_WIDEC=--enable-widec
 .if defined(WITH_EXTCOLORS)
 CONFIGURE_ARGS_WIDEC+=--enable-ext-colors
+NCURSESW_ABI_VER=	6
+NCURSESW_REL_VER=	6.0
 .endif
 
 # needed by devel/py-ncurses port
diff --git a/devel/ncurses/pkg-plist b/devel/ncurses/pkg-plist
index daf80a60450b..dbdc6ecdda58 100644
--- a/devel/ncurses/pkg-plist
+++ b/devel/ncurses/pkg-plist
@@ -7,8 +7,8 @@ bin/tset
 %%TERMINFO%%bin/toe
 %%TERMINFO%%bin/infotocap
 %%TERMINFO%%bin/captoinfo
-%%TERMINFO%%bin/ncurses5-config
-%%WIDEC%%%%TERMINFO%%bin/ncursesw5-config
+%%TERMINFO%%bin/ncurses%%ABI_VER%%-config
+%%WIDEC%%%%TERMINFO%%bin/ncursesw%%ABI_VER_WIDEC%%-config
 include/ncurses/cursesapp.h
 include/ncurses/cursesf.h
 include/ncurses/cursesm.h
@@ -30,64 +30,64 @@ include/ncurses/tic.h
 include/ncurses/unctrl.h
 lib/libform.a
 lib/libform.so
-lib/libform.so.5
-lib/libform.so.%%PORTVERSION%%
+lib/libform.so.%%ABI_VER%%
+lib/libform.so.%%REL_VER%%
 %%DEBUG%%lib/libform_g.a
 %%PROFILE%%lib/libform_p.a
 lib/libmenu.a
 lib/libmenu.so
-lib/libmenu.so.5
-lib/libmenu.so.%%PORTVERSION%%
+lib/libmenu.so.%%ABI_VER%%
+lib/libmenu.so.%%REL_VER%%
 %%DEBUG%%lib/libmenu_g.a
 %%PROFILE%%lib/libmenu_p.a
 lib/libncurses++.a
 lib/libncurses.a
 lib/libncurses.so
-lib/libncurses.so.5
-lib/libncurses.so.%%PORTVERSION%%
+lib/libncurses.so.%%ABI_VER%%
+lib/libncurses.so.%%REL_VER%%
 %%DEBUG%%lib/libncurses_g.a
 %%PROFILE%%lib/libncurses_p.a
 lib/libpanel.a
 lib/libpanel.so
-lib/libpanel.so.5
-lib/libpanel.so.%%PORTVERSION%%
+lib/libpanel.so.%%ABI_VER%%
+lib/libpanel.so.%%REL_VER%%
 %%DEBUG%%lib/libpanel_g.a
 %%PROFILE%%lib/libpanel_p.a
 lib/libtinfo.a
 lib/libtinfo.so
-lib/libtinfo.so.5
-lib/libtinfo.so.%%PORTVERSION%%
+lib/libtinfo.so.%%ABI_VER%%
+lib/libtinfo.so.%%REL_VER%%
 %%DEBUG%%lib/libtinfo_g.a
 %%PROFILE%%lib/libtinfo_p.a
 %%WIDEC%%lib/libformw.a
 %%WIDEC%%lib/libformw.so
-%%WIDEC%%lib/libformw.so.5
-%%WIDEC%%lib/libformw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libformw.so.%%ABI_VER_WIDEC%%
+%%WIDEC%%lib/libformw.so.%%REL_VER_WIDEC%%
 %%WIDEC%%%%DEBUG%%lib/libformw_g.a
 %%WIDEC%%%%PROFILE%%lib/libformw_p.a
 %%WIDEC%%lib/libmenuw.a
 %%WIDEC%%lib/libmenuw.so
-%%WIDEC%%lib/libmenuw.so.5
-%%WIDEC%%lib/libmenuw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libmenuw.so.%%ABI_VER_WIDEC%%
+%%WIDEC%%lib/libmenuw.so.%%REL_VER_WIDEC%%
 %%WIDEC%%%%DEBUG%%lib/libmenuw_g.a
 %%WIDEC%%%%PROFILE%%lib/libmenuw_p.a
 %%WIDEC%%lib/libncurses++w.a
 %%WIDEC%%lib/libncursesw.a
 %%WIDEC%%lib/libncursesw.so
-%%WIDEC%%lib/libncursesw.so.5
-%%WIDEC%%lib/libncursesw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libncursesw.so.%%ABI_VER_WIDEC%%
+%%WIDEC%%lib/libncursesw.so.%%REL_VER_WIDEC%%
 %%WIDEC%%%%DEBUG%%lib/libncursesw_g.a
 %%WIDEC%%%%PROFILE%%lib/libncursesw_p.a
 %%WIDEC%%lib/libpanelw.a
 %%WIDEC%%lib/libpanelw.so
-%%WIDEC%%lib/libpanelw.so.5
-%%WIDEC%%lib/libpanelw.so.%%PORTVERSION%%
+%%WIDEC%%lib/libpanelw.so.%%ABI_VER_WIDEC%%
+%%WIDEC%%lib/libpanelw.so.%%REL_VER_WIDEC%%
 %%WIDEC%%%%DEBUG%%lib/libpanelw_g.a
 %%WIDEC%%%%PROFILE%%lib/libpanelw_p.a
 %%WIDEC%%lib/libtinfow.a
 %%WIDEC%%lib/libtinfow.so
-%%WIDEC%%lib/libtinfow.so.5
-%%WIDEC%%lib/libtinfow.so.%%PORTVERSION%%
+%%WIDEC%%lib/libtinfow.so.%%ABI_VER_WIDEC%%
+%%WIDEC%%lib/libtinfow.so.%%REL_VER_WIDEC%%
 %%WIDEC%%%%DEBUG%%lib/libtinfow_g.a
 %%WIDEC%%%%PROFILE%%lib/libtinfow_p.a
 %%TERMINFO%%share/misc/tabset/std