- Update to version 0.7.9

- Use shebangfix
- Switch to PORTDOCS variable
- Replace trivial patches with REINLACE_CMDs
- Update WWW homepage address

7 files changed, 25 insertions, 49 deletions

diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index 2a8fd35e6ed5..ca19da2c6203 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	clawsker
-# Date created:		2008-02-04
-# Whom:			Pawel Pekala <c0rn@o2.pl>
-#
+# Created by: Pawel Pekala <c0rn@o2.pl>
 # $FreeBSD$
-#
 
 PORTNAME=	clawsker
-PORTVERSION=	0.7.8
+PORTVERSION=	0.7.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/tools/
 
@@ -15,13 +11,16 @@ COMMENT=	Applet to edit Claws Mail's hidden preferences
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	claws-mail>=3.8.1:${PORTSDIR}/mail/claws-mail \
+RUN_DEPENDS=	claws-mail>=3.9.1:${PORTSDIR}/mail/claws-mail \
 		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
 
+USES=		shebangfix
+SHEBANG_FILES=	${PORTNAME}
 USE_PERL5=	yes
 
 MAN1=		clawsker.1
+PORTDOCS=	NEWS README
 
 .include <bsd.port.options.mk>
 
@@ -29,10 +28,15 @@ MAN1=		clawsker.1
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
-EXTRA_PATCHES=	${FILESDIR}/extra-Makefile-without_nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} '/^DATADIR/s|/share||' ${WRKSRC}/Makefile
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} '/-C po/d' ${WRKSRC}/Makefile
+.endif
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
diff --git a/mail/clawsker/distinfo b/mail/clawsker/distinfo
index 6fe059bafb85..162706197c7c 100644
--- a/mail/clawsker/distinfo
+++ b/mail/clawsker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clawsker-0.7.8.tar.gz) = 133f89db736f77979603ebf02eea4fbcb654fb69cfcf2301c3598ff52ac61155
-SIZE (clawsker-0.7.8.tar.gz) = 66210
+SHA256 (clawsker-0.7.9.tar.gz) = 2d9447ae40788113f1644c954364492c9525c61109659a58a5be4bb3076b3032
+SIZE (clawsker-0.7.9.tar.gz) = 67462
diff --git a/mail/clawsker/files/extra-Makefile-without_nls b/mail/clawsker/files/extra-Makefile-without_nls
deleted file mode 100644
index 54da8a02e2a3..000000000000
--- a/mail/clawsker/files/extra-Makefile-without_nls
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	2007-12-17 19:00:19.000000000 +0100
-+++ Makefile	2009-01-27 19:27:39.000000000 +0100
-@@ -19,18 +19,15 @@
- 	sed -e "s,@PREFIX@,${PREFIX},;s,@LIBDIR@,${LIBDIR},;s,@VERSION@,${VERSION}," \
- 		< ${NAME} > build/${NAME}
- 	pod2man ${NAME} > build/${NAME}.1
--	${MAKE} -C po build
- 	
- 
- install: all install-dirs
- 	install -m 0755 build/${NAME} ${DESTDIR}${BINDIR}
- 	install -m 0644 build/${NAME}.1 ${DESTDIR}${MAN1DIR}
--	${MAKE} -C po install
- 
- install-dirs:
- 	install -d ${DESTDIR}${BINDIR}
- 	install -d ${DESTDIR}${MAN1DIR}
--	${MAKE} -C po install-dirs
- 
- uninstall:
- 	rm -f ${DESTDIR}${BINDIR}/${NAME}
diff --git a/mail/clawsker/files/patch-Makefile b/mail/clawsker/files/patch-Makefile
deleted file mode 100644
index 2d3cb210f169..000000000000
--- a/mail/clawsker/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Mon Feb  4 23:32:18 2008
-+++ Makefile	Mon Feb  4 23:33:11 2008
-@@ -7,7 +7,7 @@
- VERSION = $(shell cat VERSION)
- PREFIX ?= /usr/local
- BINDIR = ${PREFIX}/bin
--DATADIR = ${PREFIX}/share
-+DATADIR = ${PREFIX}
- LIBDIR = ${PREFIX}/lib/${NAME}
- MANDIR = ${DATADIR}/man
- MAN1DIR = ${MANDIR}/man1
diff --git a/mail/clawsker/files/patch-clawsker b/mail/clawsker/files/patch-clawsker
index 2c85370279d3..6aad5907e21f 100644
--- a/mail/clawsker/files/patch-clawsker
+++ b/mail/clawsker/files/patch-clawsker
@@ -1,6 +1,6 @@
---- clawsker.orig	Mon Feb  4 23:58:45 2008
-+++ clawsker	Mon Feb  4 23:59:08 2008
-@@ -345,8 +345,6 @@
+--- clawsker.orig	2013-05-08 10:56:43.000000000 +0200
++++ clawsker	2013-05-12 16:48:47.000000000 +0200
+@@ -389,14 +389,12 @@
  sub set_widget_hint() {
      if ($SHOWHINTS) {
          my ($wdgt, $hint) = @_;    
@@ -9,3 +9,10 @@
      }
  }
  
+ sub set_widget_sens() {
+     my ($wdgt, $versions) = @_;
+-    @ver = split(/,/, $versions);
++    my @ver = split(/,/, $versions);
+     if ($#ver == 1) {
+       $wdgt->set_sensitive (
+         &version_greater_or_equal ($CLAWSV, $ver[0])
diff --git a/mail/clawsker/pkg-descr b/mail/clawsker/pkg-descr
index bc2a8b34958f..19ef4e1f6442 100644
--- a/mail/clawsker/pkg-descr
+++ b/mail/clawsker/pkg-descr
@@ -16,4 +16,4 @@ Other features:
     * Detection of running Claws Mail
     * Support for alternate configuration directories
 
-WWW:	http://www.claws-mail.org/clawsker
+WWW: http://www.claws-mail.org/clawsker.php
diff --git a/mail/clawsker/pkg-plist b/mail/clawsker/pkg-plist
index 029eae8cf9f0..0259db0d4128 100644
--- a/mail/clawsker/pkg-plist
+++ b/mail/clawsker/pkg-plist
@@ -1,6 +1,4 @@
 bin/clawsker
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%NLS%%share/locale/fr/LC_MESSAGES/clawsker.mo
 %%NLS%%share/locale/es/LC_MESSAGES/clawsker.mo
 %%NLS%%share/locale/id/LC_MESSAGES/clawsker.mo
@@ -9,6 +7,5 @@ bin/clawsker
 %%NLS%%share/locale/sr/LC_MESSAGES/clawsker.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/clawsker.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/clawsker.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin