git: 010d332046b8 - main - www/igal2: update to 3.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Sun, 11 Feb 2024 11:50:05 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=010d332046b86f6e87de253f9198eca9f478ab81

commit 010d332046b86f6e87de253f9198eca9f478ab81
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-02-09 23:30:03 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
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