From d48c5312ffc97eda9cb08048c42df412bf21d977 Mon Sep 17 00:00:00 2001 From: asami Date: Fri, 7 Aug 1998 22:43:13 +0000 Subject: Move "etlfonts freefonts getbdf sharefonts tkfont xfed xmbdfed" from x11 to fonts. While I'm here, change the category names in some (hopefully all) CJK font ports. --- chinese/kcfonts/Makefile | 4 ++-- japanese/diclookup-emacs20/Makefile | 4 ++-- japanese/diclookup-mule/Makefile | 4 ++-- japanese/elisa10x8/Makefile | 4 ++-- japanese/k10/Makefile | 4 ++-- japanese/k12/Makefile | 4 ++-- japanese/kappa20/Makefile | 4 ++-- korean/hanyangfonts/Makefile | 4 ++-- korean/johabfonts/Makefile | 4 ++-- korean/kaistfonts/Makefile | 4 ++-- korean/mizifont/Makefile | 4 ++-- korean/pinetreefonts/Makefile | 4 ++-- x11-fonts/etlfonts/Makefile | 4 ++-- x11-fonts/freefonts/Makefile | 4 ++-- x11-fonts/getbdf/Makefile | 4 ++-- x11-fonts/sharefonts/Makefile | 4 ++-- x11-fonts/tkfont/Makefile | 4 ++-- x11-fonts/xfed/Makefile | 4 ++-- x11-fonts/xmbdfed/Makefile | 4 ++-- x11/Makefile | 9 +-------- 20 files changed, 39 insertions(+), 46 deletions(-) diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile index d8564bd2b718..f9590638d7d4 100644 --- a/chinese/kcfonts/Makefile +++ b/chinese/kcfonts/Makefile @@ -3,12 +3,12 @@ # Date Created: 5 Dec 1997 # Whom: Ming-I Hseh # -# $Id: Makefile,v 1.5 1997/12/24 07:58:40 vanilla Exp $ +# $Id: Makefile,v 1.6 1998/08/05 09:30:46 asami Exp $ # DISTNAME= kcfonts-1.05 PKGNAME= zh-kcfonts-1.05 -CATEGORIES= chinese x11 +CATEGORIES= chinese x11-fonts MASTER_SITES= ftp://freebsd.ntu.edu.tw/freebsd/taiwan/ \ ftp://NCTUCCCA.edu.tw/OS/FreeBSD/00MIRROR/freebsd.ntu.edu.tw/taiwan/ diff --git a/japanese/diclookup-emacs20/Makefile b/japanese/diclookup-emacs20/Makefile index d28aa25182a1..c1401a9e2181 100644 --- a/japanese/diclookup-emacs20/Makefile +++ b/japanese/diclookup-emacs20/Makefile @@ -3,7 +3,7 @@ # Date created: 31 Jan 1998 # Whom: Mita Yoshio # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1998/08/03 00:15:02 asami Exp $ # DISTNAME= diclookup-mule-2.3.3 @@ -16,7 +16,7 @@ PATCHFILES= diclookup-mule-2.3.3-wave-patch.gz MAINTAINER= mita@jp.FreeBSD.org -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11/etlfonts +RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11-fonts/etlfonts BUILD_DEPENDS= mule:${PORTSDIR}/japanese/mule-wnn4 post-install: diff --git a/japanese/diclookup-mule/Makefile b/japanese/diclookup-mule/Makefile index d28aa25182a1..c1401a9e2181 100644 --- a/japanese/diclookup-mule/Makefile +++ b/japanese/diclookup-mule/Makefile @@ -3,7 +3,7 @@ # Date created: 31 Jan 1998 # Whom: Mita Yoshio # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1998/08/03 00:15:02 asami Exp $ # DISTNAME= diclookup-mule-2.3.3 @@ -16,7 +16,7 @@ PATCHFILES= diclookup-mule-2.3.3-wave-patch.gz MAINTAINER= mita@jp.FreeBSD.org -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11/etlfonts +RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11-fonts/etlfonts BUILD_DEPENDS= mule:${PORTSDIR}/japanese/mule-wnn4 post-install: diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile index 80e0a2360893..6f5d5f2b6f8e 100644 --- a/japanese/elisa10x8/Makefile +++ b/japanese/elisa10x8/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Sep 1997 # Whom: Dai ISHIJIMA & ELISA Font Project # -# $Id: Makefile,v 1.1.1.1 1997/09/28 14:20:17 itojun Exp $ +# $Id: Makefile,v 1.2 1998/08/05 09:31:18 asami Exp $ # DISTNAME= ja-elisa8-1.0 -CATEGORIES= japanese x11 +CATEGORIES= japanese x11-fonts MASTER_SITES= ftp://ftp.tut.ac.jp/X11/Fonts/ \ ftp://ftp.iij.ad.jp/pub/X/X11R6.3/%SUBDIR%/ \ ftp://ftp.eu.net/X11/R6.3/%SUBDIR%/ diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile index 696f8ce01188..76ab81e0b969 100644 --- a/japanese/k10/Makefile +++ b/japanese/k10/Makefile @@ -3,12 +3,12 @@ # Date created: 25 Feb 1998 # Whom: Eiji-usagi-MATSUmoto # -# $Id: Makefile,v 1.2 1998/05/15 04:59:15 chuckr Exp $ +# $Id: Makefile,v 1.3 1998/08/05 09:31:17 asami Exp $ # DISTNAME= knj10-1.00 PKGNAME= ja-naga10-1.0 -CATEGORIES= japanese x11 +CATEGORIES= japanese x11-fonts MASTER_SITES= http://gondow-www.cs.titech.ac.jp/~snagao/fonts/ MAINTAINER= usagi@clave.gr.jp diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile index c38c98abda97..91dc6ef92cc7 100644 --- a/japanese/k12/Makefile +++ b/japanese/k12/Makefile @@ -3,12 +3,12 @@ # Date created: 24 June 1996 # Whom: Mita Yoshio # -# $Id: Makefile,v 1.4 1997/09/15 07:33:10 max Exp $ +# $Id: Makefile,v 1.5 1998/08/05 09:31:18 asami Exp $ # DISTNAME= kaname_k12_bdf PKGNAME= ja-k12font-1.0 -CATEGORIES= japanese x11 +CATEGORIES= japanese x11-fonts MASTER_SITES= ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/FreeBSD/etc/ MAINTAINER= mita@jp.FreeBSD.org diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile index 6781e6ce7250..79213ec67b78 100644 --- a/japanese/kappa20/Makefile +++ b/japanese/kappa20/Makefile @@ -3,12 +3,12 @@ # Date created: 30 Sep 1997 # Whom: Kawaguti Ginga # -# $Id: Makefile,v 1.2 1998/04/24 05:37:15 asami Exp $ +# $Id: Makefile,v 1.3 1998/08/05 09:31:19 asami Exp $ # DISTNAME= Kappa20-0.2 PKGNAME= ja-kappa20-0.2 -CATEGORIES= japanese x11 +CATEGORIES= japanese x11-fonts MASTER_SITES= ftp://ftp.st.ryukoku.ac.jp/pub/X11/fonts/ \ ftp://ftp.win.or.jp/pub/doc-sources/fj.sources/1997/aug/ diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile index 4bca9956535f..5f41b074f1f4 100644 --- a/korean/hanyangfonts/Makefile +++ b/korean/hanyangfonts/Makefile @@ -3,12 +3,12 @@ # Date created: 22 Mar 1997 # Whom: Choi Jun Ho # -# $Id: Makefile,v 1.4 1998/04/19 17:51:34 steve Exp $ +# $Id: Makefile,v 1.5 1998/08/05 09:31:21 asami Exp $ # DISTNAME= hanyang-font-pcf PKGNAME= ko-hanyangfonts-1.0 -CATEGORIES= korean x11 +CATEGORIES= korean x11-fonts MASTER_SITES= ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \ ftp://ftp.kreonet.re.kr/pub/hangul/cair-archive/fonts/ diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile index 7321f66c85d5..04d904d5add4 100644 --- a/korean/johabfonts/Makefile +++ b/korean/johabfonts/Makefile @@ -3,12 +3,12 @@ # Date created: 15 Mar 1998 # Whom: CHOI Junho # -# $Id: Makefile,v 1.3 1998/03/16 07:26:13 steve Exp $ +# $Id: Makefile,v 1.4 1998/04/19 15:50:11 steve Exp $ # DISTNAME= hanterm304fonts PKGNAME= ko-johabfonts-3.04 -CATEGORIES= korean x11 +CATEGORIES= korean x11-fonts MASTER_SITES= ftp://ftp.kaist.ac.kr/pub/hangul/terminal/hanterm/hanterm304beta/fonts/ \ ftp://ftp.kreonet.re.kr/pub/hangul/cair-archive/terminal/hanterm/hanterm304beta/fonts/ diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile index 440ddd216f1b..8694f7c5f38e 100644 --- a/korean/kaistfonts/Makefile +++ b/korean/kaistfonts/Makefile @@ -3,11 +3,11 @@ # Date created: Fri Mar 27 17:26:42 KST 1998 # Whom: CHOI Junho # -# $Id: Makefile,v 1.1.1.1 1998/05/05 14:21:40 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/08/05 09:31:22 asami Exp $ # DISTNAME= ko-kaistfonts-ksc-1.0 -CATEGORIES= korean x11 +CATEGORIES= korean x11-fonts MASTER_SITES= ftp://sensor.kaist.ac.kr/pub/fonts/newones/ DISTFILES= kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \ kaist-newmj16.bdf.gz ks_iyagi16.bdf.gz diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile index 2f38ad5cacf3..5d3f9f1a6e8e 100644 --- a/korean/mizifont/Makefile +++ b/korean/mizifont/Makefile @@ -3,12 +3,12 @@ # Date created: 16 Mar 1998 # Whom: CHOI Junho # -# $Id: Makefile,v 1.2 1998/06/27 05:19:54 asami Exp $ +# $Id: Makefile,v 1.3 1998/08/05 09:31:22 asami Exp $ # DISTNAME= xfntmizi-1.1-1.noarch PKGNAME= ko-mizifonts-1.1 -CATEGORIES= korean x11 +CATEGORIES= korean x11-fonts MASTER_SITES= http://www.mizi.co.kr/packages/ EXTRACT_SUFX= .rpm diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile index 46e7d42c62ee..1021407acc8f 100644 --- a/korean/pinetreefonts/Makefile +++ b/korean/pinetreefonts/Makefile @@ -3,12 +3,12 @@ # Date created: 22 Mar 1997 # Whom: CHOI Junho # -# $Id: Makefile,v 1.4 1998/04/30 14:39:06 kuriyama Exp $ +# $Id: Makefile,v 1.5 1998/08/05 09:31:22 asami Exp $ # DISTNAME= pinetree.precomposed-1.0 PKGNAME= ko-pinetreefonts-1.0 -CATEGORIES= korean x11 +CATEGORIES= korean x11-fonts MASTER_SITES= ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \ ftp://cglab.snu.ac.kr/pub/hangul/n3f/fonts/ \ ftp://ftp.kreonet.re.kr/pub/hangul/cair-archive/fonts/ diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile index 512486b7f7d6..40bf13f798c8 100644 --- a/x11-fonts/etlfonts/Makefile +++ b/x11-fonts/etlfonts/Makefile @@ -3,12 +3,12 @@ # Date created: 3 Nov 1996 # Whom: Mita Yoshio # -# $Id: Makefile,v 1.3 1997/07/13 18:49:31 max Exp $ +# $Id: Makefile,v 1.4 1998/08/05 09:31:42 asami Exp $ # DISTNAME= non-cjk PKGNAME= etlfonts-noncjk-1.0 -CATEGORIES= x11 +CATEGORIES= x11-fonts MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/fonts/ EXTRACT_SUFX= .tar diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile index a529e37c1132..bd76dbf533d9 100644 --- a/x11-fonts/freefonts/Makefile +++ b/x11-fonts/freefonts/Makefile @@ -3,11 +3,11 @@ # Date created: Thu Aug 1 21:32:14 CDT 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.5 1997/12/04 13:58:06 vanilla Exp $ +# $Id: Makefile,v 1.6 1998/08/05 09:31:42 asami Exp $ # DISTNAME= freefonts-0.10 -CATEGORIES= x11 +CATEGORIES= x11-fonts MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/ MAINTAINER= erich@FreeBSD.org diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile index 750254449255..958597093574 100644 --- a/x11-fonts/getbdf/Makefile +++ b/x11-fonts/getbdf/Makefile @@ -3,12 +3,12 @@ # Date created: 30 August 1996 # Whom: ache # -# $Id: Makefile,v 1.4 1996/11/18 11:43:12 asami Exp $ +# $Id: Makefile,v 1.5 1998/08/05 09:31:43 asami Exp $ # DISTNAME= getbdf PKGNAME= getbdf-1.0 -CATEGORIES= x11 +CATEGORIES= x11-fonts MASTER_SITES= ftp://ftp.ipa.fhg.de/pub/X/ EXTRACT_SUFX= .tar.Z diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile index ff7aa69ac941..969703094f71 100644 --- a/x11-fonts/sharefonts/Makefile +++ b/x11-fonts/sharefonts/Makefile @@ -3,11 +3,11 @@ # Date created: Thu Mar 26 04:50:00 PST 1998 # Whom: dburr@FreeBSD.ORG # -# $Id: Makefile,v 1.1.1.1 1998/05/16 02:08:03 dburr Exp $ +# $Id: Makefile,v 1.2 1998/08/05 09:31:48 asami Exp $ # DISTNAME= sharefonts-0.10 -CATEGORIES= x11 +CATEGORIES= x11-fonts MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/ MAINTAINER= dburr@FreeBSD.ORG diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile index 84529ff08fb5..15a49584d943 100644 --- a/x11-fonts/tkfont/Makefile +++ b/x11-fonts/tkfont/Makefile @@ -3,11 +3,11 @@ # Date created: 11 May 1998 # Whom: Brett Taylor # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1998/05/17 04:44:51 mph Exp $ # DISTNAME= tkfont-1.1 -CATEGORIES= x11 tk80 +CATEGORIES= x11-fonts tk80 MASTER_SITES= http://cdrom.com/pub/linux/tsx-11/sources/usr.bin.X11/ MAINTAINER= brett@peloton.physics.montana.edu diff --git a/x11-fonts/xfed/Makefile b/x11-fonts/xfed/Makefile index 6df439eb6db6..76bfd2f8e5b1 100644 --- a/x11-fonts/xfed/Makefile +++ b/x11-fonts/xfed/Makefile @@ -3,12 +3,12 @@ # Date created: 7 December 1994 # Whom: asami # -# $Id: Makefile,v 1.15 1997/03/04 06:16:02 asami Exp $ +# $Id: Makefile,v 1.16 1997/12/25 22:29:52 asami Exp $ # DISTNAME= xfed PKGNAME= xfed-1.0 -CATEGORIES= x11 +CATEGORIES= x11-fonts MASTER_SITES= ftp://ftp.demon.co.uk/pub/graphics/systems/X11.old/pub/R6untarred/contrib/programs/ MAINTAINER= ports@FreeBSD.ORG diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile index dcb54d9f70e3..1c79d9ed8ed5 100644 --- a/x11-fonts/xmbdfed/Makefile +++ b/x11-fonts/xmbdfed/Makefile @@ -3,11 +3,11 @@ # Date created: June 20, 1997 # Whom: jfieber # -# $Id: Makefile,v 1.4 1998/03/12 23:09:54 jfieber Exp $ +# $Id: Makefile,v 1.5 1998/08/05 09:31:50 asami Exp $ # DISTNAME= xmbdfed-2.7 -CATEGORIES= x11 +CATEGORIES= x11-fonts MASTER_SITES= ftp://crl.nmsu.edu/CLR/multiling/General/ MAINTAINER= jfieber@FreeBSD.ORG diff --git a/x11/Makefile b/x11/Makefile index 02d5ef9d6633..033a2dcf78bd 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.223 1998/08/07 22:27:41 asami Exp $ +# $Id: Makefile,v 1.224 1998/08/07 22:33:01 asami Exp $ # SUBDIR += FWF @@ -20,13 +20,10 @@ SUBDIR += emu SUBDIR += enlightenment SUBDIR += eterm - SUBDIR += etlfonts SUBDIR += fbsd-icons - SUBDIR += freefonts SUBDIR += fvwm SUBDIR += fvwm2 SUBDIR += fvwm95 - SUBDIR += getbdf SUBDIR += gtk SUBDIR += gwm SUBDIR += icewm @@ -60,7 +57,6 @@ SUBDIR += qt140 SUBDIR += qvwm SUBDIR += rxvt - SUBDIR += sharefonts SUBDIR += slingshot SUBDIR += sxpc SUBDIR += tix @@ -68,7 +64,6 @@ SUBDIR += tk42 SUBDIR += tk80 SUBDIR += tk81 - SUBDIR += tkfont SUBDIR += tkgoodstuff SUBDIR += tkstep80 SUBDIR += tvtwm @@ -88,7 +83,6 @@ SUBDIR += xcolors SUBDIR += xdtm SUBDIR += xfce - SUBDIR += xfed SUBDIR += xfedor SUBDIR += xfishtank SUBDIR += xforms @@ -97,7 +91,6 @@ SUBDIR += xloadimage SUBDIR += xlockmore SUBDIR += xmascot - SUBDIR += xmbdfed SUBDIR += xmold SUBDIR += xmove SUBDIR += xprompt -- cgit