From nobody Fri May 12 11:55:36 2023 X-Original-To: dev-commits-ports-all@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 4QHnJn15tqz49vmH; Fri, 12 May 2023 11:55: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 4QHnJn0hBrz3pFP; Fri, 12 May 2023 11:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683892537; 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=VlCJD6Gz7z0znGmO6aPV5mo/n5DS39djtP+F2XnL3UI=; b=qd2OBKNRT5S2s4IDuOdwYmXALiYNpSgZy23VdqW3Cb8Te1nUPOZf4idCTgk0TD2oSsjYOF paqGwg1HTNSCcWI/NqfjOe4+QwjER5I55KZdQ1r1BavjgpbcTAATSUv2R0w/fzlsYvbSGK gOLI2K6m9Lmu9fxx7mk3+IoCz336706TKMB5A958hCTUAhdmgmFSEzGl5wIxJEdfUhL2fB XbXgcXgy0efbYSzbMUlITn/p5hbZ9LCnnD16l9BGXwiHi9g+42mUiCSoR2my/+DcaVTGok 2YSsZ1wX1d5JAWyeAK8DZ8inb5wXcimrHJhiCDA7rYTjAsL3aCnmaZwslRZHrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683892537; 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=VlCJD6Gz7z0znGmO6aPV5mo/n5DS39djtP+F2XnL3UI=; b=pxcYuN7HX0sGaeiNDFs3pQ4C6iM/cDxThMVYqgICMwtaL2nISwZJ3qMyTz5jwiyc3Ay9T3 wQiEbkhmIy7oeZF7XIYVe/sKhZ/E/322rxJnbPVmNbS0F4EsRbCEO9Ks6aOFEdYMCt54tC WuBPOabphtSCeluB8YtEDInpkrdUWSPS959lAxgeJoA/Wye5RTQb6UCS1UR5AyhN3Sn0cs ZG8tJw1rq2rQL2hTF2MfihjP+3xtENEbOZ+RvCy4x8inAk6+SWU695a9TzOXRisiNtbmdV SynLQPGLSUjmXZ0ji1octquI3GdT+IaYZvNHO1+eVtLa3cLMjMgqIccsXJ0cKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683892537; a=rsa-sha256; cv=none; b=m0/VYiJZx0eDFdd4jV6fP1E29Uo5vCIuRMe6IwjzIFkk4kHqKPrmrLUBWJW3otQz2HU1lO 8O24na3wUCy13Af0KCZ0n7+TCptT79u8QaazO3fD3+7I3UBH0jttc+d5VYOoiQhu1ePY6i jR1XpksgVFTfQLRwjKgCX88MR3BLuVxEMmdxE6+Vzc8txkShdzo6OTHKcmHwviTRSi1fx9 5apz/YpBXrAzQa8rqEDjgxFZCjkttnYV5nZFegUxFaqeqFaAZlB+3aL98gXqc3pfD0SXcM gOW+L2zgQkE0TuuLG2kERhPP0NDgS3yHvLDA68r4I+qqsiZVu8ACyTqyGmMmEg== 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 4QHnJm6vVYzYMK; Fri, 12 May 2023 11:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34CBtahS083911; Fri, 12 May 2023 11:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CBta4T083910; Fri, 12 May 2023 11:55:36 GMT (envelope-from git) Date: Fri, 12 May 2023 11:55:36 GMT Message-Id: <202305121155.34CBta4T083910@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: e0ba0f84d9ac - main - multimedia/smplayer: the port had been improved (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0ba0f84d9ac84a5571565c15ab14eb020efd751 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0ba0f84d9ac84a5571565c15ab14eb020efd751 commit e0ba0f84d9ac84a5571565c15ab14eb020efd751 Author: Alexey Dokuchaev AuthorDate: 2023-05-12 11:55:02 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-12 11:55:02 +0000 multimedia/smplayer: the port had been improved (+) - Limit DOS2UNIX conversion only to text files that actually need it - Stop messing with the Makefile in the `post-patch' target and amend existing patch instead, correctly call inner submakes, etc. - Fix spelling in the port installation message while I'm here --- multimedia/smplayer/Makefile | 8 ++------ multimedia/smplayer/files/patch-Makefile | 35 +++++++++++++++++++++++++++++--- multimedia/smplayer/files/pkg-message.in | 2 +- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile index 6e9f4d544fdd..8b6772ee95ee 100644 --- a/multimedia/smplayer/Makefile +++ b/multimedia/smplayer/Makefile @@ -19,11 +19,11 @@ USE_QT= buildtools:build linguisttools:build \ USE_XORG= x11 xext CPE_VENDOR= ricardo_villalba -DOS2UNIX_REGEX= .*.[^p][^n][^g]$ +DOS2UNIX_GLOB= *.md *.txt ALL_TARGET= src/smplayer CONFIGURE_WRKSRC= ${WRKSRC}/src -MAKE_ARGS= PREFIX=${PREFIX} DESTDIR=${STAGEDIR} +MAKE_ENV= DESTDIR=${STAGEDIR} LRELEASE=${LRELEASE} QMAKE_ARGS= "DEFINES_DISABLED+=MPLAYER2_SUPPORT" PORTDOCS= ${DOCS:T} @@ -57,10 +57,6 @@ PORTSCOUT= site:http://sourceforge.net/projects/smplayer/files/Unstable/releases SUB_FILES= pkg-message post-patch: - @${REINPLACE_CMD} -e 's|&& $$(QMAKE) $$(QMAKE_OPTS)||; \ - s|lrelease|${LRELEASE}|; \ - s| make| ${MAKE_CMD}|g' \ - ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|-O2 -W -Wall -Werror|${CFLAGS}|' \ ${WRKSRC}/webserver/Makefile @${REINPLACE_CMD} -e 's|^sed|#sed|' \ diff --git a/multimedia/smplayer/files/patch-Makefile b/multimedia/smplayer/files/patch-Makefile index 7559e40252aa..e5751409740a 100644 --- a/multimedia/smplayer/files/patch-Makefile +++ b/multimedia/smplayer/files/patch-Makefile @@ -1,6 +1,11 @@ ---- Makefile.orig 2018-01-12 15:20:18 UTC +--- Makefile.orig 2021-08-01 06:29:39 UTC +++ Makefile -@@ -5,7 +5,6 @@ PREFIX=/usr/local +@@ -1,11 +1,10 @@ + +-PREFIX=/usr/local ++PREFIX?=/usr/local + #PREFIX=/tmp/smplayer + CONF_PREFIX=$(PREFIX) DATA_PATH=$(PREFIX)/share/smplayer @@ -8,7 +13,14 @@ TRANSLATION_PATH=$(PREFIX)/share/smplayer/translations THEMES_PATH=$(PREFIX)/share/smplayer/themes SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts -@@ -19,7 +18,7 @@ LRELEASE=lrelease +@@ -14,26 +13,26 @@ ICONS_DIR=$(PREFIX)/share/icons/hicolor/ + APPLNK_DIR=$(PREFIX)/share/applications/ + METAINFO_DIR=$(PREFIX)/share/metainfo/ + +-QMAKE=qmake +-LRELEASE=lrelease ++QMAKE?=qmake ++LRELEASE?=lrelease DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \ TRANSLATION_PATH=\\\"$(TRANSLATION_PATH)\\\" \ @@ -17,6 +29,23 @@ SHORTCUTS_PATH=\\\"$(SHORTCUTS_PATH)\\\" all: src/smplayer webserver/simple_web_server + + src/smplayer: + ./get_svn_revision.sh +- +cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make ++ $(MAKE) -C src $(DEFS) + cd src && $(LRELEASE) smplayer.pro + + webserver/simple_web_server: +- cd webserver && make ++ $(MAKE) -C webserver + + clean: +- if [ -f src/Makefile ]; then cd src && make distclean; fi ++ if [ -f src/Makefile ]; then $(MAKE) -C src distclean; fi + -rm src/translations/smplayer_*.qm + -rm webserver/simple_web_server + @@ -44,13 +43,8 @@ install: all install -m 644 src/input.conf $(DESTDIR)$(DATA_PATH) -install -d $(DESTDIR)$(TRANSLATION_PATH) diff --git a/multimedia/smplayer/files/pkg-message.in b/multimedia/smplayer/files/pkg-message.in index 80daf058d0e5..366f08894263 100644 --- a/multimedia/smplayer/files/pkg-message.in +++ b/multimedia/smplayer/files/pkg-message.in @@ -3,7 +3,7 @@ message: <