4 files changed, 41 insertions, 37 deletions

diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index a73eac66604b..14cd4d74f3a2 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gprename
-PORTVERSION=	1.24
-PORTREVISION=	1
+PORTVERSION=	1.7
+PORTEPOCH=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,37 +17,44 @@ COMMENT=	Perl script for renaming multiple files
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk:${PORTSDIR}/x11-toolkits/p5-Gtk
 
-NO_BUILD=	yes
-PLIST_DIRS=	share/gprename/languages share/gprename/pixmaps share/gprename
-PLIST_FILES=	bin/gprename share/gprename/pixmaps/gprename_icon64.xpm share/gprename/gprename.pl share/gprename/langs.pl
 USE_BZIP2=	yes
-USE_PERL5_RUN=	yes
 USE_X_PREFIX=	yes
+USE_PERL5_RUN=	yes
+NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
-
-.for ii in en es.ISO-8859-1 es.UTF-8 fr.ISO-8859-1 fr.UTF-8 zh_TW.Big5 \
-	zh_TW.UTF-8 pl.ISO-8859-2 pl.UTF-8
-PLIST_FILES+=	share/gprename/languages/lang.${ii}
-.endfor
+SUB_FILES=	gprename
+
+PORTDOCS=	README
+PLIST_FILES=	bin/gprename \
+		%%DATADIR%%/bin/gprename.pl \
+		%%DATADIR%%/bin/langs.pl \
+		%%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.zh_TW.Big5 \
+		%%DATADIR%%/languages/lang.zh_TW.UTF-8 \
+		%%DATADIR%%/pixmaps/gprename_icon64.xpm
+PLIST_DIRS=	%%DATADIR%%/pixmaps \
+		%%DATADIR%%/languages \
+		%%DATADIR%%/bin \
+		%%DATADIR%%
 
-pre-install:
-.if !defined(NOPORTDOCS)
-PLIST_DIRS+=	share/doc/gprename
-PLIST_FILES+=	share/doc/gprename/README
-.endif
+.include <bsd.port.pre.mk>
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${CP} -pPR ${WRKSRC}/languages ${WRKSRC}/pixmaps ${DATADIR}
-.for ii in gprename langs
-	${INSTALL_SCRIPT} ${WRKSRC}/${ii}.pl ${DATADIR}
-.endfor
-	${SED} 's:PREFIX:${PREFIX}:g' < ${FILESDIR}/gprename \
-		> ${WRKDIR}/gprename
 	${INSTALL_SCRIPT} ${WRKDIR}/gprename ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pl ${DATADIR}/bin
+	@${MKDIR} ${DATADIR}/languages
+	${INSTALL_DATA} ${WRKSRC}/languages/lang.* ${DATADIR}/languages
+	@${MKDIR} ${DATADIR}/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${DATADIR}/pixmaps
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
diff --git a/x11-fm/gprename/distinfo b/x11-fm/gprename/distinfo
index 0f2c8ca747c3..4abd901012a6 100644
--- a/x11-fm/gprename/distinfo
+++ b/x11-fm/gprename/distinfo
@@ -1,3 +1,3 @@
-MD5 (gprename-1.24.tar.bz2) = 936cbc0695bcea7adba9ab8088c92683
-SHA256 (gprename-1.24.tar.bz2) = ed3b1974225784fad2a015f77b6b8d9d6c8326eb298a706427166a9b04c06835
-SIZE (gprename-1.24.tar.bz2) = 36688
+MD5 (gprename-1.7.tar.bz2) = f9fa60269a7d5dab4ccd3d02a6124937
+SHA256 (gprename-1.7.tar.bz2) = 5a73e594c119c6e0f8f1866e0ceeeaa021aeb622c7bd52709dfbf24d9d4342aa
+SIZE (gprename-1.7.tar.bz2) = 37322
diff --git a/x11-fm/gprename/files/gprename b/x11-fm/gprename/files/gprename.in
index f138e483bf81..64bca37c5d8e 100644
--- a/x11-fm/gprename/files/gprename
+++ b/x11-fm/gprename/files/gprename.in
@@ -6,4 +6,4 @@ then
 else
         dir="$1";
 fi
-perl PREFIX/share/gprename/gprename.pl PREFIX/share/gprename/ $dir &
+perl %%DATADIR%%/bin/gprename.pl %%DATADIR%%/ $dir &
diff --git a/x11-fm/gprename/pkg-descr b/x11-fm/gprename/pkg-descr
index cc1e1970fb9c..dfaf23ada8c3 100644
--- a/x11-fm/gprename/pkg-descr
+++ b/x11-fm/gprename/pkg-descr
@@ -1,9 +1,6 @@
-from the home page:
+GPRename is a GUI batch file renamer based on Gtk-Perl. It can rename
+files numerically, insert/delete characters at/between specified
+position(s), replace strings (either using regular express or not),
+and change case.
 
-	GPRename is a GUI batch file renamer based on Gtk-Perl.
-
-	It can rename files numerically, insert/delete characters at/between
-	specified position(s), replace strings (either using regular
-	expressions or not), and change case.
-
-WWW:  http://gprename.sf.net/
+WWW:  http://gprename.sourceforge.net/