- Update to 2.1.3

PR:		131891
Submitted by:	Toni Gundogdu <legatvs@gmail.com> (maintainer)

3 files changed, 42 insertions, 20 deletions

diff --git a/multimedia/clive-utils/Makefile b/multimedia/clive-utils/Makefile
index 8367995..f6ea1f0 100644
--- a/multimedia/clive-utils/Makefile
+++ b/multimedia/clive-utils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive-utils
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 CATEGORIES=	multimedia net perl5
 MASTER_SITES=	GOOGLE_CODE
 DIST_SUBDIR=	clive
@@ -16,7 +16,7 @@ COMMENT=	Passwords, RSS parsing, and link extraction for clive
 
 USE_PERL5_RUN=	5.8.2+
 USE_BZIP2=	yes
-NO_BUILD=	yes
+USE_GMAKE=	yes
 
 RUN_DEPENDS+=	clive>=2.0:${PORTSDIR}/multimedia/clive \
 		p5-Crypt-PasswdMD5>=1.3:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
@@ -28,7 +28,8 @@ RUN_DEPENDS+=	clive>=2.0:${PORTSDIR}/multimedia/clive \
 PLIST_FILES=	bin/clivefeed bin/clivepass bin/clivescan
 
 OPTIONS=	PASTE "Enable pasting of URLs from X clipboard" Off \
-		FONTDIALOG "Enable Font Dialog support" Off
+		FONTDIALOG "Enable Font Dialog support" Off \
+		MANPAGES "Install manual pages" on
 
 .include <bsd.port.pre.mk>
 
@@ -40,21 +41,9 @@ RUN_DEPENDS+=	p5-Clipboard>=0.09:${PORTSDIR}/x11/p5-Clipboard
 RUN_DEPENDS+=	p5-Tk-FontDialog>=0.15:${PORTSDIR}/x11-toolkits/p5-Tk-FontDialog
 .endif
 
-post-patch:
-		${REINPLACE_CMD} -e 's|clivescan -S|clivescan -n|g' ${WRKSRC}/*.1
-
-do-install:
-		${MKDIR} ${PREFIX}/bin
-		for suffix in feed pass scan ; do \
-			${INSTALL_SCRIPT} ${WRKSRC}/clive$$suffix ${PREFIX}/bin ; \
-		done
-
-.ifndef NO_INSTALL_MANPAGES
+.ifdef WITH_MANPAGES
+MAKE_ENV=	WITH_MAN=yes
 MAN1=		clivefeed.1 clivepass.1 clivescan.1
-MANCOMPRESSED=	no
-post-install:
-		${MKDIR} ${MANPREFIX}/man/man1
-		${INSTALL_MAN} ${WRKSRC}/*.1 ${MANPREFIX}/man/man1
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/clive-utils/distinfo b/multimedia/clive-utils/distinfo
index dcb79d3..45805e8 100644
--- a/multimedia/clive-utils/distinfo
+++ b/multimedia/clive-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-utils-2.1.2.tar.bz2) = 37e32689e2d534aa46b2c8bfd44c1eb8
-SHA256 (clive/clive-utils-2.1.2.tar.bz2) = 59b325b45b1c4b2ee85c4aeaa20aa35048b2e5a720bf91b2fe375a220bd34484
-SIZE (clive/clive-utils-2.1.2.tar.bz2) = 18482
+MD5 (clive/clive-utils-2.1.3.tar.bz2) = d01c86d00ca14c3fc677f203dde53102
+SHA256 (clive/clive-utils-2.1.3.tar.bz2) = 4e33f4603263768b06178f4251de26ca95c10eb9e9e6fda6804ce5a0bdc17882
+SIZE (clive/clive-utils-2.1.3.tar.bz2) = 19080
diff --git a/multimedia/clive-utils/files/patch-Makefile b/multimedia/clive-utils/files/patch-Makefile
new file mode 100644
index 0000000..0fe43e8
--- /dev/null
+++ b/multimedia/clive-utils/files/patch-Makefile
@@ -0,0 +1,33 @@
+--- Makefile.orig	2009-02-19 23:22:22.000000000 +0200
++++ Makefile	2009-02-19 23:23:47.000000000 +0200
+@@ -1,25 +1,21 @@
+ # GNU Makefile
+ 
+-SHELL = /bin/sh
+-
+-prefix      = $(HOME)
++prefix      = $(PREFIX)
+ bindir      = $(prefix)/bin
+ datarootdir = $(prefix)/share
+ datadir     = $(datarootdir)
+-mandir      = $(datarootdir)/man
++mandir      = $(MANPREFIX)/man
+ man1dir     = $(mandir)/man1
+ 
+-INSTALL     = install -c
+-INSTALL_D   = install -d
+-INSTALL_M   = install -c -m 444
++INSTALL     = $(BSD_INSTALL_SCRIPT)
++INSTALL_D   = mkdir -p
++INSTALL_M   = $(BSD_INSTALL_MAN)
+ RM          = rm -f
+ PERL        = perl
+ POD2MAN     = pod2man
+ AWK         = awk
+ TR          = tr
+ 
+-WITH_MAN    = yes
+-
+ RELEASE_scan := \
+     $(shell sh -c "$(AWK) '/constant VERSION/ {print \$$5}' clivescan | \
+         $(TR) -d '[\";]'")