5 files changed, 291 insertions, 31 deletions

diff --git a/japanese/asterisk-sounds/Makefile b/japanese/asterisk-sounds/Makefile
index b2467ab5aa5c..274464a3aec9 100644
--- a/japanese/asterisk-sounds/Makefile
+++ b/japanese/asterisk-sounds/Makefile
@@ -5,12 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	asterisk-sounds
+PORTNAME=	asterisk
 PORTVERSION=	1.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese net
-MASTER_SITES=	ftp://ftp.voip-info.jp/asterisk/sounds/
-DISTNAME=	${PORTVERSION:S|.|_|}/${PORTNAME:S|sounds|sound|}-jp_${PORTVERSION:S|.||}_beta
+MASTER_SITES=	ftp://ftp.voip-info.jp/asterisk/sounds/${PORTVERSION:S|.|_|}/ \
+		http://ftp.voip-info.jp/asterisk/sounds/${PORTVERSION:S|.|_|}/
+PKGNAMESUFFIX=	-sounds
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX:S|s$||}-jp_${PORTVERSION:S|.||}_beta
 
 MAINTAINER=	jfkimura@yahoo.co.jp
 COMMENT=	Japanese sound files for Asterisk
@@ -18,19 +20,29 @@ COMMENT=	Japanese sound files for Asterisk
 RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 
 NO_BUILD=	yes
-ASTERISKSDIR=	${LOCALBASE}/share/asterisk/sounds
+ASTERISKDIR=	${DATADIR}/${PKGNAMESUFFIX:S|-||}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+
+post-extract:
+	${MV} ${WRKDIR}/jp/README.txt ${WRKDIR}
 
 do-install:
-	@-${MKDIR} ${ASTERISKSDIR}
-	@${CP} -pR ${WRKDIR}/jp ${ASTERISKSDIR}
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -pv ${WRKDIR}/jp/README.txt ${DOCSDIR}
+	@-${MKDIR} ${ASTERISKDIR}
+	@${CP} -pR ${WRKDIR}/jp ${ASTERISKDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/ja
+	@cd ${WRKDIR} && ${INSTALL_DATA} README.txt ${DOCSDIR}/ja
+.endif
 
 post-install:
-	@cd ${WRKDIR} && ${FIND} ./jp -type f -o -type l | ${SED} -e 's,^\.,${ASTERISKSDIR:S|${LOCALBASE}/||},' > ${TMPPLIST}
-	@cd ${WRKDIR} && ${FIND} ./jp -type d -depth  | ${SED} -e 's,^\.,@dirrm ${ASTERISKSDIR:S|${LOCALBASE}/||},' >> ${TMPPLIST}
-	@${ECHO} ${DOCSDIR:S|${LOCALBASE}/||}/README.txt >> ${TMPPLIST}
-	@${ECHO} "@dirrm" ${DOCSDIR:S|${LOCALBASE}/||}  >> ${TMPPLIST}
 	@${CAT} ${PKGMESSAGE}
 
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+	@${FIND} ${ASTERISKDIR}/jp -type f -o -type l | ${SORT} | ${SED} -e 's,^${PREFIX}/,,' > pkg-plist.new
+	@${FIND} ${ASTERISKDIR}/jp -type d -depth | ${SORT} -r | ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> pkg-plist.new
+	@${ECHO} %%PORTDOCS%%%%DOCSDIR%%/ja/README.txt >> pkg-plist.new
+	@${ECHO} %%PORTDOCS%%@dirrm %%DOCSDIR%%/ja >> pkg-plist.new
+	@${ECHO} %%PORTDOCS%%@dirrm %%DOCSDIR%% >> pkg-plist.new
+
 .include <bsd.port.mk>
diff --git a/japanese/asterisk-sounds/distinfo b/japanese/asterisk-sounds/distinfo
index 9ac1f47b7c2f..1f4e55ae1fb1 100644
--- a/japanese/asterisk-sounds/distinfo
+++ b/japanese/asterisk-sounds/distinfo
@@ -1,3 +1,3 @@
-MD5 (1_4/asterisk-sound-jp_14_beta.tar.gz) = f03267b41be8d9e3fe1051d87ed19d01
-SHA256 (1_4/asterisk-sound-jp_14_beta.tar.gz) = 15cde0b2de41a13dd009e517f2d28ac0859b07aad3979b120fe47bece66615df
-SIZE (1_4/asterisk-sound-jp_14_beta.tar.gz) = 945915
+MD5 (asterisk-sound-jp_14_beta.tar.gz) = f03267b41be8d9e3fe1051d87ed19d01
+SHA256 (asterisk-sound-jp_14_beta.tar.gz) = 15cde0b2de41a13dd009e517f2d28ac0859b07aad3979b120fe47bece66615df
+SIZE (asterisk-sound-jp_14_beta.tar.gz) = 945915
diff --git a/japanese/asterisk-sounds/pkg-descr b/japanese/asterisk-sounds/pkg-descr
index 4ea8c4524b70..8a8b53db3f0f 100644
--- a/japanese/asterisk-sounds/pkg-descr
+++ b/japanese/asterisk-sounds/pkg-descr
@@ -1,5 +1,7 @@
-This is a Japanese sound files for Asterisk.
-When you use Asterisk, you can use it in a limit, royalty-free.
-Please refer to Japanese ReadMe.txt.
+This is a port of Japanese sound files for Asterisk.
+Under the restriction of using Asterisk(tm) The Open Source PBX only,
+you can use them royalty-free.
+For more information about the license, you have to refer to
+README.txt written in Japanese.
 
 WWW: http://voip-info.jp/
diff --git a/japanese/asterisk-sounds/pkg-message b/japanese/asterisk-sounds/pkg-message
index 76b44fdfbcc0..71a9bec9527a 100644
--- a/japanese/asterisk-sounds/pkg-message
+++ b/japanese/asterisk-sounds/pkg-message
@@ -1,19 +1,20 @@
-
 =============================================================================
 [FYI]
- There is 2 patch files for Japanese grammar of Asterisk to a ftp server.
-
- - set patch files into  ports/asterisk/files 
-	patch-apps::app_voicemail.c
-	patch-main::say.c
-   see ftp://ftp.voip-info.jp/asterisk/patch/
- 
- - recompile of Asterisk ports
 
+ To get natural word order in Japanese sentences
+ you can patch to net/asterisk and reinstall it as below.
 
- You have to validate next two lines in asterisk.conf. 
+ For example,
+ 1. Download app_voicemail.c.yymmdd-01.patch and say.c.yymmdd-01.patch from
+    ftp://ftp.voip-info.jp/asterisk/patch/1.4.X/
+    where 1.4.X is corresponding to PORTVERSION in
+    ports/net/asterisk/Makefile.
+ 2. Put them to ports/net/asterisk/files as patch-apps::app_voicemail.c and
+    patch-main::say.c, respectively.
+ 3. Reinstall net/asterisk.
+ 4. Add the following options section to asterisk.conf.
 
- [options]
- languageprefix=yes
+     [options]
+     languageprefix=yes
 
 =============================================================================
diff --git a/japanese/asterisk-sounds/pkg-plist b/japanese/asterisk-sounds/pkg-plist
new file mode 100644
index 000000000000..bab27900a353
--- /dev/null
+++ b/japanese/asterisk-sounds/pkg-plist
@@ -0,0 +1,245 @@
+share/asterisk/sounds/jp/1-for-am-2-for-pm.gsm
+share/asterisk/sounds/jp/agent-alreadyon.gsm
+share/asterisk/sounds/jp/agent-incorrect.gsm
+share/asterisk/sounds/jp/agent-loggedoff.gsm
+share/asterisk/sounds/jp/agent-loginok.gsm
+share/asterisk/sounds/jp/agent-newlocation.gsm
+share/asterisk/sounds/jp/agent-pass.gsm
+share/asterisk/sounds/jp/agent-user.gsm
+share/asterisk/sounds/jp/auth-incorrect.gsm
+share/asterisk/sounds/jp/auth-thankyou.gsm
+share/asterisk/sounds/jp/conf-adminmenu.gsm
+share/asterisk/sounds/jp/conf-enteringno.gsm
+share/asterisk/sounds/jp/conf-errormenu.gsm
+share/asterisk/sounds/jp/conf-getchannel.gsm
+share/asterisk/sounds/jp/conf-getconfno.gsm
+share/asterisk/sounds/jp/conf-getpin.gsm
+share/asterisk/sounds/jp/conf-invalid.gsm
+share/asterisk/sounds/jp/conf-invalidpin.gsm
+share/asterisk/sounds/jp/conf-kicked.gsm
+share/asterisk/sounds/jp/conf-locked.gsm
+share/asterisk/sounds/jp/conf-lockednow.gsm
+share/asterisk/sounds/jp/conf-muted.gsm
+share/asterisk/sounds/jp/conf-noempty.gsm
+share/asterisk/sounds/jp/conf-onlyone.gsm
+share/asterisk/sounds/jp/conf-onlyperson.gsm
+share/asterisk/sounds/jp/conf-otherinparty.gsm
+share/asterisk/sounds/jp/conf-thereare.gsm
+share/asterisk/sounds/jp/conf-unlockednow.gsm
+share/asterisk/sounds/jp/conf-unmuted.gsm
+share/asterisk/sounds/jp/conf-usermenu.gsm
+share/asterisk/sounds/jp/demo-echotest.gsm
+share/asterisk/sounds/jp/digits/0.gsm
+share/asterisk/sounds/jp/digits/1.gsm
+share/asterisk/sounds/jp/digits/10.gsm
+share/asterisk/sounds/jp/digits/11.gsm
+share/asterisk/sounds/jp/digits/12.gsm
+share/asterisk/sounds/jp/digits/13.gsm
+share/asterisk/sounds/jp/digits/14.gsm
+share/asterisk/sounds/jp/digits/15.gsm
+share/asterisk/sounds/jp/digits/16.gsm
+share/asterisk/sounds/jp/digits/17.gsm
+share/asterisk/sounds/jp/digits/18.gsm
+share/asterisk/sounds/jp/digits/19.gsm
+share/asterisk/sounds/jp/digits/2.gsm
+share/asterisk/sounds/jp/digits/20.gsm
+share/asterisk/sounds/jp/digits/3.gsm
+share/asterisk/sounds/jp/digits/30.gsm
+share/asterisk/sounds/jp/digits/4.gsm
+share/asterisk/sounds/jp/digits/40.gsm
+share/asterisk/sounds/jp/digits/5.gsm
+share/asterisk/sounds/jp/digits/50.gsm
+share/asterisk/sounds/jp/digits/6.gsm
+share/asterisk/sounds/jp/digits/60.gsm
+share/asterisk/sounds/jp/digits/7.gsm
+share/asterisk/sounds/jp/digits/70.gsm
+share/asterisk/sounds/jp/digits/8.gsm
+share/asterisk/sounds/jp/digits/80.gsm
+share/asterisk/sounds/jp/digits/9.gsm
+share/asterisk/sounds/jp/digits/90.gsm
+share/asterisk/sounds/jp/digits/a-m.gsm
+share/asterisk/sounds/jp/digits/at.gsm
+share/asterisk/sounds/jp/digits/byou.gsm
+share/asterisk/sounds/jp/digits/day-0.gsm
+share/asterisk/sounds/jp/digits/day-1.gsm
+share/asterisk/sounds/jp/digits/day-2.gsm
+share/asterisk/sounds/jp/digits/day-3.gsm
+share/asterisk/sounds/jp/digits/day-4.gsm
+share/asterisk/sounds/jp/digits/day-5.gsm
+share/asterisk/sounds/jp/digits/day-6.gsm
+share/asterisk/sounds/jp/digits/dollars.gsm
+share/asterisk/sounds/jp/digits/fun.gsm
+share/asterisk/sounds/jp/digits/gatsu.gsm
+share/asterisk/sounds/jp/digits/h-1.gsm
+share/asterisk/sounds/jp/digits/h-10.gsm
+share/asterisk/sounds/jp/digits/h-11.gsm
+share/asterisk/sounds/jp/digits/h-12.gsm
+share/asterisk/sounds/jp/digits/h-13.gsm
+share/asterisk/sounds/jp/digits/h-14.gsm
+share/asterisk/sounds/jp/digits/h-15.gsm
+share/asterisk/sounds/jp/digits/h-16.gsm
+share/asterisk/sounds/jp/digits/h-17.gsm
+share/asterisk/sounds/jp/digits/h-18.gsm
+share/asterisk/sounds/jp/digits/h-19.gsm
+share/asterisk/sounds/jp/digits/h-2.gsm
+share/asterisk/sounds/jp/digits/h-20.gsm
+share/asterisk/sounds/jp/digits/h-3.gsm
+share/asterisk/sounds/jp/digits/h-30.gsm
+share/asterisk/sounds/jp/digits/h-4.gsm
+share/asterisk/sounds/jp/digits/h-5.gsm
+share/asterisk/sounds/jp/digits/h-6.gsm
+share/asterisk/sounds/jp/digits/h-7.gsm
+share/asterisk/sounds/jp/digits/h-8.gsm
+share/asterisk/sounds/jp/digits/h-9.gsm
+share/asterisk/sounds/jp/digits/hundred.gsm
+share/asterisk/sounds/jp/digits/ji.gsm
+share/asterisk/sounds/jp/digits/million.gsm
+share/asterisk/sounds/jp/digits/mon-0.gsm
+share/asterisk/sounds/jp/digits/mon-1.gsm
+share/asterisk/sounds/jp/digits/mon-10.gsm
+share/asterisk/sounds/jp/digits/mon-11.gsm
+share/asterisk/sounds/jp/digits/mon-2.gsm
+share/asterisk/sounds/jp/digits/mon-3.gsm
+share/asterisk/sounds/jp/digits/mon-4.gsm
+share/asterisk/sounds/jp/digits/mon-5.gsm
+share/asterisk/sounds/jp/digits/mon-6.gsm
+share/asterisk/sounds/jp/digits/mon-7.gsm
+share/asterisk/sounds/jp/digits/mon-8.gsm
+share/asterisk/sounds/jp/digits/mon-9.gsm
+share/asterisk/sounds/jp/digits/nen.gsm
+share/asterisk/sounds/jp/digits/nichi.gsm
+share/asterisk/sounds/jp/digits/oclock.gsm
+share/asterisk/sounds/jp/digits/oh.gsm
+share/asterisk/sounds/jp/digits/p-m.gsm
+share/asterisk/sounds/jp/digits/thousand.gsm
+share/asterisk/sounds/jp/digits/today.gsm
+share/asterisk/sounds/jp/digits/tomorrow.gsm
+share/asterisk/sounds/jp/digits/yesterday.gsm
+share/asterisk/sounds/jp/dir-instr.gsm
+share/asterisk/sounds/jp/dir-intro.gsm
+share/asterisk/sounds/jp/dir-nomatch.gsm
+share/asterisk/sounds/jp/dir-nomore.gsm
+share/asterisk/sounds/jp/enter-a-time.gsm
+share/asterisk/sounds/jp/hours.gsm
+share/asterisk/sounds/jp/invalid.gsm
+share/asterisk/sounds/jp/jp-arimasen.gsm
+share/asterisk/sounds/jp/jp-arimasu.gsm
+share/asterisk/sounds/jp/jp-baai.gsm
+share/asterisk/sounds/jp/jp-chigaimasu.gsm
+share/asterisk/sounds/jp/jp-dekimasen.gsm
+share/asterisk/sounds/jp/jp-dekimasu.gsm
+share/asterisk/sounds/jp/jp-desu.gsm
+share/asterisk/sounds/jp/jp-ga.gsm
+share/asterisk/sounds/jp/jp-gozaimasu.gsm
+share/asterisk/sounds/jp/jp-ha.gsm
+share/asterisk/sounds/jp/jp-kara.gsm
+share/asterisk/sounds/jp/jp-machigai.gsm
+share/asterisk/sounds/jp/jp-masu.gsm
+share/asterisk/sounds/jp/jp-ni.gsm
+share/asterisk/sounds/jp/jp-no.gsm
+share/asterisk/sounds/jp/jp-oshitekudasai.gsm
+share/asterisk/sounds/jp/jp-saigo.gsm
+share/asterisk/sounds/jp/jp-saisho.gsm
+share/asterisk/sounds/jp/jp-tadashii.gsm
+share/asterisk/sounds/jp/jp-wa.gsm
+share/asterisk/sounds/jp/jp-wo.gsm
+share/asterisk/sounds/jp/minutes.gsm
+share/asterisk/sounds/jp/not-rqsted-wakeup.gsm
+share/asterisk/sounds/jp/pbx-invalid.gsm
+share/asterisk/sounds/jp/pbx-invalidpark.gsm
+share/asterisk/sounds/jp/pbx-transfer.gsm
+share/asterisk/sounds/jp/privacy-incorrect.gsm
+share/asterisk/sounds/jp/privacy-prompt.gsm
+share/asterisk/sounds/jp/privacy-thankyou.gsm
+share/asterisk/sounds/jp/privacy-unident.gsm
+share/asterisk/sounds/jp/q-default.gsm
+share/asterisk/sounds/jp/rqsted-wakeup-for.gsm
+share/asterisk/sounds/jp/ss-noservice.gsm
+share/asterisk/sounds/jp/transfer.gsm
+share/asterisk/sounds/jp/tt-allbusy.gsm
+share/asterisk/sounds/jp/tt-monkeysintro.gsm
+share/asterisk/sounds/jp/tt-somethingwrong.gsm
+share/asterisk/sounds/jp/tt-weasels.gsm
+share/asterisk/sounds/jp/vm-Cust1.gsm
+share/asterisk/sounds/jp/vm-Cust2.gsm
+share/asterisk/sounds/jp/vm-Cust3.gsm
+share/asterisk/sounds/jp/vm-Cust4.gsm
+share/asterisk/sounds/jp/vm-Cust5.gsm
+share/asterisk/sounds/jp/vm-Family.gsm
+share/asterisk/sounds/jp/vm-Friends.gsm
+share/asterisk/sounds/jp/vm-INBOX.gsm
+share/asterisk/sounds/jp/vm-Old.gsm
+share/asterisk/sounds/jp/vm-Work.gsm
+share/asterisk/sounds/jp/vm-advopts.gsm
+share/asterisk/sounds/jp/vm-and.gsm
+share/asterisk/sounds/jp/vm-changeto.gsm
+share/asterisk/sounds/jp/vm-delete.gsm
+share/asterisk/sounds/jp/vm-deleted.gsm
+share/asterisk/sounds/jp/vm-enter-num-to-call.gsm
+share/asterisk/sounds/jp/vm-extension.gsm
+share/asterisk/sounds/jp/vm-first.gsm
+share/asterisk/sounds/jp/vm-for.gsm
+share/asterisk/sounds/jp/vm-forwardoptions.gsm
+share/asterisk/sounds/jp/vm-from-phonenumber.gsm
+share/asterisk/sounds/jp/vm-goodbye.gsm
+share/asterisk/sounds/jp/vm-helpexit.gsm
+share/asterisk/sounds/jp/vm-incorrect-mailbox.gsm
+share/asterisk/sounds/jp/vm-incorrect.gsm
+share/asterisk/sounds/jp/vm-instructions.gsm
+share/asterisk/sounds/jp/vm-intro.gsm
+share/asterisk/sounds/jp/vm-isonphone.gsm
+share/asterisk/sounds/jp/vm-isunavail.gsm
+share/asterisk/sounds/jp/vm-last.gsm
+share/asterisk/sounds/jp/vm-leavemsg.gsm
+share/asterisk/sounds/jp/vm-login.gsm
+share/asterisk/sounds/jp/vm-mailbox-full.gsm
+share/asterisk/sounds/jp/vm-message.gsm
+share/asterisk/sounds/jp/vm-messages.gsm
+share/asterisk/sounds/jp/vm-mismatch.gsm
+share/asterisk/sounds/jp/vm-msginstruct.gsm
+share/asterisk/sounds/jp/vm-msgsaved.gsm
+share/asterisk/sounds/jp/vm-newpassword.gsm
+share/asterisk/sounds/jp/vm-next.gsm
+share/asterisk/sounds/jp/vm-no.gsm
+share/asterisk/sounds/jp/vm-nobodyavail.gsm
+share/asterisk/sounds/jp/vm-nomore.gsm
+share/asterisk/sounds/jp/vm-onefor.gsm
+share/asterisk/sounds/jp/vm-options.gsm
+share/asterisk/sounds/jp/vm-opts.gsm
+share/asterisk/sounds/jp/vm-passchanged.gsm
+share/asterisk/sounds/jp/vm-password-eririn.gsm
+share/asterisk/sounds/jp/vm-password.gsm
+share/asterisk/sounds/jp/vm-press.gsm
+share/asterisk/sounds/jp/vm-prev.gsm
+share/asterisk/sounds/jp/vm-reachoper.gsm
+share/asterisk/sounds/jp/vm-rec-busy.gsm
+share/asterisk/sounds/jp/vm-rec-name.gsm
+share/asterisk/sounds/jp/vm-rec-unv.gsm
+share/asterisk/sounds/jp/vm-received.gsm
+share/asterisk/sounds/jp/vm-reenterpassword.gsm
+share/asterisk/sounds/jp/vm-repeat.gsm
+share/asterisk/sounds/jp/vm-saved.gsm
+share/asterisk/sounds/jp/vm-savedto.gsm
+share/asterisk/sounds/jp/vm-savefolder.gsm
+share/asterisk/sounds/jp/vm-savemessage.gsm
+share/asterisk/sounds/jp/vm-sorry.gsm
+share/asterisk/sounds/jp/vm-starmain.gsm
+share/asterisk/sounds/jp/vm-theperson.gsm
+share/asterisk/sounds/jp/vm-tocancel.gsm
+share/asterisk/sounds/jp/vm-toforward.gsm
+share/asterisk/sounds/jp/vm-tohearenv.gsm
+share/asterisk/sounds/jp/vm-toreply.gsm
+share/asterisk/sounds/jp/vm-undelete.gsm
+share/asterisk/sounds/jp/vm-undeleted.gsm
+share/asterisk/sounds/jp/vm-whichbox.gsm
+share/asterisk/sounds/jp/vm-youhave.gsm
+share/asterisk/sounds/jp/wakeup-call-cancelled.gsm
+share/asterisk/sounds/jp/wakeup-call.gsm
+share/asterisk/sounds/jp/wakeup-menu.gsm
+share/asterisk/sounds/jp/wakeup-menu2.gsm
+share/asterisk/sounds/jp/wakeup.gsm
+@dirrm share/asterisk/sounds/jp/digits
+@dirrm share/asterisk/sounds/jp
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
+%%PORTDOCS%%@dirrm %%DOCSDIR%%