From 016649ae60242dd4ba1f5d53426e061d12ace134 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Thu, 13 Apr 2000 12:48:36 +0000
Subject: [PATCH] Update with PORTNAME/PORTVERSION and get happy with the
 slave.

Remove LANGPREFIX and just utilize PKGNAMEPREFIX.

Utilize PKGNAMESUFFIX.

Set the correct categories for both the master and the slaves.
---
 audio/timidity++-emacs/Makefile    | 6 ++----
 japanese/timidity++-slang/Makefile | 2 ++
 japanese/timidity++-tcltk/Makefile | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index 68e6c90595d5..58e54e3215cd 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -5,8 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	${LANGPREF}timidity++-${INTERFACE}
+PORTNAME=	timidity++
 PORTVERSION=	2.9.0
+PKGNAMESUFFIX=	-${INTERFACE}
 CATEGORIES=	audio
 MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
 DISTNAME=	TiMidity++-${PORTVERSION}
@@ -17,9 +18,6 @@ RUN_DEPENDS=	${PREFIX}/bin/timidity:${PORTSDIR}/audio/timidity++
 LIB_DEPENDS=	${INTERFACE_DEPS}
 
 INTERFACE?=	emacs
-.if defined(JAPANESE)
-LANGPREFIX=	ja-
-.endif
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/timidity++-slang/Makefile b/japanese/timidity++-slang/Makefile
index ce0cf2c5a566..f92e91ecaa19 100644
--- a/japanese/timidity++-slang/Makefile
+++ b/japanese/timidity++-slang/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+CATEGORIES=	japanese
+
 INTERFACE=	slang
 JAPANESE=	yes
 
diff --git a/japanese/timidity++-tcltk/Makefile b/japanese/timidity++-tcltk/Makefile
index d278ceac9f53..4c0685999454 100644
--- a/japanese/timidity++-tcltk/Makefile
+++ b/japanese/timidity++-tcltk/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+CATEGORIES=	japanese
+
 INTERFACE=	tcltk
 JAPANESE=	yes