3 files changed, 79 insertions, 43 deletions

diff --git a/sysutils/namefix/Makefile b/sysutils/namefix/Makefile
index 128690002c5d..a4bf6ab0ecec 100644
--- a/sysutils/namefix/Makefile
+++ b/sysutils/namefix/Makefile
@@ -6,36 +6,53 @@
 #
 
 PORTNAME=	namefix
-PORTVERSION=	4.0.r11
-PORTREVISION=	2
-DISTVERSION=	4.RC11
+PORTVERSION=	4.0.2
 CATEGORIES=	sysutils
-MASTER_SITES=	CENKES # SF
-DISTNAME=	${PORTNAME}.${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}.pl/${PORTVERSION}
+DISTNAME=	${PORTNAME}.pl_${PORTVERSION}
+EXTRACT_SUFX=	.7z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Batch renamer
 
+LICENSE=	GPLv2
+
+EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
 RUN_DEPENDS=	p5-MP3-Tag>=0:${PORTSDIR}/audio/p5-MP3-Tag \
 		p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
 		p5-Tk-JComboBox>=0:${PORTSDIR}/x11-toolkits/p5-Tk-JComboBox \
 		p5-Tk-DynaTabFrame>=0:${PORTSDIR}/x11-toolkits/p5-Tk-DynaTabFrame
 
-WRKSRC=		${WRKDIR}/namefix.pl
+EXTRACT_CMD=	7z
+EXTRACT_BEFORE_ARGS=	x
+EXTRACT_AFTER_ARGS=	-bd -y >/dev/null 2>&1
+
+WRKSRC=		${WRKDIR}/${PORTNAME}.pl
 NO_BUILD=	yes
-USE_BZIP2=	yes
-USE_PERL5=	yes
 
-post-extract:
-	@${FIND} ${WRKSRC} -name '*~' -delete
+USE_PERL5_RUN=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e\
-	's|$$prog_dir/libs/|${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/|'\
-		${WRKSRC}/${PORTNAME}.pl
+do-configure:
+.for bin in ${PORTNAME} ${PORTNAME}-cli
+	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/${bin}.in
+	@${ECHO_CMD} 'namefix_dir=${PREFIX}/${SITE_PERL_REL}/${PORTNAME}' >> ${WRKDIR}/${bin}.in
+	@${ECHO_CMD} 'cd $${namefix_dir}; exec ./${bin}.pl $$@' >> ${WRKDIR}/${bin}.in
+.endfor
 
 do-install:
-	@cd ${WRKSRC}/libs/&&${COPYTREE_SHARE} . ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/
+.for bin in ${PORTNAME} ${PORTNAME}-cli
+	${INSTALL_SCRIPT} ${WRKDIR}/${bin}.in ${PREFIX}/bin/${bin}
+.endfor
+	@${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
+.for data in ${PORTNAME} ${PORTNAME}-cli
+	${INSTALL_SCRIPT} ${WRKSRC}/${data}.pl ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/mem.jpg ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
+.for dir in libs libs/cli libs/gui
+	@${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/${dir}/*.pm ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/${dir}
+.endfor
+	@${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/txt
+	${INSTALL_DATA} ${WRKSRC}/txt/*.txt ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/txt
 
 .include <bsd.port.mk>
diff --git a/sysutils/namefix/distinfo b/sysutils/namefix/distinfo
index e13ca5bfbdf1..9b04a5b7e9fc 100644
--- a/sysutils/namefix/distinfo
+++ b/sysutils/namefix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (namefix.4.RC11.tar.bz2) = ef1caebbb7a42c117eb3cecc6fcfbe56ab3d65bd8e754504a476d347f0547ace
-SIZE (namefix.4.RC11.tar.bz2) = 114188
+SHA256 (namefix.pl_4.0.2.7z) = 6a910e5e0cb962393e564913af3a6916f8f0ab44189f6f5ce0f2b48f14309e01
+SIZE (namefix.pl_4.0.2.7z) = 6933425
diff --git a/sysutils/namefix/pkg-plist b/sysutils/namefix/pkg-plist
index fbe0db5cdd28..1b6656295c3d 100644
--- a/sysutils/namefix/pkg-plist
+++ b/sysutils/namefix/pkg-plist
@@ -1,26 +1,45 @@
-bin/namefix.pl
-%%SITE_PERL%%/namefix/config.pm
-%%SITE_PERL%%/namefix/dir.pm
-%%SITE_PERL%%/namefix/filter.pm
-%%SITE_PERL%%/namefix/fixname.pm
-%%SITE_PERL%%/namefix/global_variables.pm
-%%SITE_PERL%%/namefix/gui/about.pm
-%%SITE_PERL%%/namefix/gui/blockrename.pm
-%%SITE_PERL%%/namefix/gui/bookmarks.pm
-%%SITE_PERL%%/namefix/gui/br_preview.pm
-%%SITE_PERL%%/namefix/gui/changelog.pm
-%%SITE_PERL%%/namefix/gui/dialog.pm
-%%SITE_PERL%%/namefix/gui/edit_lists.pm
-%%SITE_PERL%%/namefix/gui/links.pm
-%%SITE_PERL%%/namefix/gui/manual.pm
-%%SITE_PERL%%/namefix/gui/menu.pm
-%%SITE_PERL%%/namefix/gui/misc.pm
-%%SITE_PERL%%/namefix/gui/thanks.pm
-%%SITE_PERL%%/namefix/gui/todo.pm
-%%SITE_PERL%%/namefix/gui/undo.pm
-%%SITE_PERL%%/namefix/misc.pm
-%%SITE_PERL%%/namefix/mp3.pm
-%%SITE_PERL%%/namefix/nf_print.pm
-%%SITE_PERL%%/namefix/run_namefix.pm
-@dirrm %%SITE_PERL%%/namefix/gui
+bin/namefix
+bin/namefix-cli
+%%SITE_PERL%%/namefix/libs/cli/help.pm
+%%SITE_PERL%%/namefix/libs/cli/print.pm
+%%SITE_PERL%%/namefix/libs/config.pm
+%%SITE_PERL%%/namefix/libs/dir.pm
+%%SITE_PERL%%/namefix/libs/filter.pm
+%%SITE_PERL%%/namefix/libs/fixname.pm
+%%SITE_PERL%%/namefix/libs/global_variables.pm
+%%SITE_PERL%%/namefix/libs/gui/about.pm
+%%SITE_PERL%%/namefix/libs/gui/blockrename.pm
+%%SITE_PERL%%/namefix/libs/gui/bookmarks.pm
+%%SITE_PERL%%/namefix/libs/gui/br_preview.pm
+%%SITE_PERL%%/namefix/libs/gui/changelog.pm
+%%SITE_PERL%%/namefix/libs/gui/config_dialog.pm
+%%SITE_PERL%%/namefix/libs/gui/dialog.pm
+%%SITE_PERL%%/namefix/libs/gui/dir_hlist.pm
+%%SITE_PERL%%/namefix/libs/gui/edit_lists.pm
+%%SITE_PERL%%/namefix/libs/gui/help.pm
+%%SITE_PERL%%/namefix/libs/gui/links.pm
+%%SITE_PERL%%/namefix/libs/gui/manual.pm
+%%SITE_PERL%%/namefix/libs/gui/menu.pm
+%%SITE_PERL%%/namefix/libs/gui/thanks.pm
+%%SITE_PERL%%/namefix/libs/gui/todo.pm
+%%SITE_PERL%%/namefix/libs/gui/undo.pm
+%%SITE_PERL%%/namefix/libs/html.pm
+%%SITE_PERL%%/namefix/libs/misc.pm
+%%SITE_PERL%%/namefix/libs/mp3.pm
+%%SITE_PERL%%/namefix/libs/nf_print.pm
+%%SITE_PERL%%/namefix/libs/run_namefix.pm
+%%SITE_PERL%%/namefix/libs/undo.pm
+%%SITE_PERL%%/namefix/mem.jpg
+%%SITE_PERL%%/namefix/namefix.pl
+%%SITE_PERL%%/namefix/namefix-cli.pl
+%%SITE_PERL%%/namefix/txt/about.txt
+%%SITE_PERL%%/namefix/txt/changelog.txt
+%%SITE_PERL%%/namefix/txt/cmd.help.txt
+%%SITE_PERL%%/namefix/txt/links.txt
+%%SITE_PERL%%/namefix/txt/thanks.txt
+%%SITE_PERL%%/namefix/txt/todo.txt
+@dirrm %%SITE_PERL%%/namefix/txt
+@dirrm %%SITE_PERL%%/namefix/libs/gui
+@dirrm %%SITE_PERL%%/namefix/libs/cli
+@dirrm %%SITE_PERL%%/namefix/libs
 @dirrm %%SITE_PERL%%/namefix