Page MenuHomeFreeBSD
Files F147202446

D3747.id8979.diff
No OneTemporary
Actions

D3747.id8979.diff
View Options

Index: Keywords/terminfo.ucl
===================================================================
--- /dev/null
+++ Keywords/terminfo.ucl
@@ -0,0 +1,24 @@
+# $FreeBSD$
+#
+
+actions: []
+post-install: <<EOD
+ terminfodir=%D/share/misc
+ terminfodb=${terminfodir}/terminfo.db
+ tic=%D/bin/tic
+ if [ -e ${terminfodb}.default -a -e ${tic} ]; then
+ cp ${terminfodb}.default ${terminfodb}
+ find -s ${terminfodir} -name "*.terminfo" -exec ${tic} {} \;
+ fi
+EOD
+post-deinstall: <<EOD
+ terminfodir=%D/share/misc
+ terminfodb=${terminfodir}/terminfo.db
+ tic=%D/bin/tic
+ if [ -e ${terminfodb}.default -a -e ${tic} ]; then
+ cp ${terminfodb}.default ${terminfodb}
+ find -s ${terminfodir} -name "*.terminfo" -exec ${tic} {} \;
+ else
+ rm -f ${terminfodb}
+ fi
+EOD
Index: devel/ncurses/Makefile
===================================================================
--- devel/ncurses/Makefile
+++ devel/ncurses/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ncurses
DISTVERSION= ${RELEASE}-20150214
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://invisible-island.net/${PORTNAME}/current/
DIST_SUBDIR= ${PORTNAME}
@@ -124,16 +124,20 @@
. endfor
.endfor
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
-. endfor
-.if ${OPSYS} != FreeBSD || ${OSVERSION} > 900000
${RM} -f ${STAGEDIR}${PREFIX}/lib/libncurses.so \
${STAGEDIR}${PREFIX}/lib/libncursesw.so
${ECHO} "INPUT(libncurses.so.${RELEASE:R} AS_NEEDED(-ltinfo))" > ${STAGEDIR}${PREFIX}/lib/libncurses.so
${ECHO} "INPUT(libncursesw.so.${RELEASE:R} AS_NEEDED(-ltinfow))" > ${STAGEDIR}${PREFIX}/lib/libncursesw.so
-.endif
+
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.5.9
+ ${MV} ${STAGEDIR}${PREFIX}/share/misc/terminfo.db \
+ ${STAGEDIR}${PREFIX}/share/misc/terminfo.db.default
+
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+. for f in ${DOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
+. endfor
+
.include <bsd.port.mk>
Index: devel/ncurses/pkg-plist
===================================================================
--- devel/ncurses/pkg-plist
+++ devel/ncurses/pkg-plist
@@ -977,5 +977,5 @@
share/misc/tabset/stdcrt
share/misc/tabset/vt100
share/misc/tabset/vt300
-share/misc/terminfo.db
-@exec find %D/share/misc -name "*.terminfo" -exec %D/bin/tic {} \;
+share/misc/terminfo.db.default
+@terminfo
Index: sysutils/jfbterm/Makefile
===================================================================
--- sysutils/jfbterm/Makefile
+++ sysutils/jfbterm/Makefile
@@ -20,11 +20,9 @@
MAKEFILE= ${FILESDIR}/BSDmakefile
MAKE_ENV+= VERSION=${PORTVERSION} GUNZIP=${GUNZIP_CMD:N-*}
PLIST_SUB+= TERMCAP_ADD_RECORD="@exec ${TERMCAP_ADD_RECORD:S,^${PREFIX},%D,}" \
- TERMCAP_DEL_RECORD="@unexec ${TERMCAP_DEL_RECORD}" \
- TIC="@exec ${TIC} ${TERMINFO_FILE:S,^${PREFIX},%D,} 2>/dev/null || ${TRUE}"
+ TERMCAP_DEL_RECORD="@unexec ${TERMCAP_DEL_RECORD}"
CAP_MKDB?= /usr/bin/cap_mkdb
-TIC?= ${LOCALBASE}/bin/tic
TERMINFO_FILE?= ${PREFIX}/share/misc/jfbterm.terminfo
OPTIONS_DEFINE= ICONV PNG SETUID TERMCAP UNIFONT
Index: sysutils/jfbterm/pkg-plist
===================================================================
--- sysutils/jfbterm/pkg-plist
+++ sysutils/jfbterm/pkg-plist
@@ -9,4 +9,4 @@
share/misc/jfbterm.terminfo
%%TERMCAP_ADD_RECORD%%
%%TERMCAP_DEL_RECORD%%
-%%TIC%%
+@terminfo
Index: x11/rxvt-unicode/Makefile
===================================================================
--- x11/rxvt-unicode/Makefile
+++ x11/rxvt-unicode/Makefile
@@ -12,10 +12,8 @@
LICENSE= GPLv2
-BUILD_DEPENDS= tic:${PORTSDIR}/devel/ncurses \
- ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
- ${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig
USES= cpe pkgconfig shebangfix tar:bzip2
USE_XORG= xpm xft xrender
Index: x11/rxvt-unicode/pkg-plist
===================================================================
--- x11/rxvt-unicode/pkg-plist
+++ x11/rxvt-unicode/pkg-plist
@@ -58,5 +58,4 @@
%%PERL%%man/man3/urxvtperl.3.gz
man/man7/urxvt.7.gz
share/misc/rxvt-unicode.terminfo
-@comment No unexec tic available
-@postexec tic %D/share/misc/rxvt-unicode.terminfo
+@terminfo

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 10, 2:14 AM (17 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29468613
Default Alt Text
D3747.id8979.diff (4 KB)

Event Timeline