4 files changed, 44 insertions, 48 deletions

diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index 1c520f244867..dcf2ae0108c4 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -2,13 +2,12 @@
 # Date created:				2004-03-15
 # Whom:					trevor
 #
-# $Carpetsmoker: ports/gprename/Makefile,v 1.3 2007/04/23 18:35:06 carpetsmoker Exp $
+# $Carpetsmoker: ports/x11-fm/gprename/Makefile,v 1.5 2007/07/12 02:30:53 carpetsmoker Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	gprename
-PORTVERSION=	2.2
-PORTREVISION=	1
+PORTVERSION=	2.3
 PORTEPOCH=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,47 +21,22 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2
 USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
-
-SUB_FILES=	gprename
-
-PORTDOCS=	README
-PLIST_FILES=	bin/gprename \
-		%%DATADIR%%/COPYING \
-		%%DATADIR%%/bin/gprename.pl \
-		%%DATADIR%%/languages/lang.dt \
-		%%DATADIR%%/languages/lang.en \
-		%%DATADIR%%/languages/lang.es.ISO-8859-1 \
-		%%DATADIR%%/languages/lang.es.UTF-8 \
-		%%DATADIR%%/languages/lang.fr.ISO-8859-1 \
-		%%DATADIR%%/languages/lang.fr.UTF-8 \
-		%%DATADIR%%/languages/lang.pl.ISO-8859-2 \
-		%%DATADIR%%/languages/lang.pl.UTF-8 \
-		%%DATADIR%%/languages/lang.pt-br.ISO-8859-1 \
-		%%DATADIR%%/languages/lang.pt-br.UTF-8 \
-		%%DATADIR%%/languages/langs.pl \
-		%%DATADIR%%/icon/gprename_icon.png \
-		%%DATADIR%%/icon/gprename_nautilus-action.png
-PLIST_DIRS=	%%DATADIR%%/icon \
-		%%DATADIR%%/languages \
-		%%DATADIR%%/bin \
-		%%DATADIR%%
-
-.include <bsd.port.pre.mk>
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/gprename ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DATADIR}
-	@${MKDIR} ${DATADIR}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/gprename.pl ${DATADIR}/bin
-	@${MKDIR} ${DATADIR}/languages
-	${INSTALL_DATA} ${WRKSRC}/languages/lang.* ${DATADIR}/languages
-	${INSTALL_DATA} ${WRKSRC}/languages/langs.pl ${DATADIR}/languages
-	@${MKDIR} ${DATADIR}/icon
-	${INSTALL_DATA} ${WRKSRC}/icon/* ${DATADIR}/icon/
+PORTDOCS=	README COPYING
+MAN1=		gprename.1
+MANCOMPRESSED=	no
+
+post-patch:
+	@${REINPLACE_CMD} 's|/usr/|${PREFIX}/|' \
+		${WRKSRC}/bin/gprename
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
+		s|$$(CURDIR)|$$(.CURDIR)|; \
+		s|share/man|man|;' \
+		${WRKSRC}/Makefile
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/COPYING ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/gprename/distinfo b/x11-fm/gprename/distinfo
index 07114f4e3270..0f587eec1d57 100644
--- a/x11-fm/gprename/distinfo
+++ b/x11-fm/gprename/distinfo
@@ -1,3 +1,3 @@
-MD5 (gprename-2.2.tar.bz2) = 87a585d6815098efdafeaa85f2c15a42
-SHA256 (gprename-2.2.tar.bz2) = 22b9612579dcaf9efa9c02fd498282f94d0c4e5ec6ea94b076e55b397a6ce0e3
-SIZE (gprename-2.2.tar.bz2) = 36149
+MD5 (gprename-2.3.tar.bz2) = 91f6e27b35fe938c9f99a729a4ca912f
+SHA256 (gprename-2.3.tar.bz2) = 69e3ec2b0a9814e347cc184e8f83bcf488bfb6e559983c1e14b168ffe4577465
+SIZE (gprename-2.3.tar.bz2) = 44386
diff --git a/x11-fm/gprename/files/gprename.in b/x11-fm/gprename/files/gprename.in
deleted file mode 100644
index 30b0cc996a23..000000000000
--- a/x11-fm/gprename/files/gprename.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-perl %%DATADIR%%/bin/gprename.pl %%DATADIR%%/ $@ &
diff --git a/x11-fm/gprename/pkg-plist b/x11-fm/gprename/pkg-plist
new file mode 100644
index 000000000000..3abbd3b497e9
--- /dev/null
+++ b/x11-fm/gprename/pkg-plist
@@ -0,0 +1,24 @@
+bin/gprename
+share/applications/gprename.desktop
+share/pixmaps/gprename/gprename.png
+share/pixmaps/gprename/gprename_debian_menu_icon.xpm
+share/pixmaps/gprename/gprename_nautilus-action.png
+%%DATADIR%%/languages/lang.de.ISO-8859-1
+%%DATADIR%%/languages/lang.de.UTF-8
+%%DATADIR%%/languages/lang.dt
+%%DATADIR%%/languages/lang.en
+%%DATADIR%%/languages/lang.es.ISO-8859-1
+%%DATADIR%%/languages/lang.es.UTF-8
+%%DATADIR%%/languages/lang.fr.ISO-8859-1
+%%DATADIR%%/languages/lang.fr.UTF-8
+%%DATADIR%%/languages/lang.it.ISO-8859-1
+%%DATADIR%%/languages/lang.it.UTF-8
+%%DATADIR%%/languages/lang.pl.ISO-8859-2
+%%DATADIR%%/languages/lang.pl.UTF-8
+%%DATADIR%%/languages/lang.pt-br.ISO-8859-1
+%%DATADIR%%/languages/lang.pt-br.UTF-8
+%%DATADIR%%/languages/langs.pl
+@dirrm share/pixmaps/gprename
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%
+@dirrmtry share/applications