merge in pkgsrc/japanese/magicpoint into pkgsrc/graphics/magicpoint.

nuke pkgsrc/japanese/magicpoint.

graphics/magicpoint/Makefile

@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.8 1999/06/17 08:00:31 itojun Exp $
+# $NetBSD: Makefile,v 1.9 1999/06/17 13:20:38 itojun Exp $
 
 DISTNAME=		magicpoint-1.05a
-# question is for localized (i.e. Japanese) version
-PKGNAME?=		magicpoint-1.05a
 CATEGORIES=		x11 graphics
 MASTER_SITES=		ftp://ftp.mew.org/pub/MagicPoint/
 
@@ -11,12 +9,11 @@ HOMEPAGE=		http://www.Mew.org/mgp/
 
 DEPENDS=		freetype-1.1:${.CURDIR}/../../print/freetype
 
-CONFLICTS=		mgp-*
+CONFLICTS=		mgp-* magicpoint-1.04a
 
 GNU_CONFIGURE=		yes
 USE_IMAKE=		yes
-# question is for localized (i.e. Japanese) version
-CONFIGURE_ARGS?=	--disable-vflib
+CONFIGURE_ARGS=		--disable-vflib --enable-freetype-charset16
 
 post-configure:
 	(cd ${WRKSRC}/contrib/xmindpath; ./configure --prefix=${PREFIX})

japanese/magicpoint/Makefile

@@ -1,26 +0,0 @@
-# New ports collection makefile for:	magicpoint
-# Version required:	1.05a
-# Date created:		25 Dec 1997
-# Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
-#
-# $NetBSD: Makefile,v 1.2 1999/06/17 08:02:37 itojun Exp $
-# Based on FreeBSD Id: Makefile,v 1.7 1998/12/23 01:31:37 steve Exp
-#
-
-MASTERDIR=	${.CURDIR}/../../graphics/magicpoint
-COMMENT=	${.CURDIR}/pkg/COMMENT
-DESCR_SRC=	${MASTERDIR}/pkg/DESCR
-PLIST_SRC=	${MASTERDIR}/pkg/PLIST
-FILESDIR=	${MASTERDIR}/files
-PATCHDIR=	${MASTERDIR}/patches
-
-PKGNAME=	ja-magicpoint-1.05a
-
-#LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
-CONFIGURE_ARGS=	--disable-vflib --enable-freetype-charset16
-
-.include "${MASTERDIR}/Makefile"
-
-CATEGORIES+=	japanese
-
-MAINTAINER=	itojun@itojun.org

japanese/magicpoint/pkg/COMMENT

@@ -1 +0,0 @@
-an X11-based presentation tool, configured for Japanese support.