1 files changed, 32 insertions, 25 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