11 files changed, 19 insertions, 123 deletions

diff --git a/MOVED b/MOVED
index 0bc59884b920..48dfb860a915 100644
--- a/MOVED
+++ b/MOVED
@@ -3530,3 +3530,4 @@ deskutils/gdeskcal-skins||2008-07-03|Disappeared from master site
 deskutils/gnome-menu-editor||2008-07-03|Disappeared from master site and take over by alacarte
 textproc/dictum-emacs22||2008-07-05|Assimilated into textproc/dictum
 www/drupal5-gsitemap|www/drupal5-xmlsitemap|2008-07-04|Rename after vendor name change
+sysutils/gnu-unifont|x11-fonts/gun-unifont|2008-07-05|Category change
diff --git a/sysutils/Makefile b/sysutils/Makefile
index de704925edc0..7b7076c28e06 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -285,7 +285,6 @@
     SUBDIR += gnome_subr
     SUBDIR += gnomebaker
     SUBDIR += gnomefind
-    SUBDIR += gnu-unifont
     SUBDIR += googlog
     SUBDIR += gosa
     SUBDIR += gpart
diff --git a/sysutils/gnu-unifont/Makefile b/sysutils/gnu-unifont/Makefile
deleted file mode 100644
index 6d05794e2d37..000000000000
--- a/sysutils/gnu-unifont/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	gnu-unifont
-# Date created:				Feb 23 2008
-# Whom:					nrg milk <bsdports@gmail.com>
-#
-# $FreeBSD$
-
-PORTNAME=	gnu-unifont
-PORTVERSION=	1.0.0
-CATEGORIES=	sysutils
-MASTER_SITES=	http://chirashi-no-ura.net/files/
-DISTNAME=	unifont.hex
-EXTRACT_SUFX=	.tar.bz
-
-MAINTAINER=	bsdports@gmail.com
-COMMENT=	Unicode font
-
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-
-USE_PERL=	5.8
-NO_BUILD=	yes
-PLIST_FILES=	lib/X11/fonts/local/unifont.pcf.gz
-
-do-install:
-	${CHMOD} +x ${FILESDIR}/hex2bdf
-	${CAT} ${WRKDIR}/unifont.hex | ${FILESDIR}/hex2bdf | ${LOCALBASE}/bin/bdftopcf | ${GZIP_CMD} > ${WRKDIR}/unifont.pcf.gz
-	${CP} ${WRKDIR}/unifont.pcf.gz ${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnu-unifont/distinfo b/sysutils/gnu-unifont/distinfo
deleted file mode 100644
index b7c112858dbb..000000000000
--- a/sysutils/gnu-unifont/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (unifont.hex.tar.bz) = 8cc304ab7a4c84ae3845ee7ef76639c9
-SHA256 (unifont.hex.tar.bz) = bc4fbd356946a4267b28aa3053bb77859d56456eed0323d6db5590d455891c12
-SIZE (unifont.hex.tar.bz) = 554325
diff --git a/sysutils/gnu-unifont/files/hex2bdf b/sysutils/gnu-unifont/files/hex2bdf
deleted file mode 100644
index 6663786c2bf6..000000000000
--- a/sysutils/gnu-unifont/files/hex2bdf
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-
-while (<>) { $glyph{$1} = $2 if /(....):(.+)\n/; }
-@chars = sort keys %glyph; $[ = 1;
-# dbmopen (%charname, "/usr/share/unicode/unidata/charname.db", 0);
-
-print "STARTFONT 2.1
-FONT -gnu-unifont-medium-r-normal--16-160-75-75-c-80-iso10646-1
-SIZE 16 75 75
-FONTBOUNDINGBOX 16 16 0 -2
-STARTPROPERTIES 3
-FONT_ASCENT 14
-FONT_DESCENT 2
-DEFAULT_CHAR 32
-ENDPROPERTIES
-CHARS $#chars\n";
-
-foreach $character (@chars)
-{
-       $encoding = hex($character); $glyph = $glyph{$character};
-       $width = length ($glyph) > 32 ? 2 : 1;
-       $dwidth = $width * 8; $swidth= $width * 500;
-       $glyph =~ s/((..){$width})/\n$1/g;
-       $character = "$character $charname"
-           if $charname = $charname{pack("n",hex($character))};
-
-       print "STARTCHAR U+$character
-ENCODING $encoding
-SWIDTH $swidth 0
-DWIDTH $dwidth 0
-BBX $dwidth 16 0 -2
-BITMAP $glyph
-ENDCHAR\n";
-}
-
-print "ENDFONT\n";
diff --git a/sysutils/gnu-unifont/pkg-descr b/sysutils/gnu-unifont/pkg-descr
deleted file mode 100644
index 6f90e19a15d1..000000000000
--- a/sysutils/gnu-unifont/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-GNU Unifont is a free bitmap font that covers
-the Unicode Basic Multilingual Plane (BMP),
-using an intermediate bitmapped font format.
-
-Auther: Roman Czyborra <roman@czyborra.com>
-WWW: http://czyborra.com/unifont/
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 2e75b7664942..f613b24ecd9e 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -77,6 +77,7 @@
     SUBDIR += getbdf
     SUBDIR += gfe
     SUBDIR += gnome-font-sampler
+    SUBDIR += gnu-unifont
     SUBDIR += indic-ttf
     SUBDIR += intlfonts
     SUBDIR += jmk-x11-fonts
diff --git a/x11-fonts/gnu-unifont/Makefile b/x11-fonts/gnu-unifont/Makefile
index 6d05794e2d37..bcf269751f3e 100644
--- a/x11-fonts/gnu-unifont/Makefile
+++ b/x11-fonts/gnu-unifont/Makefile
@@ -5,24 +5,28 @@
 # $FreeBSD$
 
 PORTNAME=	gnu-unifont
-PORTVERSION=	1.0.0
-CATEGORIES=	sysutils
-MASTER_SITES=	http://chirashi-no-ura.net/files/
-DISTNAME=	unifont.hex
-EXTRACT_SUFX=	.tar.bz
+PORTVERSION=	20080510
+CATEGORIES=	x11-fonts
+MASTER_SITES=	http://unifoundry.com/ \
+		http://chirashi-no-ura.net/files/
+DISTNAME=	gnu-unifont-2008-05-10.bdf
+EXTRACT_SUFX=	.gz
 
 MAINTAINER=	bsdports@gmail.com
 COMMENT=	Unicode font
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 
-USE_PERL=	5.8
 NO_BUILD=	yes
 PLIST_FILES=	lib/X11/fonts/local/unifont.pcf.gz
 
+do-extract:
+	${MKDIR} ${WRKDIR}
+	${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKDIR}
+	${GUNZIP_CMD} ${WRKDIR}/${DISTNAME}${EXTRACT_SUFX}
+
 do-install:
-	${CHMOD} +x ${FILESDIR}/hex2bdf
-	${CAT} ${WRKDIR}/unifont.hex | ${FILESDIR}/hex2bdf | ${LOCALBASE}/bin/bdftopcf | ${GZIP_CMD} > ${WRKDIR}/unifont.pcf.gz
+	${LOCALBASE}/bin/bdftopcf  ${WRKDIR}/${DISTNAME} | ${GZIP_CMD} > ${WRKDIR}/unifont.pcf.gz
 	${CP} ${WRKDIR}/unifont.pcf.gz ${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/gnu-unifont/distinfo b/x11-fonts/gnu-unifont/distinfo
index b7c112858dbb..f6353e35a576 100644
--- a/x11-fonts/gnu-unifont/distinfo
+++ b/x11-fonts/gnu-unifont/distinfo
@@ -1,3 +1,3 @@
-MD5 (unifont.hex.tar.bz) = 8cc304ab7a4c84ae3845ee7ef76639c9
-SHA256 (unifont.hex.tar.bz) = bc4fbd356946a4267b28aa3053bb77859d56456eed0323d6db5590d455891c12
-SIZE (unifont.hex.tar.bz) = 554325
+MD5 (gnu-unifont-2008-05-10.bdf.gz) = 25bfb7d0213cf8cd415e61eeb9d2b038
+SHA256 (gnu-unifont-2008-05-10.bdf.gz) = 75ef7421c5e299a8f00bd0fde78efb4d9a6981bf0e72bc7e4e08be6cbb46e187
+SIZE (gnu-unifont-2008-05-10.bdf.gz) = 1265800
diff --git a/x11-fonts/gnu-unifont/files/hex2bdf b/x11-fonts/gnu-unifont/files/hex2bdf
deleted file mode 100644
index 6663786c2bf6..000000000000
--- a/x11-fonts/gnu-unifont/files/hex2bdf
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-
-while (<>) { $glyph{$1} = $2 if /(....):(.+)\n/; }
-@chars = sort keys %glyph; $[ = 1;
-# dbmopen (%charname, "/usr/share/unicode/unidata/charname.db", 0);
-
-print "STARTFONT 2.1
-FONT -gnu-unifont-medium-r-normal--16-160-75-75-c-80-iso10646-1
-SIZE 16 75 75
-FONTBOUNDINGBOX 16 16 0 -2
-STARTPROPERTIES 3
-FONT_ASCENT 14
-FONT_DESCENT 2
-DEFAULT_CHAR 32
-ENDPROPERTIES
-CHARS $#chars\n";
-
-foreach $character (@chars)
-{
-       $encoding = hex($character); $glyph = $glyph{$character};
-       $width = length ($glyph) > 32 ? 2 : 1;
-       $dwidth = $width * 8; $swidth= $width * 500;
-       $glyph =~ s/((..){$width})/\n$1/g;
-       $character = "$character $charname"
-           if $charname = $charname{pack("n",hex($character))};
-
-       print "STARTCHAR U+$character
-ENCODING $encoding
-SWIDTH $swidth 0
-DWIDTH $dwidth 0
-BBX $dwidth 16 0 -2
-BITMAP $glyph
-ENDCHAR\n";
-}
-
-print "ENDFONT\n";
diff --git a/x11-fonts/gnu-unifont/pkg-descr b/x11-fonts/gnu-unifont/pkg-descr
index 6f90e19a15d1..797b49995386 100644
--- a/x11-fonts/gnu-unifont/pkg-descr
+++ b/x11-fonts/gnu-unifont/pkg-descr
@@ -2,5 +2,5 @@ GNU Unifont is a free bitmap font that covers
 the Unicode Basic Multilingual Plane (BMP),
 using an intermediate bitmapped font format.
 
-Auther: Roman Czyborra <roman@czyborra.com>
-WWW: http://czyborra.com/unifont/
+Auther: Paul Hardy <unifoundry@unifoundry.com>
+WWW: http://unifoundry.com/unifont.html