From nobody Tue Oct 3 11:09:37 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S0FTF3Mbfz4w7HR; Tue, 3 Oct 2023 11:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S0FTF2vyrz4N0c; Tue, 3 Oct 2023 11:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696331377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fAGsVuiIQJG3I9CRAZ7VVm1RmxWL2cGiNAkP8S2jPV4=; b=jv5UyN0OdTLz+Oi3i/HyeitMrbXtMNA1DBw1CyXCNflo9RW/yn6ZTcZRdf9bE8E4soacG8 tIoRmsmW2Rh0yt2t4TtViYInK4dZpXJ6uoYQrfISvLnmY/uBp8qDHq0U7Ju5I7L2PFpMWR hCtHeEfQkkd0pLQyfC47k/sGAG50OZBLjduM84SIRUxgFWLICOs/byHdEt5smX7UWTCXXB ELOz7T3UqlCeNZOWQWz/hGNsPsrIwH4t0m/CY73PhsIebNVLrhm5iG7XhuG6RsLwhFTIyS ZSbx60QxphHWwtLDOBVIGSFzmZUUDQb452KG5vD0e8TKxI5qxOlEG0JNeg8OIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696331377; a=rsa-sha256; cv=none; b=epd9oXZOXux8I8j7T//owfxXve4uulw7ZQRmHoTKaumQxUjtH+eZkGqpJnGsuAjuSR8f8j whGLCHZLh+QxWU2wNviRtbscMdTU+wkEioVTjHbbmKFERR2XRukykybe90v1W8kKO2ZT6H M1K7X1nhQaX7mU93wwSv16+DKLrLzzaZLdUD7NF7LQXZfmqnmun7HpiNI2fKMH1PH6m0Ip +T6FwlslsrqVMke5/8VzIrwD5scrk32Z+6DCbukBI5VD7G9r6qm7hlc8la1JYN2/T17b2F tHsCe88fsY4r7KEBiJEIjNdui1eO/q7MJ9iHvrV08tRoWjFYzQWOZ8HbwtDJKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696331377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fAGsVuiIQJG3I9CRAZ7VVm1RmxWL2cGiNAkP8S2jPV4=; b=Mb5ID8Cftd/IvBNPuPnMad0ISn040F7CrySeV5KIZdsmVTUwP9Q+wSQ26qf4X09iEpZ5Rt Hrb3KjEvx8lphBgub8CjWM4Ua/2q1NG/LS/pgxYz4ty4hBsE0AHssK/n7N2FEtuCuosuTo jFvKpvPffG1NIpleWkbsS+X+Iq1ooKmLokHH1MaCDEzoQAgeATmShyzSWIGWa7spLpgQ4U fCA4x+zxF1hZCY26B0X+rJWc9qsBPyx8I027MYjjqcZhuYn64E04sYcQXsp8ywdgiTkvOZ Wy6zXN3lfdEv1+v/oPGamiISn0bsGmvPgBJMmFOMaH6UjWEuzeEg7ZVC4heUYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S0FTF1p49zsKk; Tue, 3 Oct 2023 11:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 393B9bGD053489; Tue, 3 Oct 2023 11:09:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393B9bZ0053486; Tue, 3 Oct 2023 11:09:37 GMT (envelope-from git) Date: Tue, 3 Oct 2023 11:09:37 GMT Message-Id: <202310031109.393B9bZ0053486@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joel Bodenmann Subject: git: 9c67d516b56b - main - multimedia/motion: Update to 4.5.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c67d516b56bd08cd3d95f0c2095cbf7803407f7 Auto-Submitted: auto-generated The branch main has been updated by jbo: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c67d516b56bd08cd3d95f0c2095cbf7803407f7 commit 9c67d516b56bd08cd3d95f0c2095cbf7803407f7 Author: ports@blievers.net AuthorDate: 2023-09-25 20:45:20 +0000 Commit: Joel Bodenmann CommitDate: 2023-10-03 11:06:54 +0000 multimedia/motion: Update to 4.5.1 Changelogs: 4.5.1: https://github.com/Motion-Project/motion/releases/tag/release-4.5.1 4.5.0: https://github.com/Motion-Project/motion/releases/tag/release-4.5.0 4.4.0: https://github.com/Motion-Project/motion/releases/tag/release-4.4.0 PR: 273810 Approved by: zirias (mentor) Differential Revision: https://reviews.freebsd.org/D41915 --- multimedia/motion/Makefile | 67 ++++++++++----------------------------------- multimedia/motion/distinfo | 8 ++---- multimedia/motion/pkg-plist | 31 +++++++++++++++++++++ 3 files changed, 48 insertions(+), 58 deletions(-) diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index e90cd7e207f6..f85deae22be8 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -1,8 +1,7 @@ # PORTNAME block PORTNAME= motion -PORTVERSION= 4.3.2 -PORTREVISION= 8 DISTVERSIONPREFIX= release- +DISTVERSION= 4.5.1 CATEGORIES= multimedia # Maintainer block @@ -12,14 +11,14 @@ WWW= https://motion-project.github.io/ # License block LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/doc/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE # Dependencies LIB_DEPENDS= libwebp.so:graphics/webp \ libmicrohttpd.so:www/libmicrohttpd # USES block -USES= autoreconf cpe gmake jpeg localbase pkgconfig gettext +USES= autoreconf cpe gmake jpeg localbase pkgconfig CPE_VENDOR= ${PORTNAME}_project USE_GITHUB= yes @@ -28,29 +27,16 @@ USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes -CFLAGS+= -I${LOCALBASE}/ffmpeg4/include -LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib -CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" -MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" - # Standard bsd.port.mk variables SUB_FILES= pkg-message -# Packaging list block -PLIST_FILES= bin/motion \ - man/man1/motion.1.gz \ - "@sample ${ETCDIR}/motion.conf.sample" \ - "@dir ${ETCDIR}/conf.d" -PORTDOCS= * - -PORTEXAMPLES= camera1-dist.conf camera2-dist.conf \ - camera3-dist.conf camera4-dist.conf - # Options definitions -OPTIONS_DEFINE= DOCS EXAMPLES FFMPEG MYSQL PGSQL SQLITE3 +OPTIONS_DEFINE= DOCS EXAMPLES FFMPEG MYSQL PGSQL SQLITE3 NLS + OPTIONS_DEFAULT= WEBCAMD FFMPEG OPTIONS_RADIO= VIDEO OPTIONS_RADIO_VIDEO= BKTR PWCBSD WEBCAMD +OPTIONS_SUB= yes BKTR_DESC= BKTR based TV capture cards @@ -61,18 +47,17 @@ WEBCAMD_DESC= Webcams using webcamd BKTR_CONFIGURE_WITH= bktr -FFMPEG_LIB_DEPENDS= libavformat.so.58:multimedia/ffmpeg4 -FFMPEG_CONFIGURE_ON= --with-ffmpeg=${LOCALBASE}/ffmpeg4 -FFMPEG_CONFIGURE_OFF= --without-ffmpeg +FFMPEG_LIB_DEPENDS= libavformat.so.60:multimedia/ffmpeg +FFMPEG_CONFIGURE_WITH= ffmpeg MYSQL_USES= mysql -MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/include/mysql -MYSQL_CONFIGURE_OFF= --without-mysql +MYSQL_CONFIGURE_WITH= mysql + +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls PGSQL_USES= pgsql -PGSQL_CONFIGURE_ON= --with-pgsql-lib=${LOCALBASE}/lib \ - --with-pgsql-include=${LOCALBASE}/include -PGSQL_CONFIGURE_OFF= --without-pgsql +PGSQL_CONFIGURE_WITH= pgsql PWCBSD_BUILD_DEPENDS= v4l_compat>=1.0.20060801:multimedia/v4l_compat PWCBSD_RUN_DEPENDS= pwcbsd>0:multimedia/pwcbsd @@ -85,28 +70,4 @@ WEBCAMD_BUILD_DEPENDS= v4l_compat>=1.0.20060801:multimedia/v4l_compat # note: all configure --with-pwcbsd does is not shut off v4l support WEBCAMD_CONFIGURE_WITH= pwcbsd -.include - -post-patch: - @${REINPLACE_CMD} -e \ - 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure.ac -# Fix pidfile path - @${REINPLACE_CMD} -e \ - 's|/run/motion|/run|' ${WRKSRC}/data/motion-dist.conf.in - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/motion ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/motion.1 ${STAGEDIR}${MANPREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d - ${INSTALL_DATA} ${WRKSRC}/data/motion-dist.conf \ - ${STAGEDIR}${ETCDIR}/motion.conf.sample - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/* ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} - -do-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/data/|} ${STAGEDIR}${EXAMPLESDIR} - -.include +.include diff --git a/multimedia/motion/distinfo b/multimedia/motion/distinfo index c05734dbfad2..e67f71ef55e2 100644 --- a/multimedia/motion/distinfo +++ b/multimedia/motion/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1695017850 -SHA256 (Motion-Project-motion-release-4.3.2_GH0.tar.gz) = dafa4264b2d8e4778f8be5871f09b6c0ec710d5a836182c583469c18db944d70 -SIZE (Motion-Project-motion-release-4.3.2_GH0.tar.gz) = 849378 -SHA256 (af632f831127499ee541d9c719a930321718f294.patch) = 85dc0562c7dc358084c8c9556ebb8ef1592527d79f576f035f356bbdadf40c6c -SIZE (af632f831127499ee541d9c719a930321718f294.patch) = 890 +TIMESTAMP = 1694746910 +SHA256 (Motion-Project-motion-release-4.5.1_GH0.tar.gz) = 0c824276bb23565b7cf10409ebdcb46b85fb1f6abca957252e52290bb1fe473e +SIZE (Motion-Project-motion-release-4.5.1_GH0.tar.gz) = 856665 diff --git a/multimedia/motion/pkg-plist b/multimedia/motion/pkg-plist new file mode 100644 index 000000000000..e0eb8a7b5463 --- /dev/null +++ b/multimedia/motion/pkg-plist @@ -0,0 +1,31 @@ +bin/motion +man/man1/motion.1.gz +%%ETCDIR%%/camera1-dist.conf +%%ETCDIR%%/camera2-dist.conf +%%ETCDIR%%/camera3-dist.conf +%%ETCDIR%%/camera4-dist.conf +%%ETCDIR%%/motion-dist.conf +%%PORTDOCS%%%%DOCSDIR%%/CREDITS +%%PORTDOCS%%%%DOCSDIR%%/mask1.png +%%PORTDOCS%%%%DOCSDIR%%/motion_build.html +%%PORTDOCS%%%%DOCSDIR%%/motion_config.html +%%PORTDOCS%%%%DOCSDIR%%/motion_guide.html +%%PORTDOCS%%%%DOCSDIR%%/motion_stylesheet.css +%%PORTDOCS%%%%DOCSDIR%%/normal.jpg +%%PORTDOCS%%%%DOCSDIR%%/outputmotion1.jpg +%%PORTDOCS%%%%DOCSDIR%%/outputnormal1.jpg +%%NLS%%share/locale/da/LC_MESSAGES/motion.mo +%%NLS%%share/locale/de/LC_MESSAGES/motion.mo +%%NLS%%share/locale/es/LC_MESSAGES/motion.mo +%%NLS%%share/locale/fi/LC_MESSAGES/motion.mo +%%NLS%%share/locale/fr/LC_MESSAGES/motion.mo +%%NLS%%share/locale/it/LC_MESSAGES/motion.mo +%%NLS%%share/locale/ja/LC_MESSAGES/motion.mo +%%NLS%%share/locale/ko/LC_MESSAGES/motion.mo +%%NLS%%share/locale/li/LC_MESSAGES/motion.mo +%%NLS%%share/locale/nl/LC_MESSAGES/motion.mo +%%NLS%%share/locale/no/LC_MESSAGES/motion.mo +%%NLS%%share/locale/pt/LC_MESSAGES/motion.mo +%%NLS%%share/locale/sk/LC_MESSAGES/motion.mo +%%NLS%%share/locale/sv/LC_MESSAGES/motion.mo +%%NLS%%share/locale/zh/LC_MESSAGES/motion.mo