From 8290f47e7dd11a5b90b6fed88c23512fcebaeb29 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 7 Dec 2011 09:27:58 +0000
Subject: [PATCH] hookup dina-fonts and zap dina-font

---
 fonts/Makefile            |  3 ++-
 fonts/dina-font/Makefile  | 38 --------------------------------------
 fonts/dina-font/distinfo  |  5 -----
 fonts/dina-font/pkg/DESCR |  3 ---
 fonts/dina-font/pkg/PLIST | 16 ----------------
 5 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 fonts/dina-font/Makefile
 delete mode 100644 fonts/dina-font/distinfo
 delete mode 100644 fonts/dina-font/pkg/DESCR
 delete mode 100644 fonts/dina-font/pkg/PLIST

diff --git a/fonts/Makefile b/fonts/Makefile
index 357b28637cc..831d0a2ceee 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2011/11/08 15:06:18 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.4 2011/12/07 09:27:58 jasper Exp $
 
      SUBDIR =
      SUBDIR += acrofonts
@@ -6,6 +6,7 @@
      SUBDIR += arabeyes-ttf
      SUBDIR += artwiz-aleczapka
      SUBDIR += cantarell-fonts
+     SUBDIR += dina-fonts
      SUBDIR += droid-fonts
      SUBDIR += ecoliercourt-fonts
      SUBDIR += farsi-bfonts-ttf
diff --git a/fonts/dina-font/Makefile b/fonts/dina-font/Makefile
deleted file mode 100644
index c2905756e34..00000000000
--- a/fonts/dina-font/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/12/07 09:24:52 jasper Exp $
-
-COMMENT =		monospace bitmap font, primarily aimed at programmers
-
-V =			2.89
-PKGNAME =		dina-font-$V
-DISTNAME =		dina-pcf-$V
-CATEGORIES =		fonts
-
-HOMEPAGE =		http://www.donationcoder.com/Software/Jibz/Dina/
-
-MAINTAINER =		Rafael Sadowski <rafael@sizeofvoid.org>
-
-# FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM =		No
-PERMIT_PACKAGE_FTP =		No
-PERMIT_DISTFILES_CDROM =	No
-PERMIT_DISTFILES_FTP =		No
-
-MASTER_SITES =		http://ftp.fi.debian.org/gentoo/distfiles/
-
-NO_BUILD =		Yes
-NO_REGRESS =		Yes
-
-FONTDIR=	${PREFIX}/lib/X11/fonts/dina
-
-WRKSRC =	${WRKDIR}/Dina-PCF
-
-do-install:
-	${GZIP_CMD} ${WRKSRC}/*.pcf
-	${X11BASE}/bin/mkfontdir ${WRKSRC}
-	egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
-		sed 's/\.pcf\.gz//g' > ${WRKSRC}/fonts.alias
-	${INSTALL_DATA_DIR} ${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
-
-.include <bsd.port.mk>
diff --git a/fonts/dina-font/distinfo b/fonts/dina-font/distinfo
deleted file mode 100644
index f4a6cdfd23a..00000000000
--- a/fonts/dina-font/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
diff --git a/fonts/dina-font/pkg/DESCR b/fonts/dina-font/pkg/DESCR
deleted file mode 100644
index 9f457d90348..00000000000
--- a/fonts/dina-font/pkg/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Dina is a monospace bitmap font, primarily aimed at programmers. It is
-relatively compact to allow a lot of code on screen, while (hopefully)
-clear enough to remain readable even at high resolutions.
diff --git a/fonts/dina-font/pkg/PLIST b/fonts/dina-font/pkg/PLIST
deleted file mode 100644
index 79d0f37e9bb..00000000000
--- a/fonts/dina-font/pkg/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/07 09:24:52 jasper Exp $
-lib/X11/fonts/
-@fontdir lib/X11/fonts/dina/
-lib/X11/fonts/dina/DinaBold10.pcf.gz
-lib/X11/fonts/dina/DinaBold8.pcf.gz
-lib/X11/fonts/dina/DinaBold9.pcf.gz
-lib/X11/fonts/dina/DinaBoldItalic10.pcf.gz
-lib/X11/fonts/dina/DinaBoldItalic8.pcf.gz
-lib/X11/fonts/dina/DinaBoldItalic9.pcf.gz
-lib/X11/fonts/dina/DinaItalic10.pcf.gz
-lib/X11/fonts/dina/DinaItalic8.pcf.gz
-lib/X11/fonts/dina/DinaItalic9.pcf.gz
-lib/X11/fonts/dina/DinaMedium10.pcf.gz
-lib/X11/fonts/dina/DinaMedium8.pcf.gz
-lib/X11/fonts/dina/DinaMedium9.pcf.gz
-lib/X11/fonts/dina/fonts.alias-dina