Update to 4.1

PR:		36164
Submitted by:	maintainer

4 files changed, 50 insertions, 5 deletions

diff --git a/graphics/cthumb/Makefile b/graphics/cthumb/Makefile
index 1e6e46781d0d..a69d1ec86d81 100644
--- a/graphics/cthumb/Makefile
+++ b/graphics/cthumb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cthumb
-PORTVERSION=	4.0
+PORTVERSION=	4.1
 CATEGORIES=	graphics www
 MASTER_SITES=	http://puchol.com/cpg/software/cthumb/
 
@@ -21,6 +21,7 @@ SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 SITE_PERL_ARCH=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-themedir=${PREFIX}/share/${PORTNAME}
 
 MAN1=		cthumb.1
 
@@ -51,8 +52,7 @@ THEMES=		blue-steel.theme \
 
 post-configure:
 	@${PERL} -pi \
-		-e 's|${PREFIX}/share/images/cthumb|${DATADIR}|g;' \
-		-e 's|cp -a|cp -R|g;' \
+		-e 's|cp -r|cp -Rf|g;' \
 		${WRKSRC}/cthumb
 
 do-install:
diff --git a/graphics/cthumb/distinfo b/graphics/cthumb/distinfo
index 7c9ce7658ae2..8df9610cd4c3 100644
--- a/graphics/cthumb/distinfo
+++ b/graphics/cthumb/distinfo
@@ -1 +1 @@
-MD5 (cthumb-4.0.tar.gz) = e0be0811b94aa3457bfe391e4c754cf9
+MD5 (cthumb-4.1.tar.gz) = 503579736485bcff382d0ea3caeb70f9
diff --git a/graphics/cthumb/files/patch-cthumb.in b/graphics/cthumb/files/patch-cthumb.in
new file mode 100644
index 000000000000..19c1ae2f67eb
--- /dev/null
+++ b/graphics/cthumb/files/patch-cthumb.in
@@ -0,0 +1,22 @@
+--- cthumb.in.orig	Sat Dec 15 18:00:19 2001
++++ cthumb.in	Sat Mar 23 23:42:12 2002
+@@ -454,6 +454,7 @@
+     if ($CheckThumbnails) {
+ 	eval "require Image::Size";
+ 	if (defined $Image::Size::VERSION) {
++            $Image::Size::VERSION = $Image::Size::VERSION;
+ 	    $HaveImageSizePerlModule=1;
+ 	}
+     }
+@@ -557,7 +558,10 @@
+     if ($NoMainIndex) {
+ 	unlink($indextmp);
+     } else {
+-        if (system ("diff -q $indextmp $MainIndexName &> /dev/null")) {
++	local $ENV{SHELL}='/bin/sh';
++	system ("diff -q $indextmp $MainIndexName 2>/dev/null");
++	my $difret = $? >> 8;
++        if ($difret != 0) {
+ 	    print "Index for $descfname in: $MainIndexName\n";
+ 	    my $cmd = "mv $indextmp $MainIndexName";
+ 	    if (system($cmd)) { print "cthumb warning: command '$cmd' failed: $!\n"; }
diff --git a/graphics/cthumb/pkg-plist b/graphics/cthumb/pkg-plist
index ead9ee4a24f3..69033a614e25 100644
--- a/graphics/cthumb/pkg-plist
+++ b/graphics/cthumb/pkg-plist
@@ -1,5 +1,6 @@
 bin/cthumb
 share/cthumb/blue-steel.theme/1.gif
+share/cthumb/blue-steel.theme/back.png
 share/cthumb/blue-steel.theme/bot.png
 share/cthumb/blue-steel.theme/left.png
 share/cthumb/blue-steel.theme/next.png
@@ -8,6 +9,7 @@ share/cthumb/blue-steel.theme/right.png
 share/cthumb/blue-steel.theme/theme.conf
 share/cthumb/blue-steel.theme/top.png
 share/cthumb/classic-clips.theme/1.gif
+share/cthumb/classic-clips.theme/back.png
 share/cthumb/classic-clips.theme/bot.png
 share/cthumb/classic-clips.theme/left.png
 share/cthumb/classic-clips.theme/next.png
@@ -16,6 +18,7 @@ share/cthumb/classic-clips.theme/right.png
 share/cthumb/classic-clips.theme/theme.conf
 share/cthumb/classic-clips.theme/top.png
 share/cthumb/classic.theme/1.gif
+share/cthumb/classic.theme/back.png
 share/cthumb/classic.theme/bot.png
 share/cthumb/classic.theme/left.png
 share/cthumb/classic.theme/next.png
@@ -24,6 +27,7 @@ share/cthumb/classic.theme/right.png
 share/cthumb/classic.theme/theme.conf
 share/cthumb/classic.theme/top.png
 share/cthumb/crosshair.theme/1.gif
+share/cthumb/crosshair.theme/back.png
 share/cthumb/crosshair.theme/bot.png
 share/cthumb/crosshair.theme/left.png
 share/cthumb/crosshair.theme/next.png
@@ -55,6 +59,7 @@ share/cthumb/film.theme/top-7.png
 share/cthumb/film.theme/top-8.png
 share/cthumb/film.theme/top-9.png
 share/cthumb/flaps.theme/1.gif
+share/cthumb/flaps.theme/back.png
 share/cthumb/flaps.theme/bot.png
 share/cthumb/flaps.theme/left.png
 share/cthumb/flaps.theme/next.png
@@ -63,6 +68,7 @@ share/cthumb/flaps.theme/right.png
 share/cthumb/flaps.theme/theme.conf
 share/cthumb/flaps.theme/top.png
 share/cthumb/float-medium.theme/1.gif
+share/cthumb/float-medium.theme/back.png
 share/cthumb/float-medium.theme/bot.png
 share/cthumb/float-medium.theme/left.png
 share/cthumb/float-medium.theme/next.png
@@ -71,6 +77,7 @@ share/cthumb/float-medium.theme/right.png
 share/cthumb/float-medium.theme/theme.conf
 share/cthumb/float-medium.theme/top.png
 share/cthumb/float-more.theme/1.gif
+share/cthumb/float-more.theme/back.png
 share/cthumb/float-more.theme/bot.png
 share/cthumb/float-more.theme/left.png
 share/cthumb/float-more.theme/next.png
@@ -79,6 +86,7 @@ share/cthumb/float-more.theme/right.png
 share/cthumb/float-more.theme/theme.conf
 share/cthumb/float-more.theme/top.png
 share/cthumb/float-thick.theme/1.gif
+share/cthumb/float-thick.theme/back.png
 share/cthumb/float-thick.theme/bot.png
 share/cthumb/float-thick.theme/left.png
 share/cthumb/float-thick.theme/next.png
@@ -87,6 +95,7 @@ share/cthumb/float-thick.theme/right.png
 share/cthumb/float-thick.theme/theme.conf
 share/cthumb/float-thick.theme/top.png
 share/cthumb/float.theme/1.gif
+share/cthumb/float.theme/back.png
 share/cthumb/float.theme/bot.png
 share/cthumb/float.theme/left.png
 share/cthumb/float.theme/next.png
@@ -95,6 +104,7 @@ share/cthumb/float.theme/right.png
 share/cthumb/float.theme/theme.conf
 share/cthumb/float.theme/top.png
 share/cthumb/ithumb.theme/1.gif
+share/cthumb/ithumb.theme/back.png
 share/cthumb/ithumb.theme/bot.png
 share/cthumb/ithumb.theme/left.png
 share/cthumb/ithumb.theme/next.png
@@ -103,6 +113,7 @@ share/cthumb/ithumb.theme/right.png
 share/cthumb/ithumb.theme/theme.conf
 share/cthumb/ithumb.theme/top.png
 share/cthumb/neat-round.theme/1.gif
+share/cthumb/neat-round.theme/back.png
 share/cthumb/neat-round.theme/bot.png
 share/cthumb/neat-round.theme/left.png
 share/cthumb/neat-round.theme/next.png
@@ -111,6 +122,7 @@ share/cthumb/neat-round.theme/right.png
 share/cthumb/neat-round.theme/theme.conf
 share/cthumb/neat-round.theme/top.png
 share/cthumb/neat-square.theme/1.gif
+share/cthumb/neat-square.theme/back.png
 share/cthumb/neat-square.theme/bot.png
 share/cthumb/neat-square.theme/left.png
 share/cthumb/neat-square.theme/next.png
@@ -120,6 +132,7 @@ share/cthumb/neat-square.theme/theme.conf
 share/cthumb/neat-square.theme/top.png
 share/cthumb/oak.theme/1.gif
 share/cthumb/oak.theme/Copyright
+share/cthumb/oak.theme/back.png
 share/cthumb/oak.theme/bot.png
 share/cthumb/oak.theme/left.png
 share/cthumb/oak.theme/next.png
@@ -128,6 +141,7 @@ share/cthumb/oak.theme/right.png
 share/cthumb/oak.theme/theme.conf
 share/cthumb/oak.theme/top.png
 share/cthumb/postcard.theme/1.gif
+share/cthumb/postcard.theme/back.png
 share/cthumb/postcard.theme/bot.png
 share/cthumb/postcard.theme/left.png
 share/cthumb/postcard.theme/next.png
@@ -136,6 +150,7 @@ share/cthumb/postcard.theme/right.png
 share/cthumb/postcard.theme/theme.conf
 share/cthumb/postcard.theme/top.png
 share/cthumb/shiny-tube.theme/1.gif
+share/cthumb/shiny-tube.theme/back.png
 share/cthumb/shiny-tube.theme/bot.png
 share/cthumb/shiny-tube.theme/left.png
 share/cthumb/shiny-tube.theme/next.png
@@ -144,6 +159,7 @@ share/cthumb/shiny-tube.theme/right.png
 share/cthumb/shiny-tube.theme/theme.conf
 share/cthumb/shiny-tube.theme/top.png
 share/cthumb/simpleframe.theme/1.gif
+share/cthumb/simpleframe.theme/back.png
 share/cthumb/simpleframe.theme/bot.png
 share/cthumb/simpleframe.theme/left.png
 share/cthumb/simpleframe.theme/next.png
@@ -152,6 +168,7 @@ share/cthumb/simpleframe.theme/right.png
 share/cthumb/simpleframe.theme/theme.conf
 share/cthumb/simpleframe.theme/top.png
 share/cthumb/slides-big.theme/1.gif
+share/cthumb/slides-big.theme/back.png
 share/cthumb/slides-big.theme/bot.png
 share/cthumb/slides-big.theme/left.png
 share/cthumb/slides-big.theme/next.png
@@ -160,6 +177,7 @@ share/cthumb/slides-big.theme/right.png
 share/cthumb/slides-big.theme/theme.conf
 share/cthumb/slides-big.theme/top.png
 share/cthumb/slides-clean.theme/1.gif
+share/cthumb/slides-clean.theme/back.png
 share/cthumb/slides-clean.theme/bot.png
 share/cthumb/slides-clean.theme/left.png
 share/cthumb/slides-clean.theme/next.png
@@ -168,6 +186,7 @@ share/cthumb/slides-clean.theme/right.png
 share/cthumb/slides-clean.theme/theme.conf
 share/cthumb/slides-clean.theme/top.png
 share/cthumb/slides-huge.theme/1.gif
+share/cthumb/slides-huge.theme/back.png
 share/cthumb/slides-huge.theme/bot.png
 share/cthumb/slides-huge.theme/left.png
 share/cthumb/slides-huge.theme/next.png
@@ -176,6 +195,7 @@ share/cthumb/slides-huge.theme/right.png
 share/cthumb/slides-huge.theme/theme.conf
 share/cthumb/slides-huge.theme/top.png
 share/cthumb/slides-small.theme/1.gif
+share/cthumb/slides-small.theme/back.png
 share/cthumb/slides-small.theme/bot.png
 share/cthumb/slides-small.theme/left.png
 share/cthumb/slides-small.theme/next.png
@@ -184,6 +204,7 @@ share/cthumb/slides-small.theme/right.png
 share/cthumb/slides-small.theme/theme.conf
 share/cthumb/slides-small.theme/top.png
 share/cthumb/spotlight.theme/1.gif
+share/cthumb/spotlight.theme/back.png
 share/cthumb/spotlight.theme/bot.png
 share/cthumb/spotlight.theme/left.png
 share/cthumb/spotlight.theme/next.png
@@ -192,6 +213,7 @@ share/cthumb/spotlight.theme/right.png
 share/cthumb/spotlight.theme/theme.conf
 share/cthumb/spotlight.theme/top.png
 share/cthumb/tv-large.theme/1.gif
+share/cthumb/tv-large.theme/back.png
 share/cthumb/tv-large.theme/bot.png
 share/cthumb/tv-large.theme/left.png
 share/cthumb/tv-large.theme/next.png
@@ -200,6 +222,7 @@ share/cthumb/tv-large.theme/right.png
 share/cthumb/tv-large.theme/theme.conf
 share/cthumb/tv-large.theme/top.png
 share/cthumb/tv.theme/1.gif
+share/cthumb/tv.theme/back.png
 share/cthumb/tv.theme/bot.png
 share/cthumb/tv.theme/left.png
 share/cthumb/tv.theme/next.png
@@ -207,11 +230,11 @@ share/cthumb/tv.theme/prev.png
 share/cthumb/tv.theme/right.png
 share/cthumb/tv.theme/theme.conf
 share/cthumb/tv.theme/top.png
-share/doc/cthumb/ChangeLog
 share/doc/cthumb/INSTALL
 share/doc/cthumb/README
 share/doc/cthumb/TO-DO
 share/doc/cthumb/VERSION
+share/doc/cthumb/ChangeLog
 share/doc/cthumb/cthumbrc.sample
 @dirrm share/cthumb/blue-steel.theme
 @dirrm share/cthumb/classic-clips.theme