From nobody Mon Jan 22 23:07:05 2024 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 4TJm7s32lzz58PFY; Mon, 22 Jan 2024 23:07:05 +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 4TJm7s2ZTJz4fV6; Mon, 22 Jan 2024 23:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705964825; 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=RF4Jkm34Zz27QapW17elJLsdEjv3JAyVI44cyLTrJ/o=; b=VaqaeKMACip0zGInelBYYw4SJu6n0eU2t301H69ilwSQxC6y5vsdzGGC/Y4lGkJrp+lHxZ STT/3dru7DtvnF8p4CjFBTdCZSk9Y1n3OGQ4SNEcKprApZgqrCjUolTvE0ij7XXYy4g03d OBJy25ouxKiOv4lfasdXNYmmH1M/h1vZDRgXeer9rOTF9TYN3hhG99MLdngLHnbDTUl3tR 2vJTbQLLGl4WJpH07HaIaMBLcE5EhRabc+4u8okgJ1LcI1pMQCxY3TZT/mc1/A+Y4XUOlA qOqIAu0r/9EDmtTobSIKlTystpDx3P0vI770OIpPMGt4AZTH9/ulUI2IgBuY0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705964825; 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=RF4Jkm34Zz27QapW17elJLsdEjv3JAyVI44cyLTrJ/o=; b=JCdqoHHQ4/f5ShT3d/5uv+KR+NBdZsb7Xdvx8KwlKT802CJzwRFvG4MoFq+5zTdSoOprAH tnYQtPvH0pncxU5wqsSG/Fo/ppNUnpDsh3YJpvsyEoQ9c4AYxElA27aFx9iB5l/FU6bi4a F2dR2o67zzOyvbPsuSt2Lven+0BhSBWXAhTkkpC8bOtCXQ36NGZCHETO3I+bbfcIvzBLyD xhsAhObWaiacQttbjRpGz2vcV2CmyzsJeimDxLS0mt4KEIrEdr7BnZfuzs7lpOZ7rA0Awc Az6tuiJkC4gGfh6hKzXTAxXaP31Hrj+wjPRZParoagC/qSsrDUbNiU56pu3Psg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705964825; a=rsa-sha256; cv=none; b=UTbkOzGWZvEswqWXleLT21Uf6qGjCf8Zjfyy5EN0N8847wj2hkYKwHt1jfFm97EImxYyYv +dOxnf/XMidr9WC4DWG390VZnBWJYcdNCKP59tlUpUgFAAS3s4Da2CdOlzjkjxhq8IsCmz TluCFYd0tR2ayj5fmrJ0fDrysPk06lYQanOQaiWLkdTeEMmhU9Q1Z4orr8hTD2O4CAytBB VU8juLNJRe2to0zYrLS2/o6AwPkm/p9uH9BnQfCPffakeStMnZagzm/lWpsJp387FqkO9O oluSI2R6hdy0VZ4Z+7DE/yz/W1k+KLXqA6NIktSaop5u8/ZPKawKEjT/J44McA== 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 4TJm7s1LNyz1LBb; Mon, 22 Jan 2024 23:07:05 +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 40MN75s7085353; Mon, 22 Jan 2024 23:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MN75q3085350; Mon, 22 Jan 2024 23:07:05 GMT (envelope-from git) Date: Mon, 22 Jan 2024 23:07:05 GMT Message-Id: <202401222307.40MN75q3085350@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: 6d303173a5c3 - main - graphics/pho: the port had been modernized (+) 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: 6d303173a5c3ef91a43a7dc076e760dd3e126c93 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d303173a5c3ef91a43a7dc076e760dd3e126c93 commit 6d303173a5c3ef91a43a7dc076e760dd3e126c93 Author: Alexey Dokuchaev AuthorDate: 2024-01-22 23:06:28 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-01-22 23:06:28 +0000 graphics/pho: the port had been modernized (+) - Convert somewhat cluttered `post-patch' target to a regular patch - Install the manpage under ${PREFIX}/share/man per new world order - Chase HTTP/1.1 301 Moved Permanently redirect in the MASTER_SITES --- graphics/pho/Makefile | 9 ++------- graphics/pho/files/patch-Makefile | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/graphics/pho/Makefile b/graphics/pho/Makefile index bd8cbe8d7c24..e492d0283015 100644 --- a/graphics/pho/Makefile +++ b/graphics/pho/Makefile @@ -2,7 +2,7 @@ PORTNAME= pho PORTVERSION= 1.0 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= http://shallowsky.com/software/pho/ +MASTER_SITES= ${WWW} MAINTAINER= danfe@FreeBSD.org COMMENT= Lightweight image viewer @@ -12,17 +12,12 @@ LICENSE= GPLv2 USES= gmake gnome pkgconfig USE_GNOME= gtk20 -MAKE_ARGS= INSTALLPREFIX="${STAGEDIR}${PREFIX}" ALL_TARGET= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} -PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz post-patch: - @${REINPLACE_CMD} -e 's|make|$$(MAKE)| ; \ - /bin/s|$$(INSTALL)|${INSTALL_PROGRAM}| ; \ - /man/s|$$(INSTALL)|${INSTALL_MAN}| ; \ - /CFLAGS/s|-g ||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|-Wall -g -O2 ||' ${WRKSRC}/exif/Makefile .include diff --git a/graphics/pho/files/patch-Makefile b/graphics/pho/files/patch-Makefile new file mode 100644 index 000000000000..80202ca0ddd7 --- /dev/null +++ b/graphics/pho/files/patch-Makefile @@ -0,0 +1,22 @@ +--- Makefile.orig 2020-09-26 16:16:24 UTC ++++ Makefile +@@ -4,7 +4,7 @@ VERSION = 1.0 + + # Locate the gtk/gdk libraries (thanks to nev for this!) + GTKFLAGS := $(shell pkg-config --cflags gtk+-2.0 gdk-2.0 2> /dev/null) +-CFLAGS += -g -Wall -pedantic -DVERSION='"$(VERSION)"' $(GTKFLAGS) ++CFLAGS += -Wall -pedantic -DVERSION='"$(VERSION)"' $(GTKFLAGS) + + XLIBS := $(shell pkg-config --libs gtk+-2.0 > /dev/null) + GLIBS := $(shell pkg-config --libs gtk+-2.0 gdk-2.0) +@@ -57,8 +57,8 @@ deb: pho + dpkg-buildpackage -rfakeroot + + install: pho +- $(INSTALL) pho $(INSTALLPREFIX)/bin/pho +- $(INSTALL) doc/pho.1 $(INSTALLPREFIX)/man/man1/pho.1 ++ $(BSD_INSTALL_PROGRAM) pho $(DESTDIR)$(PREFIX)/bin ++ $(BSD_INSTALL_MAN) doc/pho.1 $(DESTDIR)$(PREFIX)/share/man/man1 + + clean: + rm -f *.[oas] *.ld core* pho pho-*.tar.gz *.rpm *.tar.gz