devel/schilybase: Update to 2021-09-01

Update to 2021-09-01 and while here, also:
 - add WWW to misc/schilytools/pkg-descr
 - use make loops and conditionals instead of shell loops
 - regenerate some patches to make them apply cleanly
 - add an NLS option to devel/schilybase (toggles dummy message catalogue
   generation)

PR:		257905
Reported by:	bugzeo <kiboto6933@eyeremind.com>
Differential Revision: https://reviews.freebsd.org/D31808
This commit is contained in:
Robert Clausecker 2021-09-02 18:23:15 +02:00 committed by Juraj Lutter
parent 17426ba8b1
commit 82ebe485f6
8 changed files with 104 additions and 28 deletions

View File

@ -3,10 +3,11 @@ CATEGORIES= devel
COMMENT= Support files and libraries for the schilytools
NLS_USES= gettext-tools
USE_LDCONFIG= yes
OPTIONS_DEFINE= PROFILE DOCS
OPTIONS_DEFAULT=DOCS
OPTIONS_DEFINE= DOCS NLS PROFILE
OPTIONS_DEFAULT=DOCS NLS
OPTIONS_SUB= yes
# do not reorder: order required for build to succeed
@ -39,6 +40,24 @@ COMPONENTS= conf \
man \
man/man4
post-build-NLS-on:
${SETENV} LC_ALL=de_DE.ISO8859-1 msgfmt -o ${WRKDIR}/SCHILY_utils.mo ${FILESDIR}/SCHILY_utils.po
# all languages supported by FreeBSD
_LANGUAGES= af am ar be bg ca cs da de el en es et eu fi fr ga he hi hr hu \
hy is it ja kk ko lt lv mn nb nl nn pl pt ro ru se sk sl sr sv \
tr uk zh
post-install-NLS-on:
@${ECHO_MSG} '=> installing dummy message catalogues'
${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES
${INSTALL_DATA} ${WRKDIR}/SCHILY_utils.mo ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/SCHILY_utils.mo
.for lang in ${_LANGUAGES:Nde}
${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
${RLN} ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/SCHILY_utils.mo \
${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/SCHILY_utils.mo
.endfor
post-install-PROFILE-off:
${RM} -r ${STAGEDIR}${PREFIX}/lib/profiled

View File

@ -1,4 +1,4 @@
DISTVERSION= 2021-08-14
DISTVERSION= 2021-09-01
MASTER_SITES= SF/schilytools
DISTNAME= schily-${DISTVERSION}
@ -64,25 +64,21 @@ do-configure:
cd ${WRKSRC}/psmake && ${SETENV} ${MAKE_ENV} ${SH} ./MAKE-all
.endif
@${ECHO_MSG} "=> configuring components"
for component in ${COMPONENTS} ; \
do \
cd ${WRKSRC}/$$component && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config ; \
done
.for component in ${COMPONENTS}
cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config
.endfor
do-build:
for component in ${COMPONENTS} ; \
do \
cd ${WRKSRC}/$$component && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all ; \
done
.for component in ${COMPONENTS}
cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
.endfor
do-install:
for component in ${COMPONENTS} ; \
do \
cd ${WRKSRC}/$$component && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install ; \
done
[ -z "${COMPONENTS:Mlib*}" ] || ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
.for component in ${COMPONENTS}
cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
.endfor
.if "${COMPONENTS:Mlib}" != ""
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
.endif
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1629365867
SHA256 (schily-2021-08-14.tar.bz2) = fb4e4c0ca534aa28127f7e7556c9017e059f4c7b93f6bfc33965f28091230f10
SIZE (schily-2021-08-14.tar.bz2) = 4942864
TIMESTAMP = 1630581827
SHA256 (schily-2021-09-01.tar.bz2) = 8d1a6a1ff73144f3933367900a4f1ebe4aed63e5bb0db4e6aa2a108bb08024b8
SIZE (schily-2021-09-01.tar.bz2) = 4954006

View File

@ -0,0 +1,14 @@
msgid ""
msgstr ""
"Project-Id-Version: Schilytools\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-08-21 10:40+0200\n"
"Last-Translator: Jörg Schilling <EMAIL@ADDRESS>\n"
"Language: all\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#, c-format
msgid "Jörg Schilling"
msgstr "Jörg Schilling"

View File

@ -1,4 +1,4 @@
--- compare/Makefile.orig 2021-06-21 15:02:35 UTC
--- compare/Makefile.orig 2021-08-19 10:00:38 UTC
+++ compare/Makefile
@@ -6,7 +6,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top
###########################################################################
@ -8,4 +8,4 @@
+TARGET= scompare
CPPOPTS += -DUSE_LARGEFILES
CPPOPTS += -DSCHILY_PRINT
CPPOPTS += -DUSE_NLS # Include locale support

View File

@ -1,4 +1,4 @@
--- mt/Makefile.orig 2021-06-07 13:29:48 UTC
--- mt/Makefile.orig 2021-08-19 17:51:16 UTC
+++ mt/Makefile
@@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.top
@ -8,11 +8,11 @@
+#SYMLINKS= mt
CPPOPTS += -DUSE_REMOTE
CPPOPTS += -DSCHILY_PRINT
@@ -17,7 +17,7 @@ CFILES= mt.c
CPPOPTS += -DUSE_NLS # Include locale support
@@ -21,7 +21,7 @@ CFILES= mt.c
# LIB_CAP is needed for Linux capability support in librmt.
#
LIBS= -lrmt -lschily $(LIB_SOCKET) $(LIB_CAP)
LIBS= -lrmt -lschily $(LIB_SOCKET) $(LIB_CAP) $(LIB_INTL)
-XMK_FILE= Makefile.man mt.mk1
+XMK_FILE= Makefile.man

View File

@ -206,6 +206,51 @@ lib/libxtermcap.so.1.0
%%PROFILE%%lib/profiled/libxtermcap.a
%%PORTDOCS%%share/doc/libparanoia/README.interface
%%PORTDOCS%%share/doc/libparanoia/README.paranoia
%%NLS%%share/locale/af/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/am/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/ar/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/be/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/bg/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/ca/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/cs/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/da/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/de/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/el/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/en/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/es/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/et/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/eu/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/fi/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/fr/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/ga/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/he/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/hi/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/hr/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/hu/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/hy/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/is/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/it/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/ja/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/kk/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/ko/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/lt/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/lv/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/mn/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/nb/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/nl/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/nn/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/pl/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/pt/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/ro/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/ru/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/se/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/sk/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/sl/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/sr/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/sv/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/tr/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/uk/LC_MESSAGES/SCHILY_utils.mo
%%NLS%%share/locale/zh/LC_MESSAGES/SCHILY_utils.mo
share/lib/siconv/cp10000
share/lib/siconv/cp10006
share/lib/siconv/cp10007

View File

@ -13,3 +13,5 @@ Programs and tools included in the Schily-Tools bundle:
* SCCS derived from OpenSolaris sources
* star, the oldest free TAR implementation, started in 1982
* ved, A portable, easy to learn and extremely fast screen oriented editor.
WWW: http://schilytools.sourceforge.net/