git: 045aed6ea2c0 - main - japanese/sj3-server: Unbreak on HEAD
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 17 May 2023 04:53:18 UTC
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=045aed6ea2c0e93879b4b8d3517dee2a2156ad8c commit 045aed6ea2c0e93879b4b8d3517dee2a2156ad8c Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-05-16 19:14:47 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-05-17 04:53:04 +0000 japanese/sj3-server: Unbreak on HEAD - Pet portclippy Approved by: portmgr (blanket) --- japanese/sj3-server/Makefile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile index 2f92b86f1ab8..e091aa4f28db 100644 --- a/japanese/sj3-server/Makefile +++ b/japanese/sj3-server/Makefile @@ -19,14 +19,20 @@ LIB_DEPENDS= libsj3lib.so:japanese/sj3-lib USES= imake USE_RC_SUBR= sj3 -PLIST_SUB= USERS=${USERS} GROUPS=${GROUPS} + +CFLAGS+= -Wno-return-type -fcommon + SUB_FILES= sj3_freebsd.tmpl SUB_LIST= DESTDIR=${DESTDIR} -CFLAGS+= -Wno-return-type -fcommon + USERS= _sj3 GROUPS= _sj3 + +PLIST_SUB= USERS=${USERS} GROUPS=${GROUPS} PORTDOCS= Nihongo.ps.Z hinsi.ms makedict.ms sj3lib.ms sj3serv.ms +OPTIONS_DEFINE= DOCS + POSTPATCHES= ${FILESDIR}/post-patch-Imakefile \ ${FILESDIR}/post-patch-sj3lib-Imakefile \ ${FILESDIR}/post-patch-sj3-sj3.c \ @@ -39,15 +45,17 @@ POSTPATCHES= ${FILESDIR}/post-patch-Imakefile \ POSTPATCHES.nodocports= \ ${FILESDIR}/post-patch-doc-doc-Imakefile.nodocports -OPTIONS_DEFINE= DOCS +.include <bsd.port.pre.mk> -.include <bsd.port.options.mk> +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +CFLAGS+= -Wno-error=int-conversion +.endif post-patch: cd ${WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH} -.if !${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-off: cd ${WRKSRC} && ${CAT} ${POSTPATCHES.nodocports} | ${PATCH} -.endif pre-configure: ${INSTALL_DATA} ${WRKDIR}/sj3_freebsd.tmpl ${WRKSRC}/sj3_freebsd.tmpl @@ -55,4 +63,4 @@ pre-configure: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/sj3/dict/user -.include <bsd.port.mk> +.include <bsd.port.post.mk>