www/sogo: Fix build on HEAD and pkg-plist

Approved by: portmgr (blanket)
freebsd · May 1, 2023 · 7c1a0b5 · 7c1a0b5
1 parent 1a13e6f
commit 7c1a0b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
@@ -57,6 +57,12 @@ SUB_FILES+=		pkg-message
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 			GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CPPFLAGS+=       -Wno-error=int-conversion
+.endif
+
 post-patch:
 	@${GREP} -rlF '/etc/sogo' ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
@@ -81,4 +87,4 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/cron-ealarms-notify.sample ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/Admin/
 	${INSTALL_DATA} ${FILESDIR}/cron-expire-autoreply.sample ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/Admin/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/sogo/pkg-plist b/www/sogo/pkg-plist
@@ -2186,8 +2186,6 @@ GNUstep/Local/Library/WOxElemBuilders-4.9/SOGoElements.wox/Resources/Info-gnuste
 GNUstep/Local/Library/WOxElemBuilders-4.9/SOGoElements.wox/SOGoElements
 GNUstep/Local/Library/WOxElemBuilders-4.9/SOGoElements.wox/bundle-info.plist
 GNUstep/Local/Library/WOxElemBuilders-4.9/SOGoElements.wox/stamp.make
-GNUstep/Local/Tools/Admin/cron-ealarms-notify.sample
-GNUstep/Local/Tools/Admin/cron-expire-autoreply.sample
 GNUstep/Local/Tools/Admin/sogo-ealarms-notify
 GNUstep/Local/Tools/Admin/sogo-slapd-sockd
 GNUstep/Local/Tools/Admin/sogo-tool