From nobody Sun Feb 11 11:50: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 4TXm9W3W5Tz59Z9T; Sun, 11 Feb 2024 11:50:07 +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 4TXm9T6RX1z46Hr; Sun, 11 Feb 2024 11:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707652205; 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=10YQnPGyhooYwCpTQQUbg23HlKTjwURXAxtmIEBup6Q=; b=Mn1zg/50aWdOSvaf84CDicRaCV0XbFwgWmiwMj4DHVnj0xzWdfqVIy4UT0WVZ2BLosrJyW dJXUYWgj38Xyl9rgwqWnPig9dfnwDEUWa2mf5b/2Okf3sSHgoZw7l2jGiqfwOKkRA6gKYa a3ALOmbMk+aFTxEZa+C/JY4tZJuEFrkYe7qyF9/hq1SzczR/nhLsp8aDJUUUrl9/ayCtLP ENerkBNmuLmB7U1s8M4v0PjtgfuXSI8Nf0vaJx2LopODum9TMakzbLaUZqIJj7zvkGPmo5 7Ar/nXHtkcLlFvXunrqmhOjkCDwZ911CEModnOJ8xaG5bMZkKfnzp6y2Bcm26w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707652205; a=rsa-sha256; cv=none; b=LlVUxOszb7q6mxmiTzk2y+u1b1ra9SAd+alxn+U/wTjlNG/FRydJjmieUC6gDd9s1DMGZj Do1KtKHyefYzvK7arqiIX6pBi1LYceU6WsSBqgO01xLhwGMTJmJkd0GN6f4xHHgSiLjxjy ABVITBpMaJ1RtM6Iu0to/ud46UukH+/cjD1ISP/da2a83JV5BE5mMcsDscI4oTgmJwgyRw sURCZRiWbynFRl6RKTxOIFA/TR+f/yBGJ+xA9IKVKLxYszARBMObsVmV/73y52B/FvF2K5 X1Hj4UPhPDnJ2nFxpNruzPTe9jMGFCJx5FIdAMf5zfjieJCL9KlqBszvbQMJ9g== 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=1707652205; 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=10YQnPGyhooYwCpTQQUbg23HlKTjwURXAxtmIEBup6Q=; b=ejl6jvromwV7kWb+YuuXNAE7hpvZbB3s2GYZgEHiFTnRnU/Fdcfccg7ts6rkgE7QMNVGgr fQSqTe9IWGzBpJJHTLKKpyJgkcYFTJPi75CAdfy66xKV8QOdrO5Uwr3gDhYDHUaDJZl3Ak HM9MEb45OpqPtNIaTt2OrM2lFmJ4wrgwgKw/LaTMf8KaYjA7C4q0Gutq1/rM8iW1hsFyjm eE/vmxEqEUQb/A9OdTpPhN8iWEdK+AqelUTf5AbT6VyCcCwaMiDbn1Ya+g/N/thL7jNw32 Jc9JqDC1Ms3KdNBVjnNM2Ro3ZWgTpquVk29DpyrOcUPvidkRRcjkjJ1q3FC50g== 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 4TXm9T5WNMzy60; Sun, 11 Feb 2024 11:50: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 41BBo5jY088954; Sun, 11 Feb 2024 11:50:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41BBo50H088951; Sun, 11 Feb 2024 11:50:05 GMT (envelope-from git) Date: Sun, 11 Feb 2024 11:50:05 GMT Message-Id: <202402111150.41BBo50H088951@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 010d332046b8 - main - www/igal2: update to 3.1 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 010d332046b86f6e87de253f9198eca9f478ab81 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=010d332046b86f6e87de253f9198eca9f478ab81 commit 010d332046b86f6e87de253f9198eca9f478ab81 Author: Piotr Kubaj AuthorDate: 2024-02-09 23:30:03 +0000 Commit: Piotr Kubaj CommitDate: 2024-02-11 11:49:03 +0000 www/igal2: update to 3.1 PR: 276018 Submitted by: Krzysztof (ports@bsdserwis.com) Approved by: Krzysztof (ports@bsdserwis.com) --- www/igal2/Makefile | 15 ++++++++------- www/igal2/distinfo | 6 +++--- www/igal2/files/patch-Makefile | 41 +++++++++++++++++++---------------------- www/igal2/files/patch-igal2 | 14 +++++++------- www/igal2/pkg-plist | 19 ++++++++++--------- 5 files changed, 47 insertions(+), 48 deletions(-) diff --git a/www/igal2/Makefile b/www/igal2/Makefile index 709856b98fb3..bbec66d19e2f 100644 --- a/www/igal2/Makefile +++ b/www/igal2/Makefile @@ -1,8 +1,7 @@ PORTNAME= igal2 -PORTVERSION= 2.2 -PORTREVISION= 4 +DISTVERSION= 3.1 CATEGORIES= www graphics -MASTER_SITES= http://igal.trexler.at/ +MASTER_SITES= https://codeload.github.com/solbu/${PORTNAME}/tar.gz/v${DISTVERSION}?dummy=/ MAINTAINER= ports@bsdserwis.com COMMENT= Simple CLI image gallery generator @@ -13,9 +12,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= igal-1.* -USES= perl5 +USES= perl5 shebangfix NO_BUILD= yes NO_ARCH= yes +SHEBANG_FILES= ${PORTNAME} OPTIONS_DEFINE= EXIF EXIF_DESC= Support EXIF data (-e option) @@ -28,11 +28,12 @@ IMAGICK_X11_DESC=With X11 support EXIF_RUN_DEPENDS= p5-Image-ExifTool>=7.0:graphics/p5-Image-ExifTool -IMAGICK_X11_USES= magick:6,run -IMAGICK_NOX11_USES= magick:6,run,nox11 +IMAGICK_X11_USES= magick:7,run +IMAGICK_NOX11_USES= magick:7,run,nox11 post-patch: - ${REINPLACE_CMD} -e 's|%%LIBDIR%%|${PREFIX}/lib/igal2|' ${WRKSRC}/igal2 + ${REINPLACE_CMD} -e 's|%%IGALDIR%%|${PREFIX}/share/igal2|' ${WRKSRC}/${PORTNAME} + ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/${PORTNAME} ${WRKSRC}/utilities/${PORTNAME}.sh ${WRKSRC}/${PORTNAME}.1 post-install: ${LN} -sf igal2 ${STAGEDIR}${PREFIX}/bin/igal diff --git a/www/igal2/distinfo b/www/igal2/distinfo index 62f73bf509b4..a7af5d90b144 100644 --- a/www/igal2/distinfo +++ b/www/igal2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1471181539 -SHA256 (igal2-2.2.tar.gz) = e945f830be765e3b826ad3468edd2e58b1a405b3f2fe785b1bdd689394eb0d62 -SIZE (igal2-2.2.tar.gz) = 28458 +TIMESTAMP = 1703791514 +SHA256 (igal2-3.1.tar.gz) = cf29e5f255c4e693dc47e71bcb8c208c8828aa89274ccb394a56ae7f339b819f +SIZE (igal2-3.1.tar.gz) = 29372 diff --git a/www/igal2/files/patch-Makefile b/www/igal2/files/patch-Makefile index c299ef84e207..367a58b716b5 100644 --- a/www/igal2/files/patch-Makefile +++ b/www/igal2/files/patch-Makefile @@ -1,26 +1,23 @@ ---- Makefile.orig 2008-11-16 21:00:00 UTC +--- Makefile.orig 2021-11-18 00:25:55 UTC +++ Makefile -@@ -1,11 +1,11 @@ - ############################################################################ - # if you change this, please also modify the value at the top of igal code --DESTDIR=/usr/local -+DESTDIR?=/usr/local - ############################################################################ +@@ -1,5 +1,5 @@ + NAME=igal2 +-PREFIX=/usr/local ++PREFIX?=/usr/local + BINDIR=$(PREFIX)/bin + DATADIR=$(PREFIX)/share + MANDIR=$(DATADIR)/man/man1 +@@ -24,13 +24,11 @@ old-clean: + install: + install -d $(DESTDIR)$(BINDIR) + install -m 0755 $(NAME) $(DESTDIR)$(BINDIR) +- ln -si $(NAME) $(DESTDIR)$(BINDIR)/igal + install -m 0755 utilities/$(NAME).sh $(DESTDIR)$(BINDIR) + install -d $(DESTDIR)$(MANDIR) + install -m 0644 $(NAME).1 $(DESTDIR)$(MANDIR) + install -d $(DESTDIR)$(IGALDIR) + install -m 0644 README ChangeLog COPYING indextemplate2.html slidemovtemplate2.html slidetemplate2.html tile.png $(NAME).css directoryline2.html $(DESTDIR)$(IGALDIR) +- sed -i 's_/usr/local_$(PREFIX)_' $(DESTDIR)$(BINDIR)/$(NAME) $(DESTDIR)$(BINDIR)/$(NAME).sh $(DESTDIR)$(MANDIR)/$(NAME).1 --BINDIR=$(DESTDIR)/bin --MANDIR=$(DESTDIR)/man/man1 --LIBDIR=$(DESTDIR)/lib/igal2 -+BINDIR=$(DESTDIR)$(PREFIX)/bin -+MANDIR=$(DESTDIR)$(PREFIX)/man/man1 -+LIBDIR=$(DESTDIR)$(PREFIX)/lib/igal2 - OLDLIBDIR=$(DESTDIR)/lib/igal -@@ -24,7 +24,6 @@ old-clean:: - install:: igal2 - install -d $(BINDIR) - install -m 0755 igal2 $(BINDIR) -- ln -si $(BINDIR)/igal2 $(BINDIR)/igal - install -m 0755 utilities/igal2.sh $(BINDIR) - install -d $(MANDIR) - install -m 0644 igal2.1 $(MANDIR) diff --git a/www/igal2/files/patch-igal2 b/www/igal2/files/patch-igal2 index b03e31c6cdc9..3786d11ad18d 100644 --- a/www/igal2/files/patch-igal2 +++ b/www/igal2/files/patch-igal2 @@ -1,11 +1,11 @@ ---- igal2.orig 2016-06-02 05:29:25 UTC +--- igal2.orig 2021-11-18 00:25:55 UTC +++ igal2 -@@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' +@@ -6,7 +6,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' ############################################################################ # Please change this accordingly if you change the DESTDIR in the tarball # distribution Makefile or the --prefix of the RPM installation --$LIBDIR = "/usr/local/lib/igal2"; -+$LIBDIR = "%%LIBDIR%%"; - # for example if you make DESTDIR=/usr then $LIBDIR="/usr/lib/igal2" - ############################################################################ - # +-$IGALDIR = "/usr/local/share/igal2"; ++$IGALDIR = "%%IGALDIR%%"; + # debug locally + #use File::Basename; + #$IGALDIR = dirname($0); diff --git a/www/igal2/pkg-plist b/www/igal2/pkg-plist index 7292b32e1dab..e1a0dc581e01 100644 --- a/www/igal2/pkg-plist +++ b/www/igal2/pkg-plist @@ -1,12 +1,13 @@ bin/igal bin/igal2 bin/igal2.sh -lib/igal2/COPYING -lib/igal2/ChangeLog -lib/igal2/README -lib/igal2/directoryline2.html -lib/igal2/igal2.css -lib/igal2/indextemplate2.html -lib/igal2/slidetemplate2.html -lib/igal2/tile.png -man/man1/igal2.1.gz +%%DATADIR%%/ChangeLog +%%DATADIR%%/COPYING +%%DATADIR%%/directoryline2.html +%%DATADIR%%/igal2.css +%%DATADIR%%/indextemplate2.html +%%DATADIR%%/README +%%DATADIR%%/slidemovtemplate2.html +%%DATADIR%%/slidetemplate2.html +%%DATADIR%%/tile.png +share/man/man1/igal2.1.gz